Issue 1793 - check whether the frame is whitelisted before injecting CSS

src/plugin/AdblockPlusClient.h

Index: src/plugin/AdblockPlusClient.h
diff --git a/src/plugin/AdblockPlusClient.h b/src/plugin/AdblockPlusClient.h
index 76323057d6e7f821e8f8f988b144c09811eefe41..745f2671a8715414cd3d17f6b1a2d5f2c788fd2b 100644
--- a/src/plugin/AdblockPlusClient.h
+++ b/src/plugin/AdblockPlusClient.h
@@ -4,8 +4,8 @@
 
 #include "PluginTypedef.h"
 #include "PluginClientBase.h"
-#include "../shared/Communication.h"
-#include "../shared/CriticalSection.h"
+#include "../shared/Communication.h"
+#include "../shared/CriticalSection.h"
 
 
 class CPluginFilter;
@@ -37,7 +37,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:
 
@@ -52,8 +52,8 @@ public:
   bool ShouldBlock(const std::wstring& src, int 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 IsWhitelistedUrl(const std::wstring& url, const std::vector<std::string>& frameHierarchy = std::vector<std::string>());
+  bool IsElemhideWhitelistedOnDomain(const std::wstring& url, const std::vector<std::string>& frameHierarchy = std::vector<std::string>());
 
   bool Matches(const std::wstring& url, const std::wstring& contentType, const std::wstring& domain);
   std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain);
@@ -75,10 +75,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();