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

Delta Between Two Patch Sets: compiled/filter/ElemHideBase.h

Issue 29600641: Issue 5175 - Reject element hiding filter with empty domain names (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Created Nov. 7, 2017, 11:17 p.m.
Right Patch Set: Make the new test more functional Created March 6, 2018, 7:47 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/filter/ActiveFilter.cpp ('k') | compiled/filter/ElemHideBase.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 /* 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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 #pragma once 18 #pragma once
19 19
20 #include <cstddef> 20 #include <cstddef>
21 21
22 #include "../base.h"
22 #include "ActiveFilter.h" 23 #include "ActiveFilter.h"
23 #include "../bindings/runtime.h" 24 #include "../bindings/runtime.h"
25
26 ABP_NS_BEGIN
24 27
25 struct ElemHideData 28 struct ElemHideData
26 { 29 {
27 String::size_type mDomainsEnd; 30 String::size_type mDomainsEnd;
28 String::size_type mSelectorStart; 31 String::size_type mSelectorStart;
29 32
30 bool HasDomains() const 33 bool HasDomains() const
31 { 34 {
32 return mDomainsEnd != 0; 35 return mDomainsEnd != 0;
33 } 36 }
(...skipping 21 matching lines...) Expand all
55 58
56 class ElemHideBase : public ActiveFilter 59 class ElemHideBase : public ActiveFilter
57 { 60 {
58 protected: 61 protected:
59 ElemHideData mData; 62 ElemHideData mData;
60 public: 63 public:
61 static constexpr Type classType = Type::ELEMHIDEBASE; 64 static constexpr Type classType = Type::ELEMHIDEBASE;
62 explicit ElemHideBase(Type type, const String& text, const ElemHideData& data, 65 explicit ElemHideBase(Type type, const String& text, const ElemHideData& data,
63 const ParsedDomains& parsedDomains); 66 const ParsedDomains& parsedDomains);
64 static Type Parse(DependentString& text, DependentString& error, 67 static Type Parse(DependentString& text, DependentString& error,
65 ElemHideData& data, ParsedDomains& parsedDomains); 68 ElemHideData& data, bool& needConversion, ParsedDomains& parsedDomains);
69 static DependentString ConvertFilter(String& text, String::size_type& at);
66 70
67 const DependentString BINDINGS_EXPORTED GetSelector() const 71 OwnedString BINDINGS_EXPORTED GetSelector() const;
68 {
69 return mData.GetSelector(mText);
70 }
71
72 OwnedString BINDINGS_EXPORTED GetSelectorDomain() const; 72 OwnedString BINDINGS_EXPORTED GetSelectorDomain() const;
73 }; 73 };
74 74
75 typedef intrusive_ptr<ElemHideBase> ElemHideBasePtr; 75 typedef intrusive_ptr<ElemHideBase> ElemHideBasePtr;
76
77 ABP_NS_END
LEFTRIGHT

Powered by Google App Engine
This is Rietveld