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 11 matching lines @@
 #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\ContentType.h"
-
 
 // The filters are described at http://adblockplus.org/en/filters
 
 static CriticalSection s_criticalSectionFilterMap;
 
 namespace
 {
   struct GetHtmlElementAttributeResult
   {
     GetHtmlElementAttributeResult() : isAttributeFound(false)
@@ skipping 222 matching lines @@
   m_predecessor = filter.m_predecessor;
 }
 
 
 // ============================================================================
 // CFilter
 // ============================================================================
 
 CFilter::CFilter(const CFilter& filter)
 {
-  m_contentType = filter.m_contentType;
   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(AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_OTHER),
+  m_isThirdParty(false),
   m_isFromStart(false), m_isFromEnd(false), m_hitCount(0)
 {
 }
 
 
 bool CFilterElementHide::IsMatchFilterElementHide(IHTMLElement* pEl) const
 {
   HRESULT hr;
 
   if (!m_tagId.IsEmpty())
@@ skipping 419 matching lines @@
   }
 
   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(ContentTypeToString(contentType));
+    std::wstring type = ToUtf16String(AdblockPlus::FilterEngine::ContentTypeToString(contentType));
     if (result)
     {
       CPluginDebug::DebugResultBlocking(ToCString(type), srcTrimmed, domain);
     }
     else
     {
       CPluginDebug::DebugResultIgnoring(ToCString(type), srcTrimmed, domain);
     }
   }
 #endif
   return result;
 }