Issue 5781 - Merge messages for regular and emulated element hiding filters

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 327 matching lines @@
     clearTimeout(this.timeout);
   }
 };
 
 function ElemHide()
 {
   this.shadow = this.createShadowTree();
   this.style = null;
   this.tracer = null;
   this.inject = true;
-
-  this.elemHideEmulationPatterns = null;
+  this.emulatedPatterns = null;
+
   this.elemHideEmulation = new ElemHideEmulation(
     window,
-    callback => { callback(this.elemHideEmulationPatterns); },

[Sebastian Noack, 2017/09/25 23:13:19]

In the next step we should pass patterns just as argument to apply(). Passing in
the window here isn't necessary either, anymore. Hubert, FYI.

[Manish Jethani, 2017/09/26 11:50:18]

This might read better as another method of ElemHide, similar to addSelectors
and hideElements, then we can simply pass that method:

  getEmulationPatterns(callback)
  { 
    callback(this.elemHideEmulationPatterns);
  },

But no strong opinion.

If we leave it as it is, we can lose the braces as the caller doesn't care about
the return value and it would make it semantically identical to the
addSelectorsFunc and hideElemsFunc arguments.

[Sebastian Noack, 2017/09/26 21:50:40]

Since you don't have a strong opinion, I think I prefer to keep the arrow
function here. After all this logic is trivial, even more than before where we
used an arrow function as well. And in the next step we should get rid of this
callback completely, anyway. But I guess I can remove the braces, did that.

+    callback => callback(this.emulatedPatterns),
     this.addSelectors.bind(this),
     this.hideElements.bind(this)
   );
 }
 ElemHide.prototype = {
   selectorGroupSize: 200,
 
   createShadowTree()
   {
     // Use Shadow DOM if available as to not mess with with web pages that
@@ skipping 131 matching lines @@
       if (response.trace)
         this.tracer = new ElementHidingTracer();
 
       this.inject = response.inject;
 
       if (this.inject)
         this.addSelectors(response.selectors);
       else if (this.tracer)
         this.tracer.addSelectors(response.selectors);
 
-      this.elemHideEmulationPatterns = response.emulated;
+      this.emulatedPatterns = response.emulatedPatterns;
       this.elemHideEmulation.apply();
+      this.emulatedPatterns = null;

[Sebastian Noack, 2017/09/26 21:50:40]

Don't leak memory.

     });
   }
 };
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
 
   elemhide = new ElemHide();
   elemhide.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);
 }