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

src/plugin/PluginFilter.h

 /*
  * 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
  * 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/>.
  */
 
 #ifndef _PLUGIN_FILTER_H_
 #define _PLUGIN_FILTER_H_
 
 
 #include "PluginTypedef.h"
 #include <memory>
+#include <AdblockPlus/FilterEngine.h>
 
 enum CFilterElementHideAttrPos
 {
   POS_NONE = 0, STARTING, ENDING, ANYWHERE, EXACT
 };
 
 enum CFilterElementHideAttrType
 {
   TYPE_NONE = 0, STYLE, ID, CLASS
 };
@@ skipping 56 matching lines @@
 
 // ============================================================================
 // CFilter
 // ============================================================================
 
 class CFilter
 {
 
 public:
 
-  enum EContentType
-  {
-    contentTypeUnknown = 0,
-    contentTypeOther = 1,
-    contentTypeScript = 2,
-    contentTypeImage = 4,
-    contentTypeStyleSheet = 8,
-    contentTypeObject = 16,
-    contentTypeSubdocument = 32,
-    contentTypeDocument = 64,
-    contentTypeBackground = 256,
-    contentTypeXbl = 512,
-    contentTypePing = 1024,
-    contentTypeXmlHttpRequest = 2048,
-    contentTypeObjectSubrequest = 4096,
-    contentTypeDtd = 8192,
-    contentTypeAny = 65535
-  } contentType;
 
   enum EFilterType
   {
     filterTypeBlocking = 0,
     filterTypeWhiteList = 1,
     filterTypeElementHide = 2,
     filterTypeUnknown = 3
   } filterType;
 
-  int m_contentType;
+  AdblockPlus::FilterEngine::ContentType m_contentType;

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

This member variable isn't used. It only appears in the default constructor and
the copy constructor.

[sergei, 2015/02/04 12:51:43]

Excellent!
Thanks, removed.

   enum EFilterType m_filterType;
   bool m_isMatchCase;
   bool m_isFirstParty;
   bool m_isThirdParty;
   bool m_isFromStart;
   bool m_isFromEnd;
   int m_hitCount;
   CString m_filterText;
 
   CFilter(const CFilter&);
   CFilter();
 };
 
 // ============================================================================
 // CPluginFilter
 // ============================================================================
 
 class CPluginFilter
 {
 
 private:
 
   CString m_dataPath;
 
-  std::map<int, CString> m_contentMapText;
-  
   typedef std::map<DWORD, CFilter> TFilterMap;
   typedef std::vector<CFilter> TFilterMapDefault;
 
   // (Tag,Name) -> Filter
   typedef std::multimap<std::pair<CString,CString>, CFilterElementHide> TFilterElementHideTagsNamed;
 
   // Tag -> Filter
   typedef std::multimap<CString, CFilterElementHide> TFilterElementHideTags;
 
 
@@ skipping 11 matching lines @@
   CPluginFilter(const CString& dataPath = "");
 
   bool LoadHideFilters(std::vector<std::wstring> filters);
 
   bool AddFilterElementHide(CString filter);
 
 
   bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent) const;
 
 
-  bool ShouldBlock(const std::wstring& src, int contentType, const std::wstring& domain, bool addDebug=false) const;
+  bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug=false) const;
 
   HANDLE hideFiltersLoadedEvent;
 };
 
 
 #endif // _PLUGIN_FILTER_H_