Issue 4592 - Adapt messaging code for the new element hiding emulation filters

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 (function(global)
 {
   if (!global.ext)
     global.ext = require("ext_background");
 
   var Prefs = require("prefs").Prefs;
   var Utils = require("utils").Utils;
   var FilterStorage = require("filterStorage").FilterStorage;
   var FilterNotifier = require("filterNotifier").FilterNotifier;
   var defaultMatcher = require("matcher").defaultMatcher;
-  var CSSRules = require("cssRules").CSSRules;
+  var ElemHideEmulation = require("elemHideEmulation").ElemHideEmulation;
   var NotificationStorage = require("notification").Notification;
 
   var filterClasses = require("filterClasses");
   var Filter = filterClasses.Filter;
   var BlockingFilter = filterClasses.BlockingFilter;
   var RegExpFilter = filterClasses.RegExpFilter;
   var Synchronizer = require("synchronizer").Synchronizer;
 
   var info = require("info");
   var subscriptionClasses = require("subscriptionClasses");
@@ skipping 174 matching lines @@
           FilterStorage.addFilter(result.filter);
         callback(errors);
         break;
       case "filters.blocked":
         var filter = defaultMatcher.matchesAny(message.url,
           RegExpFilter.typeMap[message.requestType], message.docDomain,
           message.thirdParty);
         callback(filter instanceof BlockingFilter);
         break;
       case "filters.get":
-        if (message.what == "cssproperties")
+        if (message.what == "elemhideemulation")
         {
           var filters = [];
           var checkWhitelisted = require("whitelisting").checkWhitelisted;
 
           if (Prefs.enabled && !checkWhitelisted(sender.page, sender.frame,
                                 RegExpFilter.typeMap.DOCUMENT |
                                 RegExpFilter.typeMap.ELEMHIDE))
           {
-            filters = CSSRules.getRulesForDomain(sender.frame.url.hostname);
+            filters = ElemHideEmulation.getRulesForDomain(sender.frame.url.hostname);

[kzar, 2016/11/04 14:37:21]

Nit: Mind fixing this long line?

[Felix Dahlke, 2016/11/04 17:38:46]

Done.

             filters = filters.map(function(filter)
             {
               return {
-                prefix: filter.selectorPrefix,
-                suffix: filter.selectorSuffix,
-                regexp: filter.regexpString,
+                features: filter.features,
+                selector: filter.selector,
                 text: filter.text
               };
             });
           }
           callback(filters);
           break;
         }
 
         var subscription = Subscription.fromURL(message.subscriptionUrl);
         if (!subscription)
@@ skipping 154 matching lines @@
         for (var i = 0; i < subscriptions.length; i++)
         {
           var subscription = subscriptions[i];
           if (subscription instanceof DownloadableSubscription)
             Synchronizer.execute(subscription, true);
         }
         break;
     }
   });
 })(this);