Issue 6999 - Remove inlineEmulated flag in content.applyFilters

include.preload.js

 /*
  * 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 380 matching lines @@
     this.observer.disconnect();
     clearTimeout(this.timeout);
   }
 };
 
 function ContentFiltering()
 {
   this.styles = new Map();
   this.tracer = null;
   this.inline = true;
-  this.inlineEmulated = true;
 
   this.elemHideEmulation = new ElemHideEmulation(
-    this.addSelectors.bind(this),
+    () => {},

[Sebastian Noack, 2018/09/29 00:18:47]

It seems if ElemHideEmulation is no longer call addSelectors(), the second
argument (filters) and the related logic is redundant now.

Also if we go there, we might want to remove this argument to the
ElemHideEmulation() constructor altogether with
https://codereview.adblockplus.org/29884580, after which (as of the current
patch set), it would never be called anymore anyway.

[Manish Jethani, 2018/09/29 01:58:50]

Let's make this change part of https://codereview.adblockplus.org/29893559/
(it's already in there).
Alright, so the parameter is now removed, but we're doing a dependency update in
https://codereview.adblockplus.org/29893559/ so I can leave this here for now.

Unless you want me to merge the two patches.

     this.hideElements.bind(this)
   );
 }
 ContentFiltering.prototype = {
   selectorGroupSize: 1024,
 
   addSelectorsInline(selectors, groupName, appendOnly = false)
   {
     let style = this.styles.get(groupName);
 
@@ skipping 39 matching lines @@
     for (let i = 0; i < selectors.length; i += this.selectorGroupSize)
     {
       let selector = selectors.slice(i, i + this.selectorGroupSize).join(", ");
       style.sheet.insertRule(selector + "{display: none !important;}",
                              style.sheet.cssRules.length);
     }
   },
 
   addSelectors(selectors, filters, groupName = "emulated", appendOnly = false)
   {
-    if (this.inline || this.inlineEmulated)
+    if (this.inline)
     {
       // Insert the style rules inline if we have been instructed by the
       // background page to do so. This is usually the case, except on platforms
       // that do support user stylesheets via the browser.tabs.insertCSS API
       // (Firefox 53 onwards for now and possibly Chrome in the near future).
       // Once all supported platforms have implemented this API, we can remove
       // the code below. See issue #5090.
       // Related Chrome and Firefox issues:
       // https://bugs.chromium.org/p/chromium/issues/detail?id=632009
       // https://bugzilla.mozilla.org/show_bug.cgi?id=1310026
@@ skipping 39 matching lines @@
     response =>
     {
       if (this.tracer)
         this.tracer.disconnect();
       this.tracer = null;
 
       if (response.trace)
         this.tracer = new ElementHidingTracer();
 
       this.inline = response.inline;
-      this.inlineEmulated = !!response.inlineEmulated;
 
       if (this.inline)
         this.addSelectorsInline(response.selectors, "standard");
 
       if (this.tracer)
         this.tracer.addSelectors(response.selectors);
 
-      // Prefer CSS selectors for -abp-has and -abp-contains unless the
-      // background page has asked us to use inline styles.
-      this.elemHideEmulation.useInlineStyles = this.inline ||
-                                               this.inlineEmulated;
-
       this.elemHideEmulation.apply(response.emulatedPatterns);
     });
   }
 };
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
 
   contentFiltering = new ContentFiltering();
   contentFiltering.apply();
 
   document.addEventListener("error", event =>
   {
     checkCollapse(event.target);
   }, true);
 
   document.addEventListener("load", event =>
   {
     let element = event.target;
     if (/^i?frame$/.test(element.localName))
       checkCollapse(element);
   }, true);
 }
 
 window.checkCollapse = checkCollapse;
 window.contentFiltering = contentFiltering;
 window.typeMap = typeMap;
 window.getURLsFromElement = getURLsFromElement;