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

Delta Between Two Patch Sets: compiled/Filter.cpp

Issue 29333474: Issue 4125 - [emscripten] Convert filter classes to C++ (Closed)
Left Patch Set: Improved performance Created Jan. 28, 2016, 2:31 p.m.
Right Patch Set: Addressed comments from Patch Set 28 Created March 21, 2017, 10:04 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « compiled/Filter.h ('k') | compiled/InvalidFilter.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #include "Filter.h" 1 #include "Filter.h"
2 #include "CommentFilter.h" 2 #include "CommentFilter.h"
3 #include "InvalidFilter.h"
3 #include "RegExpFilter.h" 4 #include "RegExpFilter.h"
5 #include "BlockingFilter.h"
6 #include "WhitelistFilter.h"
7 #include "ElemHideBase.h"
4 #include "ElemHideFilter.h" 8 #include "ElemHideFilter.h"
5 #include "ElemHideException.h" 9 #include "ElemHideException.h"
10 #include "CSSPropertyFilter.h"
6 #include "StringMap.h" 11 #include "StringMap.h"
7 12
8 namespace 13 namespace
9 { 14 {
10 /* TODO: This is a memory leak. Store raw/weak pointers as soon as we are 15 StringMap<Filter*> knownFilters(8192);
11 actually using the filters somewhere. */
12 StringMap<FilterPtr> knownFilters(8192);
13 16
14 void trim_spaces(String& str) 17 void NormalizeWhitespace(DependentString& text)
15 { 18 {
19 String::size_type start = 0;
20 String::size_type end = text.length();
21
22 // Remove leading spaces and special characters like line breaks
23 for (; start < end; start++)
24 if (text[start] > ' ')
25 break;
26
27 // Now look for invalid characters inside the string
16 String::size_type pos; 28 String::size_type pos;
29 for (pos = start; pos < end; pos++)
30 if (text[pos] < ' ')
31 break;
17 32
18 // Remove leading whitespace 33 if (pos < end)
19 for (pos = 0; pos < str.length(); ++pos) 34 {
20 if (str[pos] != u' ') 35 // Found invalid characters, copy all the valid characters while skipping
36 // the invalid ones.
37 String::size_type delta = 1;
38 for (pos = pos + 1; pos < end; pos++)
39 {
40 if (text[pos] < ' ')
41 delta++;
42 else
43 text[pos - delta] = text[pos];
44 }
45 end -= delta;
46 }
47
48 // Remove trailing spaces
49 for (; end > 0; end--)
50 if (text[end - 1] != ' ')
21 break; 51 break;
22 str.reset(str, pos);
23 52
24 // Remove trailing whitespace 53 // Set new string boundaries
25 for (pos = str.length(); pos > 0; --pos) 54 text.reset(text, start, end - start);
26 if (str[pos - 1] != u' ')
27 break;
28 str.reset(str, 0, pos);
29 }
30
31 void remove_spaces(String& str)
32 {
33 String::size_type pos;
34
35 for (String::size_type i = 0; i < str.length(); ++i)
36 if (str[i] != u' ')
37 str[pos++] = str[i];
38
39 str.reset(str, 0, pos);
40 } 55 }
41 } 56 }
42 57
43 Filter::Filter(const String& text) 58 Filter::Filter(Type type, const String& text)
44 : mText(text) 59 : mType(type), mText(text)
45 { 60 {
46 annotate_address(this, "Filter"); 61 annotate_address(this, "Filter");
47 mText.ensure_own_buffer();
48 } 62 }
49 63
50 String Filter::Serialize() 64 Filter::~Filter()
51 { 65 {
52 String result(u"[Filter]\ntext="_str); 66 knownFilters.erase(mText);
67 }
68
69 OwnedString Filter::Serialize() const
70 {
71 OwnedString result(u"[Filter]\ntext="_str);
53 result.append(mText); 72 result.append(mText);
54 result.append(u'\n'); 73 result.append(u'\n');
55 return std::move(result); 74 return result;
56 } 75 }
57 76
58 FilterPtr Filter::FromText(const String& text) 77 Filter* Filter::FromText(DependentString& text)
59 { 78 {
60 auto it = knownFilters.find(text); 79 NormalizeWhitespace(text);
61 if (it != knownFilters.end()) 80 if (text.empty())
62 return it->second; 81 return nullptr;
63 82
64 FilterPtr filter = FilterPtr(CommentFilter::Create(text)); 83 // Parsing also normalizes the filter text, so it has to be done before the
65 if (!filter) 84 // lookup in knownFilters.
66 filter.reset(ElemHideBase::Create(text)); 85 union
67 if (!filter) 86 {
68 filter.reset(RegExpFilter::Create(text)); 87 RegExpFilterData regexp;
88 ElemHideData elemhide;
89 } data;
90 DependentString error;
69 91
70 enter_context("Adding to known filters"); 92 Filter::Type type = CommentFilter::Parse(text);
71 knownFilters[filter->mText] = filter; 93 if (type == Filter::Type::UNKNOWN)
72 exit_context(); 94 type = ElemHideBase::Parse(text, data.elemhide);
73 return filter; 95 if (type == Filter::Type::UNKNOWN)
74 } 96 type = RegExpFilter::Parse(text, error, data.regexp);
75 97
76 String Filter::Normalize(String& text) 98 auto knownFilter = knownFilters.find(text);
77 { 99 if (knownFilter)
78 // Removing special characters like line breaks
79 String::size_type delta = 0;
80 for (String::size_type i = 0; i < text.length(); ++i)
81 { 100 {
82 if (text[i] >= u' ') 101 knownFilter->second->AddRef();
83 text[i - delta] = text[i]; 102 return knownFilter->second;
84 else
85 ++delta;
86 }
87 text.reset(text, 0, text.length() - delta);
88
89 trim_spaces(text);
90
91 {
92 String::size_type domainsEnd;
93 String::size_type selectorStart;
94 Filter::Type type = ElemHideBase::Parse(text, &domainsEnd, &selectorStart);
95 if (type != Filter::Type::UNKNOWN)
96 {
97 String domains(text, 0, domainsEnd);
98 String selector(text, selectorStart);
99 remove_spaces(domains);
100 trim_spaces(selector);
101
102 String::size_type domainsDelta = domainsEnd - domains.length();
103 String::size_type selectorDelta = text.length() - selectorStart -
104 selector.length();
105
106 if (domainsDelta)
107 for (String::size_type i = domainsEnd; i < selectorStart; ++i)
108 text[i - domainsDelta] = text[i];
109
110 if (domainsDelta + selectorDelta)
111 for (String::size_type i = 0; i < selector.length(); ++i)
112 text[selectorStart - domainsDelta + i] = selector[i];
113
114 text.reset(text, 0, text.length() - domainsDelta - selectorDelta);
115 return text;
116 }
117 } 103 }
118 104
119 if (CommentFilter::Parse(text) == Filter::Type::UNKNOWN) 105 FilterPtr filter;
120 remove_spaces(text); 106 switch (type)
121 return text; 107 {
108 case Filter::Type::COMMENT:
109 filter = new CommentFilter(text);
110 break;
111 case Filter::Type::INVALID:
112 filter = new InvalidFilter(text, error);
113 break;
114 case Filter::Type::BLOCKING:
115 filter = new BlockingFilter(text, data.regexp);
116 break;
117 case Filter::Type::WHITELIST:
118 filter = new WhitelistFilter(text, data.regexp);
119 break;
120 case Filter::Type::ELEMHIDE:
121 filter = new ElemHideFilter(text, data.elemhide);
122 break;
123 case Filter::Type::ELEMHIDEEXCEPTION:
124 filter = new ElemHideException(text, data.elemhide);
125 break;
126 case Filter::Type::CSSPROPERTY:
127 filter = new CSSPropertyFilter(text, data.elemhide);
128 if (static_cast<CSSPropertyFilter*>(filter.get())->IsGeneric())
129 filter = new InvalidFilter(text, u"filter_cssproperty_nodomain"_str);
130 break;
131 default:
132 // This should never happen but just in case
133 return nullptr;
134 }
135
136 // This is a hack: we looked up the entry using text but create it using
137 // filter->mText. This works because both are equal at this point. However,
138 // text refers to a temporary buffer which will go away.
139 enter_context("Adding to known filters");
140 knownFilter.assign(filter->mText, filter.get());
141 exit_context();
142
143 return filter.release();
122 } 144 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld