Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/FilterEngine.cpp

Issue 29331737: Issue 3363 - Implement IsDocumentWhitelisted and IsElemhideWhitelisted (Closed)
Patch Set: Even more issues Created Dec. 2, 2015, 6:09 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/AdblockPlus/FilterEngine.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 CONTENT_TYPE_DOCUMENT, 318 CONTENT_TYPE_DOCUMENT,
319 lastDocumentUrl); 319 lastDocumentUrl);
320 if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION) 320 if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
321 return match; 321 return match;
322 lastDocumentUrl = documentUrl; 322 lastDocumentUrl = documentUrl;
323 } 323 }
324 324
325 return CheckFilterMatch(url, contentType, lastDocumentUrl); 325 return CheckFilterMatch(url, contentType, lastDocumentUrl);
326 } 326 }
327 327
328 bool FilterEngine::IsDocumentWhitelisted(const std::string& url,
329 const std::vector<std::string>& documentUrls) const
330 {
331 return GetWhitelistingFilter(url, CONTENT_TYPE_DOCUMENT, documentUrls) != 0;
332 }
333
334 bool FilterEngine::IsElemhideWhitelisted(const std::string& url,
335 const std::vector<std::string>& documentUrls) const
336 {
337 return GetWhitelistingFilter(url, CONTENT_TYPE_ELEMHIDE, documentUrls) != 0;
338 }
339
328 AdblockPlus::FilterPtr FilterEngine::CheckFilterMatch(const std::string& url, 340 AdblockPlus::FilterPtr FilterEngine::CheckFilterMatch(const std::string& url,
329 ContentType contentType, 341 ContentType contentType,
330 const std::string& documentUrl) const 342 const std::string& documentUrl) const
331 { 343 {
332 JsValuePtr func = jsEngine->Evaluate("API.checkFilterMatch"); 344 JsValuePtr func = jsEngine->Evaluate("API.checkFilterMatch");
333 JsValueList params; 345 JsValueList params;
334 params.push_back(jsEngine->NewValue(url)); 346 params.push_back(jsEngine->NewValue(url));
335 params.push_back(jsEngine->NewValue(ContentTypeToString(contentType))); 347 params.push_back(jsEngine->NewValue(ContentTypeToString(contentType)));
336 params.push_back(jsEngine->NewValue(documentUrl)); 348 params.push_back(jsEngine->NewValue(documentUrl));
337 JsValuePtr result = func->Call(params); 349 JsValuePtr result = func->Call(params);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 467
456 468
457 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2) 469 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
458 { 470 {
459 JsValueList params; 471 JsValueList params;
460 params.push_back(jsEngine->NewValue(v1)); 472 params.push_back(jsEngine->NewValue(v1));
461 params.push_back(jsEngine->NewValue(v2)); 473 params.push_back(jsEngine->NewValue(v2));
462 JsValuePtr func = jsEngine->Evaluate("API.compareVersions"); 474 JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
463 return func->Call(params)->AsInt(); 475 return func->Call(params)->AsInt();
464 } 476 }
477
478 FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
479 ContentType contentType, const std::string& documentUrl) const
480 {
481 FilterPtr match = Matches(url, contentType, documentUrl);
482 if (match && match->GetType() == Filter::TYPE_EXCEPTION)
483 {
484 return match;
485 }
486 return FilterPtr();
487 }
488
489 FilterPtr FilterEngine::GetWhitelistingFilter(const std::string& url,
490 ContentType contentType,
491 const std::vector<std::string>& documentUrls) const
492 {
493 if (documentUrls.empty())
494 {
495 return GetWhitelistingFilter(url, contentType, "");
496 }
497
498 std::vector<std::string>::const_iterator urlIterator = documentUrls.begin();
499 std::string currentUrl = url;
500 do
501 {
502 std::string parentUrl = *urlIterator++;
503 FilterPtr filter = GetWhitelistingFilter(
504 currentUrl, contentType, parentUrl);
505 if (filter)
506 {
507 return filter;
508 }
509 currentUrl = parentUrl;
510 }
511 while (urlIterator != documentUrls.end());
512 return FilterPtr();
513 }
OLDNEW
« no previous file with comments | « include/AdblockPlus/FilterEngine.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld