Issue 5475 - Update adblockpluscore dependency to revision hg:b935a0402215

include/AdblockPlus/FilterEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 33 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,

[sergei, 2017/08/11 12:49:37]

Meanwhile I have merely added this filter type to the enumeration but the actual
support of it should be done as #5498.

                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,

[sergei, 2017/08/11 12:49:37]

Tests will be done as #5499.

       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 348 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