Issue 5556 - Update to use libadblockplus revision hg:36e9993fa36c

include/AdblockPlus/FilterEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2017 eyeo GmbH
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 30 matching lines @@
     Filter(const Filter& src);
     Filter(Filter&& src);
     Filter& operator=(const Filter& src);
     Filter& operator=(Filter&& src);
 
     /**
      * Filter types, see https://adblockplus.org/en/filters.
      */
     enum Type {TYPE_BLOCKING, TYPE_EXCEPTION,
                TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION,
+               TYPE_TYPE_ELEMHIDE_EMULATION,
                TYPE_COMMENT, TYPE_INVALID};
 
     /**
      * Retrieves the type of this filter.
      * @return Type of this filter.
      */
     Type GetType() const;
 
     /**
      * Checks whether this filter has been added to the list of custom filters.
@@ skipping 134 matching lines @@
      */
     enum ContentType
     {
       CONTENT_TYPE_OTHER = 1,
       CONTENT_TYPE_SCRIPT = 2,
       CONTENT_TYPE_IMAGE = 4,
       CONTENT_TYPE_STYLESHEET = 8,
       CONTENT_TYPE_OBJECT = 16,
       CONTENT_TYPE_SUBDOCUMENT = 32,
       CONTENT_TYPE_DOCUMENT = 64,
+      CONTENT_TYPE_WEBSOCKET = 128,
+      CONTENT_TYPE_WEBRTC = 256,
       CONTENT_TYPE_PING = 1024,
       CONTENT_TYPE_XMLHTTPREQUEST = 2048,
       CONTENT_TYPE_OBJECT_SUBREQUEST = 4096,
       CONTENT_TYPE_MEDIA = 16384,
       CONTENT_TYPE_FONT = 32768,
       CONTENT_TYPE_GENERICBLOCK = 0x20000000,
       CONTENT_TYPE_ELEMHIDE = 0x40000000,
       CONTENT_TYPE_GENERICHIDE = 0x80000000
     };
 
@@ skipping 55 matching lines @@
       Prefs preconfiguredPrefs;
       /**
        * A callback of `AdblockPlus::FilterEngine::IsConnectionAllowedAsyncCallback` type
        * checking whether the request to download a subscription from Adblock Plus may be performed
        * on the current connection.
        */
       IsConnectionAllowedAsyncCallback isSubscriptionDownloadAllowedCallback;
     };
 
     /**
-    * Callback type invoked when FilterEngine is created.
-    */
+     * Callback type invoked when FilterEngine is created.
+     */
     typedef std::function<void(const FilterEnginePtr&)> OnCreatedCallback;
 
     /**
      * Asynchronously constructs FilterEngine.
      * @param jsEngine `JsEngine` instance used to run JavaScript code
      *        internally.
      * @param onCreated A callback which is called when FilterEngine is ready
      *        for use.
      * @param parameters optional creation parameters.
      */
     static void CreateAsync(const JsEnginePtr& jsEngine,
       const OnCreatedCallback& onCreated,
       const CreationParameters& parameters = CreationParameters());
 
     /**
-     * Synchronous interface to construct FilterEngine. For details see
-     * asynchronous version CreateAsync.
-     */
-    static FilterEnginePtr Create(const JsEnginePtr& jsEngine,
-      const CreationParameters& params = CreationParameters());
-
-    /**
      * Retrieves the `JsEngine` instance associated with this `FilterEngine`
      * instance.
      */
-    JsEnginePtr GetJsEngine() const { return jsEngine; }
+    JsEngine& GetJsEngine() const { return *jsEngine; }
 
     /**
      * Checks if this is the first run of the application.
      * @return `true` if the application is running for the first time.
      */
     bool IsFirstRun() const;
 
     /**
      * Retrieves a filter object from its text representation.
      * @param text Text representation of the filter,
@@ skipping 252 matching lines @@
     void FilterChanged(const FilterChangeCallback& callback, JsValueList&& params) const;
     FilterPtr GetWhitelistingFilter(const std::string& url,
       ContentTypeMask contentTypeMask, const std::string& documentUrl) const;
     FilterPtr GetWhitelistingFilter(const std::string& url,
       ContentTypeMask contentTypeMask,
       const std::vector<std::string>& documentUrls) const;
   };
 }
 
 #endif