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

include.preload.js

Index: include.preload.js
===================================================================
--- a/include.preload.js
+++ b/include.preload.js
@@ -346,15 +346,10 @@
   this.tracer = null;
   this.inject = true;
 
+  this.elemHideEmulationPatterns = null;
   this.elemHideEmulation = new ElemHideEmulation(
     window,
-    callback =>
-    {
-      ext.backgroundPage.sendMessage({
-        type: "filters.get",
-        what: "elemhideemulation"
-      }, callback);
-    },
+    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.

     this.addSelectors.bind(this),
     this.hideElements.bind(this)
   );
@@ -506,6 +501,7 @@
       else if (this.tracer)
         this.tracer.addSelectors(response.selectors);
 
+      this.elemHideEmulationPatterns = response.emulated;
       this.elemHideEmulation.apply();
     });
   }