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 f51581e46d5804f7bf33de61d96f021f9191ec74..732b3df7fac19196b50d5ff43b2e04db1970c847 100644
--- a/src/plugin/AdblockPlusClient.h
+++ b/src/plugin/AdblockPlusClient.h
@@ -42,7 +42,7 @@ private:
 
   CComAutoCriticalSection m_criticalSectionFilter;
   CComAutoCriticalSection m_criticalSectionCache;
-  static CComAutoCriticalSection s_criticalSectionLocal;
+  static CComAutoCriticalSection s_criticalSectionLocal;
 
   std::map<std::wstring, bool> m_cacheBlockedSources;
 
@@ -68,9 +68,9 @@ public:
   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);
-  std::string GetWhitelistingFilter(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>());
+  std::string GetWhitelistingFilter(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, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain);
   std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain);
@@ -101,7 +101,7 @@ public:
 
   bool IsFirstRun();
 };
-
-typedef CAdblockPlusClient CPluginClient;
+
+typedef CAdblockPlusClient CPluginClient;
 
 #endif // _ADBLOCK_PLUS_CLIENT_H_