| Index: compiled/filter/ActiveFilter.h |
| =================================================================== |
| --- a/compiled/filter/ActiveFilter.h |
| +++ b/compiled/filter/ActiveFilter.h |
| @@ -39,35 +39,37 @@ |
| {\ |
| FilterNotifier::FilterChange(FilterNotifier::Topic::topic, *this);\ |
| }\ |
| }\ |
| } |
| class ActiveFilter : public Filter |
| { |
| +public: |
| + typedef StringMap<bool> DomainMap; |
| + virtual DomainMap* GetDomains() const; |
| + static const DependentString DEFAULT_DOMAIN; |
| protected: |
| - typedef StringMap<bool> DomainMap; |
| typedef StringSet SitekeySet; |
| void ParseDomains(const String& domains, String::value_type separator) const; |
| void AddSitekey(const String& sitekey) const; |
| - virtual DomainMap* GetDomains() const; |
| virtual SitekeySet* GetSitekeys() const; |
| mutable std::unique_ptr<DomainMap> mDomains; |
| mutable std::unique_ptr<SitekeySet> mSitekeys; |
| private: |
| bool mIgnoreTrailingDot; |
| public: |
| static constexpr Type classType = Type::ACTIVE; |
| explicit ActiveFilter(Type type, const String& text, bool ignoreTrailingDot); |
| FILTER_PROPERTY(bool, mDisabled, FILTER_DISABLED, GetDisabled, SetDisabled); |
| FILTER_PROPERTY(unsigned int, mHitCount, FILTER_HITCOUNT, |
| GetHitCount, SetHitCount); |
| FILTER_PROPERTY(unsigned int, mLastHit, FILTER_LASTHIT, |
| GetLastHit, SetLastHit); |
| bool BINDINGS_EXPORTED IsActiveOnDomain(DependentString& docDomain, |
| - const String& sitekey) const; |
| + const String& sitekey = DependentString()) const; |
| bool BINDINGS_EXPORTED IsActiveOnlyOnDomain(DependentString& docDomain) const; |
| bool BINDINGS_EXPORTED IsGeneric() const; |
| OwnedString BINDINGS_EXPORTED Serialize() const; |
| }; |
| typedef intrusive_ptr<ActiveFilter> ActiveFilterPtr; |