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

src/plugin/AdblockPlusClient.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 206 matching lines @@
 {
   bool isHidden;
   m_criticalSectionFilter.Lock();
   {
     isHidden = filter && filter->IsElementHidden(tag, pEl, domain, indent);
   }
   m_criticalSectionFilter.Unlock();
   return isHidden;
 }
 
-bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)
+bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url, const std::vector<std::string>& frameHierarchy)
 {
-  return !GetWhitelistingFilter(url).empty();
+  return !GetWhitelistingFilter(url, frameHierarchy).empty();
 }
 
-std::string CAdblockPlusClient::GetWhitelistingFilter(const std::wstring& url)
+std::string CAdblockPlusClient::GetWhitelistingFilter(const std::wstring& url, const std::vector<std::string>& frameHierarchy)
 {
   DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" start").c_str());
   Communication::OutputBuffer request;
-  request << Communication::PROC_GET_WHITELISTING_FITER << ToUtf8String(url);
+  request << Communication::PROC_GET_WHITELISTING_FITER << ToUtf8String(url) << frameHierarchy;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return "";
 
   std::string filterText;
   response >> filterText;
 
   DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" end").c_str());
   return filterText;
 }
 
-bool CAdblockPlusClient::IsElemhideWhitelistedOnDomain(const std::wstring& url)
+bool CAdblockPlusClient::IsElemhideWhitelistedOnDomain(const std::wstring& url, const std::vector<std::string>& frameHierarchy)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << ToUtf8String(url);
+  request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << ToUtf8String(url) << frameHierarchy;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return false;
 
   bool isWhitelisted;
   response >> isWhitelisted;
   return isWhitelisted;
 }
 
@@ skipping 270 matching lines @@
   DEBUG_GENERAL("CompareVersions");
   Communication::OutputBuffer request;
   request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8String(v2);
   Communication::InputBuffer response;
   if (!CallEngine(request, response))
     return 0;
   int result;
   response >> result;
   return result;
 }