Issue #2230 - Refactor filter life cycle and use

src/plugin/AdblockPlusDomTraverser.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
  * 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/>.
  */
 
 #include "PluginStdAfx.h"
 #include "AdblockPlusDomTraverser.h"
 #include "AdblockPlusClient.h"
 #include "PluginFilter.h"
 #include "PluginSettings.h"
 #include "..\shared\Utils.h"
 
 
-CPluginDomTraverser::CPluginDomTraverser(CPluginTab* tab) : CPluginDomTraverserBase(tab)
+CPluginDomTraverser::CPluginDomTraverser(CPluginFilter* filterSet) : CPluginDomTraverserBase(filterSet)
 {
 }
 
 
 bool CPluginDomTraverser::OnIFrame(IHTMLElement* pEl, const std::wstring& url, const std::wstring& indent)
 {
   CPluginClient* client = CPluginClient::GetInstance();
 
   // If src should be blocked, set style display:none on iframe
   bool isBlocked = client->ShouldBlock(url,
     AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_SUBDOCUMENT, m_documentUrl);
   if (isBlocked)
   {
     HideElement(pEl, L"iframe", url, true, indent);
   }
 
   return !isBlocked;
 }
 
 
 bool CPluginDomTraverser::OnElement(IHTMLElement* pEl, const std::wstring& tag, CPluginDomTraverserCache* cache, bool isDebug, const std::wstring& indent)
 {
   if (cache->m_isHidden)
   {
     return false;
   }
 
   // Check if element is hidden
-  CPluginClient* client = CPluginClient::GetInstance();
-
-  cache->m_isHidden = client->IsElementHidden(tag, pEl, m_domain, indent, &(m_tab->m_filter));
+  cache->m_isHidden = filterSet->IsElementHidden(tag, pEl, m_domain, indent);
   if (cache->m_isHidden)
   {
     HideElement(pEl, tag, L"", false, indent);
     return false;
   }
 
   // Images
   if (tag == L"img")
   {
     CComVariant vAttr;
     if (SUCCEEDED(pEl->getAttribute(ATL::CComBSTR(L"src"), 0, &vAttr)) && vAttr.vt == VT_BSTR)
     {
       std::wstring src = ToWstring(vAttr.bstrVal);
       if (!src.empty())
       {
         // If src should be blocked, set style display:none on image
+      CPluginClient* client = CPluginClient::GetInstance();
         cache->m_isHidden = client->ShouldBlock(src,
           AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_IMAGE, m_documentUrl);
         if (cache->m_isHidden)
         {
           HideElement(pEl, L"image", src, true, indent);
           return false;
         }
       }
     }
   }
@@ skipping 65 matching lines @@
       DEBUG_HIDE_EL(ToWstring(indent) + L"HideEl::Hiding " + ToWstring(type) + L" url:" + url)
 #ifdef ENABLE_DEBUG_RESULT
         if (isDebug)
         {
           CPluginDebug::DebugResultHiding(type, url, L"-");
         }
 #endif // ENABLE_DEBUG_RESULT
     }
   }
 }