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

Delta Between Two Patch Sets: compiled/subscription/UserDefinedSubscription.cpp

Issue 29384812: Issue 4127 - [emscripten] Convert subscription classes to C++ - Part 1 (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore
Left Patch Set: Switched to our own number conversion Created April 6, 2017, 3:25 p.m.
Right Patch Set: Addressed comments Created April 13, 2017, 1:02 p.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/subscription/UserDefinedSubscription.h ('k') | lib/subscriptionClasses.js » ('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 /* 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-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include <cstdlib>
19
18 #include "UserDefinedSubscription.h" 20 #include "UserDefinedSubscription.h"
19 21
20 int UserDefinedSubscription::filterTypeToDefaults[] = { 22 namespace
21 UserDefinedSubscription::Defaults::BLOCKING, // UNKNOWN 23 {
22 UserDefinedSubscription::Defaults::BLOCKING, // INVALID 24 enum FilterCategory
23 UserDefinedSubscription::Defaults::BLOCKING, // COMMENT 25 {
24 UserDefinedSubscription::Defaults::BLOCKING, // BLOCKING 26 WHITELIST = 1,
25 UserDefinedSubscription::Defaults::WHITELIST, // WHITELIST 27 BLOCKING = 2,
26 UserDefinedSubscription::Defaults::ELEMHIDE, // ELEMHIDE 28 ELEMHIDE = 4,
27 UserDefinedSubscription::Defaults::ELEMHIDE, // ELEMHIDEEXCEPTION 29 };
28 UserDefinedSubscription::Defaults::ELEMHIDE, // ELEMHIDEEMULATION 30
29 }; 31 const FilterCategory filterTypeToCategory[] = {
32 FilterCategory::BLOCKING, // UNKNOWN
33 FilterCategory::BLOCKING, // INVALID
34 FilterCategory::BLOCKING, // COMMENT
35 FilterCategory::BLOCKING, // BLOCKING
36 FilterCategory::WHITELIST, // WHITELIST
37 FilterCategory::ELEMHIDE, // ELEMHIDE
38 FilterCategory::ELEMHIDE, // ELEMHIDEEXCEPTION
39 FilterCategory::ELEMHIDE, // ELEMHIDEEMULATION
40 };
41
42 static_assert(
43 sizeof(filterTypeToCategory) / sizeof(filterTypeToCategory[0]) == Filter::Ty pe::VALUE_COUNT,
44 "Unexpected number of filter types, was a new type added?"
45 );
46 }
30 47
31 UserDefinedSubscription::UserDefinedSubscription(const String& id) 48 UserDefinedSubscription::UserDefinedSubscription(const String& id)
32 : Subscription(Type::USERDEFINED, id), mDefaults(0) 49 : Subscription(Type::USERDEFINED, id), mDefaults(0)
33 { 50 {
34 } 51 }
35 52
36 bool UserDefinedSubscription::IsDefaultFor(const Filter* filter) const 53 bool UserDefinedSubscription::IsDefaultFor(const Filter* filter) const
37 { 54 {
38 return mDefaults & filterTypeToDefaults[filter->mType]; 55 if (filter->mType >= Filter::Type::VALUE_COUNT)
56 {
57 assert(false, "Filter type exceeds valid range");
58 abort();
59 }
60 return mDefaults & filterTypeToCategory[filter->mType];
39 } 61 }
40 62
41 void UserDefinedSubscription::MakeDefaultFor(const Filter* filter) 63 void UserDefinedSubscription::MakeDefaultFor(const Filter* filter)
42 { 64 {
43 mDefaults |= filterTypeToDefaults[filter->mType]; 65 if (filter->mType >= Filter::Type::VALUE_COUNT)
66 {
67 assert(false, "Filter type exceeds valid range");
68 abort();
69 }
70 mDefaults |= filterTypeToCategory[filter->mType];
44 } 71 }
45 72
46 OwnedString UserDefinedSubscription::Serialize() const 73 OwnedString UserDefinedSubscription::Serialize() const
47 { 74 {
48 OwnedString result(Subscription::Serialize()); 75 OwnedString result(Subscription::Serialize());
49 if (mDefaults) 76 if (mDefaults)
50 { 77 {
51 result.append(u"defaults="_str); 78 result.append(u"defaults="_str);
52 if (mDefaults & Defaults::BLOCKING) 79 if (mDefaults & FilterCategory::BLOCKING)
53 result.append(u" blocking"_str); 80 result.append(u" blocking"_str);
54 if (mDefaults & Defaults::WHITELIST) 81 if (mDefaults & FilterCategory::WHITELIST)
55 result.append(u" whitelist"_str); 82 result.append(u" whitelist"_str);
56 if (mDefaults & Defaults::ELEMHIDE) 83 if (mDefaults & FilterCategory::ELEMHIDE)
57 result.append(u" elemhide"_str); 84 result.append(u" elemhide"_str);
58 result.append(u'\n'); 85 result.append(u'\n');
59 } 86 }
60 return result; 87 return result;
61 } 88 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld