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

src/plugin/AdblockPlusClient.h

Index: src/plugin/AdblockPlusClient.h
diff --git a/src/plugin/AdblockPlusClient.h b/src/plugin/AdblockPlusClient.h
index 097f699859eb59869c616e5a1382f80f63086fe5..4460f487a9d1ad3be8cdd8503deafbe9a35bf5e1 100644
--- a/src/plugin/AdblockPlusClient.h
+++ b/src/plugin/AdblockPlusClient.h
@@ -21,8 +21,9 @@
 
 #include "PluginTypedef.h"
 #include "PluginClientBase.h"
-#include "../shared/Communication.h"
-#include "../shared/CriticalSection.h"
+#include "../shared/Communication.h"
+#include "../shared/CriticalSection.h"
+#include <AdblockPlus/FilterEngine.h>
 
 
 class CPluginFilter;
@@ -54,7 +55,7 @@ private:
   // Private constructor used by the singleton pattern
   CAdblockPlusClient();
 
-  bool CallEngine(Communication::OutputBuffer& message, Communication::InputBuffer& inputBuffer = Communication::InputBuffer());
+  bool CallEngine(Communication::OutputBuffer& message, Communication::InputBuffer& inputBuffer = Communication::InputBuffer());
   bool CallEngine(Communication::ProcType proc, Communication::InputBuffer& inputBuffer = Communication::InputBuffer());
 public:
 
@@ -66,13 +67,13 @@ public:
 
   // Removes the url from the list of whitelisted urls if present
   // Only called from ui thread
-  bool ShouldBlock(const std::wstring& src, int contentType, const std::wstring& domain, bool addDebug=false);
+  bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug=false);
 
   bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent, CPluginFilter* filter);
   bool IsWhitelistedUrl(const std::wstring& url);
   bool IsElemhideWhitelistedOnDomain(const std::wstring& url);
 
-  bool Matches(const std::wstring& url, const std::wstring& contentType, const std::wstring& domain);
+  bool Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain);
   std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain);
   std::vector<SubscriptionDescription> FetchAvailableSubscriptions();
   std::vector<SubscriptionDescription> GetListedSubscriptions();
@@ -92,10 +93,10 @@ public:
   bool GetPref(const std::wstring& name, bool defaultValue = false);
   int64_t GetPref(const std::wstring& name, int64_t defaultValue = 0);
   void CheckForUpdates(HWND callbackWindow);
-  std::wstring GetAppLocale();
-  std::wstring GetDocumentationLink();
+  std::wstring GetAppLocale();
+  std::wstring GetDocumentationLink();
   bool TogglePluginEnabled();
-  std::wstring GetHostFromUrl(const std::wstring& url);
+  std::wstring GetHostFromUrl(const std::wstring& url);
   int CompareVersions(const std::wstring& v1, const std::wstring& v2);
 
   bool IsFirstRun();