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

src/plugin/PluginFilter.cpp

 /*
  * 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
@@ skipping 427 matching lines @@
     return m_predecessor->IsMatchFilterElementHide(pDomPredecessor);
   }
 
   return true;
 }
 
 // ============================================================================
 // CPluginFilter
 // ============================================================================
 
-CPluginFilter::CPluginFilter()
-{
-  ClearFilters();
-}
-
 bool CPluginFilter::AddFilterElementHide(std::wstring filterText)
 {
   DEBUG_FILTER(L"Input: " + filterText + L" filterFile" + filterFile);
   CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   {
     // Create filter descriptor
     std::auto_ptr<CFilterElementHide> filter;
     wchar_t separatorChar;
     do
     {
@@ skipping 139 matching lines @@
         CPluginDebug::DebugResultHiding(tag, L"-", tagIt->second.m_filterText);
 #endif
         return true;
       }
     }
   }
 
   return false;
 }
 
-bool CPluginFilter::LoadHideFilters(std::vector<std::wstring> filters)
+bool CPluginFilter::LoadHideFilters()
 {
-  ClearFilters();
+  auto filters = CPluginClient::GetInstance()->GetElementHidingSelectors(domain);
   bool isRead = false;
   CPluginClient* client = CPluginClient::GetInstance();
 
   // Parse hide string
   int pos = 0;
   CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   {
     for (auto it = filters.begin(); it < filters.end(); ++it)
     {
       std::wstring filter(TrimString(*it));
@@ skipping 13 matching lines @@
 #ifdef ENABLE_DEBUG_RESULT
           CPluginDebug::DebugResult(L"Error loading hide filter: " + filter);
 #endif
         }
       }
     }
   }
 
   return isRead;
 }
-
-void CPluginFilter::ClearFilters()
-{
-  // Clear filter maps
-  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
-  m_elementHideTags.clear();
-  m_elementHideTagsId.clear();
-  m_elementHideTagsClass.clear();
-}
-