Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

src/plugin/PluginFilter.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 12 matching lines @@
 #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"
 
-
 // The filters are described at http://adblockplus.org/en/filters
 
 static CriticalSection s_criticalSectionFilterMap;
 
 namespace
 {
   struct GetHtmlElementAttributeResult
   {
     GetHtmlElementAttributeResult() : isAttributeFound(false)
     {
@@ skipping 221 matching lines @@
   m_predecessor = filter.m_predecessor;
 }
 
 
 // ============================================================================
 // CFilter
 // ============================================================================
 
 CFilter::CFilter(const CFilter& filter)
 {
   m_contentType = filter.m_contentType;

[Eric, 2015/02/02 06:58:27]

Here it is in the copy constructor.

   m_filterType  = filter.m_filterType;
 
   m_isFirstParty = filter.m_isFirstParty;
   m_isThirdParty = filter.m_isThirdParty;
 
   m_isMatchCase  = filter.m_isMatchCase;
   m_isFromStart = filter.m_isFromStart;
   m_isFromEnd = filter.m_isFromEnd;
 
   m_filterText = filter.m_filterText;
 
   m_hitCount = filter.m_hitCount;
 }
 
 
-CFilter::CFilter() : m_isMatchCase(false), m_isFirstParty(false), m_isThirdParty(false), m_contentType(CFilter::contentTypeAny),
+CFilter::CFilter() : m_isMatchCase(false), m_isFirstParty(false),
+  m_isThirdParty(false), m_contentType(AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_OTHER),

[Eric, 2015/02/02 06:58:27]

Here it is in the default constructor.

   m_isFromStart(false), m_isFromEnd(false), m_hitCount(0)
 {
 }
 
 
 bool CFilterElementHide::IsMatchFilterElementHide(IHTMLElement* pEl) const
 {
   HRESULT hr;
 
   if (!m_tagId.IsEmpty())
@@ skipping 163 matching lines @@
 }
 
 
 
 // ============================================================================
 // CPluginFilter
 // ============================================================================
 
 CPluginFilter::CPluginFilter(const CString& dataPath) : m_dataPath(dataPath)
 {
-  m_contentMapText[CFilter::contentTypeDocument] = "DOCUMENT";
-  m_contentMapText[CFilter::contentTypeObject] = "OBJECT";
-  m_contentMapText[CFilter::contentTypeObjectSubrequest] = "OBJECT_SUBREQUEST";
-  m_contentMapText[CFilter::contentTypeImage] = "IMAGE";
-  m_contentMapText[CFilter::contentTypeScript] = "SCRIPT";
-  m_contentMapText[CFilter::contentTypeOther] = "OTHER";
-  m_contentMapText[CFilter::contentTypeUnknown] = "OTHER";
-  m_contentMapText[CFilter::contentTypeSubdocument] = "SUBDOCUMENT";
-  m_contentMapText[CFilter::contentTypeStyleSheet] = "STYLESHEET";
-  m_contentMapText[CFilter::contentTypeXmlHttpRequest] = "XMLHTTPREQUEST";
-
-  ClearFilters(); 
+  ClearFilters();
 }
 
 
 bool CPluginFilter::AddFilterElementHide(CString filterText)
 {
   DEBUG_FILTER("Input: " + filterText + " filterFile" + filterFile);
   CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);
   {
     CString filterString  = filterText;
     // Create filter descriptor
@@ skipping 216 matching lines @@
       }
       m_filterMapDefault[i].clear();
     }
 
     m_elementHideTags.clear();
     m_elementHideTagsId.clear();
     m_elementHideTagsClass.clear();
   }
 }
 
-bool CPluginFilter::ShouldBlock(const std::wstring& src, int contentType, const std::wstring& domain, bool addDebug) const
+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();
 
-  CString type;
+  CPluginClient* client = CPluginClient::GetInstance();
+  bool result = client->Matches(srcTrimmed, contentType, domain);
+
+#ifdef ENABLE_DEBUG_RESULT
   if (addDebug)
   {
-    type = "OTHER";
-
-    std::map<int,CString>::const_iterator it = m_contentMapText.find(contentType);
-    if (it != m_contentMapText.end())
+    std::wstring type = ToUtf16String(AdblockPlus::FilterEngine::ContentTypeToString(contentType));
+    if (result)
     {
-      type = it->second;
+      CPluginDebug::DebugResultBlocking(ToCString(type), srcTrimmed, domain);
+    }
+    else
+    {
+      CPluginDebug::DebugResultIgnoring(ToCString(type), srcTrimmed, domain);
     }
   }
-
-  CPluginClient* client = CPluginClient::GetInstance();
-  if (client->Matches(srcTrimmed, ToWstring(type), domain))
-  {
-    if (addDebug)
-    {
-      DEBUG_FILTER("Filter::ShouldBlock " + type + " YES")
-
-#ifdef ENABLE_DEBUG_RESULT
-        CPluginDebug::DebugResultBlocking(type, srcTrimmed, domain);
 #endif
-    }
-    return true;
-  }
-#ifdef ENABLE_DEBUG_RESULT
-  CPluginDebug::DebugResultIgnoring(type, srcTrimmed, domain);
-#endif
-  return false;
+  return result;
 }