Issue 6559 - Replace fromObject with fromMap

lib/filterClasses.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 130 matching lines @@
   else
     filter = RegExpFilter.fromText(text);
 
   Filter.knownFilters.set(filter.text, filter);
   return filter;
 };
 
 /**
  * Deserializes a filter
  *
- * @param {Object}  obj map of serialized properties and their values
+ * @param {Map.<string,string>}  map map of serialized properties and their
+ *                                   values
  * @return {Filter} filter or null if the filter couldn't be created
  */
-Filter.fromObject = function(obj)
+Filter.fromMap = function(map)
 {
-  let filter = Filter.fromText(obj.text);
+  let filter = Filter.fromText(map.get("text"));
   if (filter instanceof ActiveFilter)
   {
-    if ("disabled" in obj)
-      filter._disabled = (obj.disabled == "true");
-    if ("hitCount" in obj)
-      filter._hitCount = parseInt(obj.hitCount, 10) || 0;
-    if ("lastHit" in obj)
-      filter._lastHit = parseInt(obj.lastHit, 10) || 0;
+    let disabled = map.get("disabled");
+    let hitCount = map.get("hitCount");
+    let lastHit = map.get("lastHit");
+    if (typeof disabled != "undefined")
+      filter._disabled = (disabled == "true");
+    if (typeof hitCount != "undefined")
+      filter._hitCount = parseInt(hitCount, 10) || 0;
+    if (typeof lastHit != "undefined")
+      filter._lastHit = parseInt(lastHit, 10) || 0;
   }
   return filter;
 };
 
 /**
  * Removes unnecessary whitespaces from filter text, will only return null if
  * the input parameter is null.
  * @param {string} text
  * @return {string}
  */
@@ skipping 905 matching lines @@
  */
 function ElemHideEmulationFilter(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideEmulationFilter = ElemHideEmulationFilter;
 
 ElemHideEmulationFilter.prototype = extend(ElemHideBase, {
   type: "elemhideemulation"
 });