Issue 7419 - Allow wrapping function for abort-on-property-*

lib/content/snippets.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 698 matching lines @@
       return;
 
     descriptor.configurable = true;
     Object.defineProperty(object, property, descriptor);
     return;
   }
 
   let name = property.slice(0, dotIndex);
   property = property.slice(dotIndex + 1);
   let value = object[name];
-  if (value && typeof value == "object")
+  if (value && (typeof value == "object" || typeof value == "function"))
     wrapPropertyAccess(value, property, descriptor);
 
   let currentDescriptor = Object.getOwnPropertyDescriptor(object, name);
   if (currentDescriptor && !currentDescriptor.configurable)
     return;
 
   let setter = newValue =>
   {
     value = newValue;
-    if (newValue && typeof newValue == "object")
+    if (newValue && (typeof newValue == "object" || typeof value == "function"))
       wrapPropertyAccess(newValue, property, descriptor);
   };
 
   Object.defineProperty(object, name, {
     get: () => value,
     set: setter,
     configurable: true
   });
 }
 
@@ skipping 188 matching lines @@
 
       args[0] = url.href;
     }
 
     return fetch_.apply(this, args);
   };
 }
 
 exports["strip-fetch-query-parameter"] = makeInjector(stripFetchQueryParameter,
                                                       toRegExp, regexEscape);