Consider the frame structure in Matches()

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 197 matching lines @@
   std::vector<SubscriptionPtr> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(SubscriptionPtr(new Subscription(*it)));
   return result;
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
     const std::string& contentType,
     const std::string& documentUrl) const
 {
+  std::vector<std::string> documentUrls;
+  documentUrls.push_back(documentUrl);
+  return Matches(url, contentType, documentUrls);
+}
+
+AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
+    const std::string& contentType,
+    const std::vector<std::string>& documentUrls) const
+{
+  if (documentUrls.empty())
+    return CheckFilterMatch(url, contentType, "");
+
+  std::string lastDocumentUrl = documentUrls.front();
+  for (std::vector<std::string>::const_iterator it = documentUrls.begin();
+       it != documentUrls.end(); it++) {
+    const std::string documentUrl = *it;
+    AdblockPlus::FilterPtr match = CheckFilterMatch(documentUrl, "DOCUMENT",
+                                                    lastDocumentUrl);
+    if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
+      return match;
+    lastDocumentUrl = documentUrl;
+  }
+
+  return CheckFilterMatch(url, contentType, documentUrls.back());

[Wladimir Palant, 2013/11/04 07:17:28]

Nit: use lastDocumentUrl instead of documentUrls.back()?

[Felix Dahlke, 2013/11/15 08:18:19]

Done.

+}
+
+AdblockPlus::FilterPtr FilterEngine::CheckFilterMatch(const std::string& url,
+    const std::string& contentType,
+    const std::string& documentUrl) const
+{
   JsValuePtr func = jsEngine->Evaluate("API.checkFilterMatch");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
   params.push_back(jsEngine->NewValue(contentType));
   params.push_back(jsEngine->NewValue(documentUrl));
   JsValuePtr result = func->Call(params);
   if (!result->IsNull())
     return FilterPtr(new Filter(result));
   else
     return FilterPtr();
@@ skipping 60 matching lines @@
 {
   jsEngine->RemoveEventCallback("filterChange");
 }
 
 void FilterEngine::FilterChanged(FilterEngine::FilterChangeCallback callback, JsValueList& params)
 {
   std::string action(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
   callback(action, item);
 }