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

Delta Between Two Patch Sets: compiled/Filter.h

Issue 29333474: Issue 4125 - [emscripten] Convert filter classes to C++ (Closed)
Left Patch Set: Now passing all filter matching tests (without filter options) Created Jan. 18, 2016, 6:12 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/ElemHideFilter.cpp ('k') | compiled/Filter.cpp » ('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 #ifndef ADBLOCK_PLUS_FILTER_H 1 #pragma once
2 #define ADBLOCK_PLUS_FILTER_H
3 2
4 #include <memory>
5 #include <string>
6 #include <vector> 3 #include <vector>
7 4
8 class Filter; 5 #include "String.h"
6 #include "intrusive_ptr.h"
7 #include "debug.h"
9 8
10 typedef std::shared_ptr<Filter> FilterPtr; 9 class Filter : public ref_counted
11
12 class Filter
13 { 10 {
14 private: 11 protected:
15 std::u16string text; 12 OwnedString mText;
16 13
17 public: 14 public:
18 explicit Filter(const std::u16string& text);
19
20 /* TODO
21 std::vector<Subscription> subscriptions;
22 */
23
24 const std::u16string GetText() const
25 {
26 return text;
27 }
28
29 enum Type 15 enum Type
30 { 16 {
31 UNKNOWN = 0, 17 UNKNOWN = 0,
32 INVALID = 1, 18 INVALID = 1,
33 COMMENT = 2, 19 COMMENT = 2,
34 BLOCKING = 3, 20 BLOCKING = 3,
35 WHITELIST = 4, 21 WHITELIST = 4,
36 ELEMHIDE = 5, 22 ELEMHIDE = 5,
37 ELEMHIDEEXCEPTION = 6, 23 ELEMHIDEEXCEPTION = 6,
38 CSSPROPERTY = 7, 24 CSSPROPERTY = 7,
39 }; 25 };
40 26
41 virtual Type GetType() const = 0; 27 explicit Filter(Type type, const String& text);
28 ~Filter();
42 29
43 virtual const std::u16string Serialize(); 30 Type mType;
44 31
45 static FilterPtr FromText(const std::u16string& text); 32 /* TODO
46 static const std::u16string Normalize(const std::u16string& text); 33 std::vector<Subscription> mSubscriptions;
34 */
35
36 EMSCRIPTEN_KEEPALIVE const String& GetText() const
37 {
38 return mText;
39 }
40
41 EMSCRIPTEN_KEEPALIVE OwnedString Serialize() const;
42
43 static EMSCRIPTEN_KEEPALIVE Filter* FromText(DependentString& text);
47 }; 44 };
48 45
49 #endif 46 typedef intrusive_ptr<Filter> FilterPtr;
LEFTRIGHT

Powered by Google App Engine
This is Rietveld