| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 1 #pragma once | 1 #pragma once |
| 2 | 2 |
| 3 #include <cstddef> | 3 #include <cstddef> |
| 4 | 4 |
| 5 #include "Filter.h" | 5 #include "Filter.h" |
| 6 #include "ElemHideBase.h" | 6 #include "ElemHideBase.h" |
| 7 | 7 |
| 8 struct CSSPropertyFilterData | 8 struct CSSPropertyFilterData |
| 9 { | 9 { |
| 10 String::size_type mPrefixEnd; | 10 String::size_type mPrefixEnd; |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 const DependentString GetSelectorSuffix(const String& text) const | 26 const DependentString GetSelectorSuffix(const String& text) const |
| 27 { | 27 { |
| 28 return DependentString(text, mSuffixStart); | 28 return DependentString(text, mSuffixStart); |
| 29 } | 29 } |
| 30 }; | 30 }; |
| 31 | 31 |
| 32 struct ElemHideData : ElemHideBaseData, CSSPropertyFilterData | 32 struct ElemHideData : ElemHideBaseData, CSSPropertyFilterData |
| 33 { | 33 { |
| 34 }; | 34 }; |
| 35 | 35 |
| 36 class CSSPropertyFilter: public ElemHideBase, protected CSSPropertyFilterData | 36 class CSSPropertyFilter: public ElemHideBase |
| 37 { | 37 { |
| 38 protected: | |
| 39 CSSPropertyFilterData mPropertyData; | |
| 38 public: | 40 public: |
| 39 CSSPropertyFilter(const String& text, const ElemHideData& data); | 41 explicit CSSPropertyFilter(const String& text, const ElemHideData& data); |
| 40 Type GetType() const; | |
|
sergei
2016/02/17 12:54:32
Do you mind to add `override` (without `virtual`)
Wladimir Palant
2016/02/18 16:06:39
Done.
| |
| 41 EMSCRIPTEN_KEEPALIVE OwnedString GetRegExpString() const; | 42 EMSCRIPTEN_KEEPALIVE OwnedString GetRegExpString() const; |
| 42 EMSCRIPTEN_KEEPALIVE const DependentString GetSelectorPrefix() const | 43 EMSCRIPTEN_KEEPALIVE const DependentString GetSelectorPrefix() const |
| 43 { | 44 { |
| 44 return CSSPropertyFilterData::GetSelectorPrefix(mText, mSelectorStart); | 45 return mPropertyData.GetSelectorPrefix(mText, mData.mSelectorStart); |
| 45 } | 46 } |
| 46 EMSCRIPTEN_KEEPALIVE const DependentString GetSelectorSuffix() const | 47 EMSCRIPTEN_KEEPALIVE const DependentString GetSelectorSuffix() const |
| 47 { | 48 { |
| 48 return CSSPropertyFilterData::GetSelectorSuffix(mText); | 49 return mPropertyData.GetSelectorSuffix(mText); |
| 49 } | 50 } |
| 50 }; | 51 }; |
| LEFT | RIGHT |