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

Unified Diff: compiled/filter/Filter.cpp

Issue 29867635: Issue 6888 - Remove old abp-properties syntax conversion (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Aug. 29, 2018, 2:59 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « compiled/filter/ElemHideBase.cpp ('k') | test/elemHideEmulation.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiled/filter/Filter.cpp
===================================================================
--- a/compiled/filter/Filter.cpp
+++ b/compiled/filter/Filter.cpp
@@ -101,33 +101,25 @@
// Parsing also normalizes the filter text, so it has to be done before the
// lookup in knownFilters.
union
{
RegExpFilterData regexp;
ElemHideData elemhide;
} data;
- bool needConversion = false;
ParsedDomains parsedDomains;
DependentString error;
Filter::Type type = CommentFilter::Parse(text);
if (type == Filter::Type::UNKNOWN)
- type = ElemHideBase::Parse(text, error, data.elemhide, needConversion, parsedDomains);
+ type = ElemHideBase::Parse(text, error, data.elemhide, parsedDomains);
if (type == Filter::Type::UNKNOWN)
type = RegExpFilter::Parse(text, error, data.regexp);
- if (needConversion)
- text = ElemHideBase::ConvertFilter(text, data.elemhide.mSelectorStart);
-
- // At that point we failed the conversion.
- if (text.empty())
- return nullptr;
-
auto knownFilter = knownFilters.find(text);
if (knownFilter)
{
knownFilter->second->AddRef();
return knownFilter->second;
}
FilterPtr filter;
« no previous file with comments | « compiled/filter/ElemHideBase.cpp ('k') | test/elemHideEmulation.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld