Issue 5142 - Convert Element Hiding to C++

compiled/ElemHide.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 39 matching lines @@
   {
     mSelectors.insert(mSelectors.end(),
                       list.mSelectors.cbegin(), list.mSelectors.cend());
   }
 };
 
 class ElemHide : public ref_counted
 {
   // All filters. Key is filter text. Exception filters excluded.
   StringMap<ElemHideBasePtr> mFilters;
-  // StringMap is non copyable. std::unordered_map<> it is
-  // Filters by domain. Key is domain. Subkey is filter text.
-  StringMap<StringMap<ElemHideBasePtr>> mFiltersByDomain;
+  // Filters by domain. Key is domain.
+  // In value key is filter text, value is filter or NULL
+  OwnedStringMap<OwnedStringMap<ElemHideBasePtr>> mFiltersByDomain;
 
   // Exceptions. The key is the selector.
   OwnedStringMap<std::vector<ElemHideExceptionPtr>> mExceptions;
   // Known exceptions. Filter text as keys.
   StringSet mKnownExceptions;
 
-  // Unconditional selectors. Filter selector as key. Text as value.
-  OwnedStringMap<DependentString> mUnconditionalSelectors;
+  // Unconditional selectors. Filter selector as key. Filter as value.
+  OwnedStringMap<ElemHideBasePtr> mUnconditionalSelectors;
 
   mutable intrusive_ptr<ElemHide_SelectorList> mUnconditionalSelectorsCache;
 
 public:
   static ElemHide* BINDINGS_EXPORTED Create()
   {
     return new ElemHide();
   }
   // Used by GetSelectorsForDomain to narrow down selectors to return.
   // Keep these value up to date in the ElemHide.js import script.
@@ skipping 13 matching lines @@
   void BINDINGS_EXPORTED Remove(ElemHideBase& filter);
 
   ElemHide_SelectorList* BINDINGS_EXPORTED GetSelectorsForDomain(const String& domain,
                                                                  Criteria criteria) const;
   ElemHide_SelectorList* BINDINGS_EXPORTED GetUnconditionalSelectors() const;
 
   ElemHideException* BINDINGS_EXPORTED GetException(const ElemHideBase& filter,
                                                     DependentString& docDomain) const;
 
 private:
-  void AddToFiltersByDomain(ElemHideBase& filter);
+  void AddToFiltersByDomain(const ElemHideBasePtr & filter);
 };