Initial libadblockplus integration

Shared/PluginTabBase.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClient.h"
 #include "PluginSettings.h"
 #include "PluginDictionary.h"
 #ifdef SUPPORT_CONFIG
 #include "PluginConfig.h"
 #endif
 #include "PluginTab.h"
 #include "PluginDomTraverser.h"
@@ skipping 11 matching lines @@
 #ifdef SUPPORT_WHITELIST
 int CPluginTabBase::s_whitelistVersion = 0;
 #endif
 #ifdef SUPPORT_CONFIG
 int CPluginTabBase::s_configVersion = 0;
 #endif
 
 
 CPluginTabBase::CPluginTabBase(CPluginClass* plugin) : m_plugin(plugin), m_isActivated(false)
 {
+  m_filter = std::auto_ptr<CPluginFilter>(new CPluginFilter());
+
   CPluginClient* client = CPluginClient::GetInstance();
   if (client->GetIEVersion() < 10)
   {
     m_isActivated = true;
   }
 
   DWORD id;
   m_hThread = ::CreateThread(NULL, 0, ThreadProc, (LPVOID)this, CREATE_SUSPENDED, &id);
   if (m_hThread)
   {
@@ skipping 82 matching lines @@
 
 
 void CPluginTabBase::OnNavigate(const CString& url)
 {
   SetDocumentUrl(url);
 
 
 #ifdef SUPPORT_FRAME_CACHING
   ClearFrameCache(GetDocumentDomain());
 #endif
+
+  std::string domainString = CT2A(GetDocumentDomain());
+  m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetFilterEngine()->GetElementHidingSelectors(domainString));
 
 #ifdef SUPPORT_DOM_TRAVERSER
   m_traverser->ClearCache();
 #endif
 }
 
 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser)
 {
 #ifdef SUPPORT_DOM_TRAVERSER
   m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl());
@@ skipping 111 matching lines @@
   CString domain;
 
   m_criticalSection.Lock();
   {
     m_documentUrl = url;
     m_documentDomain = CPluginClient::ExtractDomain(url);
 
     domain = m_documentDomain;
   }
   m_criticalSection.Unlock();
-
-#ifdef SUPPORT_WHITELIST
-  CPluginSettings::GetInstance()->AddDomainToHistory(domain);
-#endif
 }
 
 CString CPluginTabBase::GetDocumentUrl()
 {
   CString url;
 
   m_criticalSection.Lock();
   {
     url = m_documentUrl;
   }
@@ skipping 126 matching lines @@
           client->ClearWhiteListCache();
           isChanged = true;
         }
 #endif // SUPPORT_WHITELIST
 
 #ifdef SUPPORT_FILTER
         int newFilterVersion = settings->GetTabVersion(SETTING_TAB_FILTER_VERSION);
         if (s_filterVersion != newFilterVersion)
         {
           s_filterVersion = newFilterVersion;
-          client->LoadFilters();
           isChanged = true;
         }
 #endif
         if (isChanged)
         {
           tab->m_plugin->UpdateStatusBar();
         }
 
         tab->m_isActivated = false;
       }
@@ skipping 14 matching lines @@
 
         // Non-hanging sleep
         Sleep(50);
       }
 
       tabLoopIteration++;
   }
 
   return 0;
 }