Issue 119 - Switch to injecting CSS for element hiding

src/plugin/PluginFilter.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * 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 "AdblockPlusClient.h"
 #include "PluginFilter.h"
 #include "PluginSettings.h"
-#include "PluginClient.h"
-#include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginClass.h"
 #include "mlang.h"
-
 #include "..\shared\CriticalSection.h"
 #include "..\shared\Utils.h"
+#include "..\shared\MsHTMLUtils.h"
 
 // The filters are described at http://adblockplus.org/en/filters
 
 static CriticalSection s_criticalSectionFilterMap;
-
-namespace
-{
-  struct GetHtmlElementAttributeResult
-  {
-    GetHtmlElementAttributeResult() : isAttributeFound(false)
-    {
-    }
-    std::wstring attributeValue;
-    bool isAttributeFound;
-  };
-
-  GetHtmlElementAttributeResult GetHtmlElementAttribute(IHTMLElement& htmlElement,
-    const ATL::CComBSTR& attributeName)
-  {
-    GetHtmlElementAttributeResult retValue;
-    ATL::CComVariant vAttr;
-    ATL::CComPtr<IHTMLElement4> htmlElement4;
-    if (FAILED(htmlElement.QueryInterface(&htmlElement4)) || !htmlElement4)
-    {
-      return retValue;
-    }
-    ATL::CComPtr<IHTMLDOMAttribute> attributeNode;
-    if (FAILED(htmlElement4->getAttributeNode(attributeName, &attributeNode)) || !attributeNode)
-    {
-      return retValue;
-    }
-    // we set that attribute found but it's not necessary that we can retrieve its value
-    retValue.isAttributeFound = true;
-    if (FAILED(attributeNode->get_nodeValue(&vAttr)))
-    {
-      return retValue;
-    }
-    if (vAttr.vt == VT_BSTR && vAttr.bstrVal)
-    {
-      retValue.attributeValue = vAttr.bstrVal;
-    }
-    else if (vAttr.vt == VT_I4)
-    {
-      retValue.attributeValue = std::to_wstring(vAttr.iVal);
-    }
-    return retValue;
-  }
-}
 
 // ============================================================================
 // CFilterElementHideAttrSelector
 // ============================================================================
 
 CFilterElementHideAttrSelector::CFilterElementHideAttrSelector() : m_type(TYPE_NONE), m_pos(POS_NONE), m_bstrAttr(NULL)
 {
 }
 
 CFilterElementHideAttrSelector::CFilterElementHideAttrSelector(const CFilterElementHideAttrSelector& filter)
@@ skipping 372 matching lines @@
 
   return true;
 }
 
 
 
 // ============================================================================
 // CPluginFilter
 // ============================================================================
 
-CPluginFilter::CPluginFilter(const CString& dataPath) : m_dataPath(dataPath)
-{
-  ClearFilters();
-}
-
-
 bool CPluginFilter::AddFilterElementHide(CString filterText)
 {
   DEBUG_FILTER("Input: " + filterText + " filterFile" + filterFile);
   CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   {
     CString filterString  = filterText;
     // Create filter descriptor
     std::auto_ptr<CFilterElementHide> filter;
 
     CString wholeFilterString = filterString;
@@ skipping 156 matching lines @@
           CPluginDebug::DebugResultHiding(tag, L"-", ToWstring(tagIt->second.m_filterText));
 #endif
         return true;
       }
     }
   }
 
   return false;
 }
 
-bool CPluginFilter::LoadHideFilters(const std::vector<std::wstring>& filters)
-{
-  ClearFilters();
+CPluginFilter::CPluginFilter(const std::vector<std::wstring>& filters)
+{
   m_hideFilters = filters;
-  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)
     {
       CString filter((*it).c_str());
       // If the line is not commented out
       if (!filter.Trim().IsEmpty() && filter.GetAt(0) != '!' && filter.GetAt(0) != '[')
       {
         int filterType = 0;
 
         // See http://adblockplus.org/en/filters for further documentation
 
         try
         {
           AddFilterElementHide(filter);
         }
         catch(...)
         {
 #ifdef ENABLE_DEBUG_RESULT
           CPluginDebug::DebugResult(L"Error loading hide filter: " + ToWstring(filter));
 #endif
         }
       }
     }
   }
-
-  return isRead;
-}
-
-void CPluginFilter::ClearFilters()
-{
-  // Clear filter maps
-  CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
-  m_elementHideTags.clear();
-  m_elementHideTagsId.clear();
-  m_elementHideTagsClass.clear();
-  m_hideFilters.clear();
-}
-
-bool CPluginFilter::ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug) const
-{
-  std::wstring srcTrimmed = TrimString(src);
-
-  // We should not block the empty string, so all filtering does not make sense
-  // Therefore we just return
-  if (srcTrimmed.empty())
-  {
-    return false;
-  }
-
-  CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  CPluginClient* client = CPluginClient::GetInstance();
-  bool result = client->Matches(srcTrimmed, contentType, domain);
-
-#ifdef ENABLE_DEBUG_RESULT
-  if (addDebug)
-  {
-    std::wstring type = ToUtf16String(AdblockPlus::FilterEngine::ContentTypeToString(contentType));
-    if (result)
-    {
-      CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain);
-    }
-    else
-    {
-      CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain);
-    }
-  }
-#endif
-  return result;
-}
-
-const std::vector<std::wstring>& CPluginFilter::GetHideFilters() const
-{
-  DWORD res = WaitForSingleObject(hideFiltersLoadedEvent, ENGINE_STARTUP_TIMEOUT);
-  return m_hideFilters;
 }