Issue 4125 - [emscripten] Convert filter classes to C++

compiled/ActiveFilter.h

-#ifndef ADBLOCKPLUS_ACTIVEFILTER_H

[Felix Dahlke, 2016/01/15 17:00:35]

Nit: Words in camel cased names should be separated by an underscore in include
guards, i.e. `ADBLOCK_PLUS_ACTIVE_FILTER`.

[Wladimir Palant, 2016/01/15 20:36:15]

Done.

-#define ADBLOCKPLUS_ACTIVEFILTER_H
+#pragma once
 
-#include <string>
+#include <emscripten.h>
 
-#include "tools.h"
 #include "Filter.h"
+#include "StringMap.h"
+
+#define FILTER_PROPERTY(type, name, getter, setter) \
+    private:\
+      type name;\
+    public:\
+      type EMSCRIPTEN_KEEPALIVE getter() const\
+      {\
+        return name;\
+      }\
+      void EMSCRIPTEN_KEEPALIVE setter(type value)\
+      {\
+        if (name != value)\
+        {\
+          type oldvalue = name;\
+          name = value;\
+          DependentString action(u"filter."_str #name);\
+          EM_ASM_ARGS({\
+            var filter = new (exports[Filter_mapping[$2]])($1);\
+            FilterNotifier.triggerListeners(readString($0), filter, $3, $4);\
+          }, &action, this, mType, value, oldvalue);\
+        }\
+      }
 
 class ActiveFilter : public Filter
 {
+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:
-  ActiveFilter(const std::u16string& text);

[Felix Dahlke, 2016/01/15 17:00:35]

Please use the explicit keyword for single parameter constructors - unless you
actually want the automatic conversion.

[Felix Dahlke, 2016/01/15 17:00:35]

I'd prefer to go for std::wstring, we also use it in libadblockplus to store JS
strings, and the Emscripten tests all use std::wstring.

[Wladimir Palant, 2016/01/15 20:36:15]

Done.

[Wladimir Palant, 2016/01/15 20:36:15]

Done though merely as a side-effect of using embind. As explained on IRC, using
char16_t is preferable because unlike wchar_t it is a fixed-width type and it's
also saves us some memory. Well, embind doesn't support std::u16string and it
crashes if size of wchar_t isn't 4 bytes.

-  FILTER_PROPERTY(bool, disabled);
-  FILTER_PROPERTY(unsigned int, hitCount);
-  FILTER_PROPERTY(unsigned int, lastHit);
+  explicit ActiveFilter(Type type, const String& text, bool ignoreTrailingDot);
+  FILTER_PROPERTY(bool, mDisabled, GetDisabled, SetDisabled);
+  FILTER_PROPERTY(unsigned int, mHitCount, GetHitCount, SetHitCount);
+  FILTER_PROPERTY(unsigned int, mLastHit, GetLastHit, SetLastHit);
+  bool EMSCRIPTEN_KEEPALIVE IsActiveOnDomain(DependentString& docDomain,
+      const String& sitekey) const;
+  bool EMSCRIPTEN_KEEPALIVE IsActiveOnlyOnDomain(DependentString& docDomain) const;
+  bool EMSCRIPTEN_KEEPALIVE IsGeneric() const;
+  OwnedString EMSCRIPTEN_KEEPALIVE Serialize() const;
 };
-
-#endif