Issue #2230, #3391 - Load filters on "download begin" event

src/plugin/PluginFilter.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _PLUGIN_FILTER_H_
 #define _PLUGIN_FILTER_H_
 
 #include <memory>
 #include <AdblockPlus/FilterEngine.h>
+#include "DetachedInitialization.h"
 
 enum CFilterElementHideAttrPos
 {
   POS_NONE = 0, STARTING, ENDING, ANYWHERE, EXACT
 };
 
 enum CFilterElementHideAttrType
 {
   TYPE_NONE = 0, STYLE, ID, CLASS
 };
@@ skipping 78 matching lines @@
 
   CFilter(const CFilter&);
   CFilter();
 };
 
 // ============================================================================
 // CPluginFilter
 // ============================================================================
 
 class CPluginFilter
+  : private DetachedInitializer
 {
   // (Tag,Name) -> Filter
   typedef std::multimap<std::pair<std::wstring, std::wstring>, CFilterElementHide> TFilterElementHideTagsNamed;
   // Tag -> Filter
   typedef std::multimap<std::wstring, CFilterElementHide> TFilterElementHideTags;
   TFilterElementHideTagsNamed m_elementHideTagsId;
   TFilterElementHideTagsNamed m_elementHideTagsClass;
   TFilterElementHideTags m_elementHideTags;
-  void ClearFilters();
+  bool AddFilterElementHide(std::wstring filter);
+  bool LoadHideFilters();
+  const std::wstring& domain;

[sergei, 2016/01/29 10:03:20]

That's very dangerous, make it non-reference.

[Eric, 2016/02/03 18:03:20]

Done.

+  InitializerType Initializer() override
+  {
+    return [this] { LoadHideFilters(); };
+  }
 
 public:
-  CPluginFilter();
-  bool LoadHideFilters(std::vector<std::wstring> filters);
-  bool AddFilterElementHide(std::wstring filter);
+  CPluginFilter(const std::wstring& domain)
+    : domain(domain)
+  {
+    SpawnInitializer();
+  }
   bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent) const;
-  HANDLE hideFiltersLoadedEvent;
+  void EnsureInitialized() { DetachedInitializer::EnsureInitialized(); }
 };
 
 
 #endif // _PLUGIN_FILTER_H_