Initial libadblockplus integration

Shared/AdblockPlusClient.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginDictionary.h"
 #include "PluginHttpRequest.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
@@ skipping 31 matching lines @@
       s_instance = client;
     }
 
     instance = s_instance;
   }
   s_criticalSectionLocal.Unlock();
 
   return instance;
 }
 
-bool CAdblockPlusClient::LoadFilters()
-{
-  return m_filter->LoadHideFilters(filterEngine->GetElementHidingRules());
-}
-
 AdblockPlus::FilterEngine* CAdblockPlusClient::GetFilterEngine()
 {
   return filterEngine.get();
 }
 
 bool CAdblockPlusClient::ShouldBlock(CString src, int contentType, const CString& domain, bool addDebug)
 {
   bool isBlocked = false;
 
   bool isCached = false;
@@ skipping 29 matching lines @@
         m_cacheBlockedSources[src] = isBlocked;
       }
       m_criticalSectionCache.Unlock();
     }
   }
 
 
   return isBlocked;
 }
 
-bool CAdblockPlusClient::IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent)
+bool CAdblockPlusClient::IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent, CPluginFilter* filter)
 {
   bool isHidden;
   m_criticalSectionFilter.Lock();
   {
-    isHidden = m_filter.get() && m_filter->IsElementHidden(tag, pEl, domain, indent);
+    isHidden = filter && filter->IsElementHidden(tag, pEl, domain, indent);
   }
   m_criticalSectionFilter.Unlock();
   return isHidden;
 }
 
 bool CAdblockPlusClient::IsUrlWhiteListed(const CString& url)
 {
   bool isWhitelisted = CPluginClientBase::IsUrlWhiteListed(url);
   if (isWhitelisted == false && !url.IsEmpty())
   {
@@ skipping 25 matching lines @@
   BYTE version[50];
   cbData = 50;
   status = RegQueryValueEx(hKey, L"Version", NULL, &type, (BYTE*)version, &cbData);
   if (status != 0)
   {
     return 0;
   }
   RegCloseKey(hKey);
   return (int)(version[0] - 48);
 }