Issue 119 - Switch to injecting CSS for element hiding

src/plugin/PluginDomTraverserBase.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
@@ skipping 19 matching lines @@
   CPluginDomTraverserCacheBase() : m_elements(0) {};
   void Init() { m_elements=0; }
 };
 
 template <class T>
 class CPluginDomTraverserBase
 {
 
 public:
 
-  CPluginDomTraverserBase(CPluginTab* tab);
+  explicit CPluginDomTraverserBase(const PluginFilterPtr& pluginFilter);
   ~CPluginDomTraverserBase();
 
   void TraverseHeader(bool isHeaderTraversed);
 
   void TraverseDocument(IWebBrowser2* pBrowser, const std::wstring& domain, const std::wstring& documentUrl);
   void TraverseSubdocument(IWebBrowser2* pBrowser, const std::wstring& domain, const std::wstring& documentUrl);
 
   virtual void ClearCache();
 
 protected:
 
   virtual bool OnIFrame(IHTMLElement* pEl, const std::wstring& url, const std::wstring& indent) { return true; }
   virtual bool OnElement(IHTMLElement* pEl, const std::wstring& tag, T* cache, bool isDebug, const std::wstring& indent) { return true; }
 
   virtual bool IsEnabled();
 
 protected:
 
   void TraverseDocument(IWebBrowser2* pBrowser, bool isMainDoc, const std::wstring& indent);
   void TraverseChild(IHTMLElement* pEl, IWebBrowser2* pBrowser, const std::wstring& indent, bool isCached=true);
 
   CComAutoCriticalSection m_criticalSection;
 
   std::wstring m_domain;
   std::wstring m_documentUrl;
 
   bool m_isHeaderTraversed;
-
-  // Caching    
-  long m_cacheDomElementCount;
 
   int m_cacheIndexLast;
   int m_cacheElementsMax;
   std::set<std::wstring> m_cacheDocumentHasFrames;
   std::set<std::wstring> m_cacheDocumentHasIframes;
 
   T* m_cacheElements;
 
-  CPluginTab* m_tab;
-  CComPtr<IWebBrowser2> m_pBrowser;
+  std::shared_ptr<const CPluginFilter> m_pluginFilter;
 };
 
 template <class T>
-CPluginDomTraverserBase<T>::CPluginDomTraverserBase(CPluginTab* tab) : 
-  m_tab(tab), m_isHeaderTraversed(false), m_cacheDomElementCount(0), m_cacheIndexLast(0), m_cacheElementsMax(5000)
+CPluginDomTraverserBase<T>::CPluginDomTraverserBase(const PluginFilterPtr& pluginFilter)
+  : m_pluginFilter(pluginFilter), m_isHeaderTraversed(false), m_cacheIndexLast(0), m_cacheElementsMax(5000)
 {
   m_cacheElements = new T[m_cacheElementsMax];
 }
 
 
 template <class T>
 CPluginDomTraverserBase<T>::~CPluginDomTraverserBase()
 {
   delete [] m_cacheElements;
 }
@@ skipping 25 matching lines @@
 template <class T>
 bool CPluginDomTraverserBase<T>::IsEnabled()
 {
   return CPluginSettings::GetInstance()->IsPluginEnabled();
 }
 
 
 template <class T>
 void CPluginDomTraverserBase<T>::TraverseDocument(IWebBrowser2* pBrowser, bool isMainDoc, const std::wstring& indent)
 {
-  DWORD res = WaitForSingleObject(m_tab->m_filter.hideFiltersLoadedEvent, ENGINE_STARTUP_TIMEOUT);
   if (!IsEnabled()) return;
 
   VARIANT_BOOL isBusy;
   if (SUCCEEDED(pBrowser->get_Busy(&isBusy)))
   {
     if (isBusy != VARIANT_FALSE)
     {
       return;
     }
   }
@@ skipping 314 matching lines @@
   {
     m_cacheIndexLast = 0;
     m_cacheDocumentHasFrames.clear();
     m_cacheDocumentHasIframes.clear();
   }
   m_criticalSection.Unlock();
 }
 
 
 #endif // _PLUGIN_DOM_TRAVERSER_BASE_H_