Issue 5760 - Use relative require paths

lib/filterComposer.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 79 matching lines @@
 function composeFilters(details)
 {
   let {page, frame} = details;
   let filters = [];
   let selectors = [];
 
   if (!checkWhitelisted(page, frame))
   {
     let typeMask = RegExpFilter.typeMap[details.type];
     let docDomain = extractHostFromFrame(frame);
-    let specificOnly = checkWhitelisted(page, frame,
+    let specificOnly = checkWhitelisted(page, frame, null,
                                         RegExpFilter.typeMap.GENERICBLOCK);
 
     // Add a blocking filter for each URL of the element that can be blocked
     for (let url of details.urls)
     {
       let urlObj = new URL(url, details.baseURL);
       url = stringifyURL(urlObj);
 
       let filter = defaultMatcher.whitelist.matchesAny(
         url, typeMask, docDomain,
         isThirdParty(urlObj, docDomain),
         getKey(page, frame), specificOnly
       );
 
       if (!filter)
       {
         let filterText = url.replace(/^[\w-]+:\/+(?:www\.)?/, "||");
 
         if (specificOnly)
           filterText += "$domain=" + docDomain;
 
         if (!filters.includes(filterText))
           filters.push(filterText);
       }
     }
 
     // If we couldn't generate any blocking filters, fallback to element hiding
-    if (filters.length == 0 && !checkWhitelisted(page, frame,
+    if (filters.length == 0 && !checkWhitelisted(page, frame, null,
                                                  RegExpFilter.typeMap.ELEMHIDE))
     {
       // Generate CSS selectors based on the element's "id" and
       // "class" attribute.
       if (isValidString(details.id))
         selectors.push("#" + escapeCSS(details.id));
 
       let classes = details.classes.filter(isValidString);
       if (classes.length > 0)
         selectors.push(classes.map(c => "." + escapeCSS(c)).join(""));
@@ skipping 141 matching lines @@
       {
         sender.page.sendMessage({
           type: "composer.content.dialogClosed",
           popupId: popupPageId
         });
         browser.tabs.onRemoved.removeListener(onRemoved);
       }
     };
     browser.tabs.onRemoved.addListener(onRemoved);
 
-    if (info.application == "firefox" &&

[kzar, 2018/03/28 13:50:33]

You tested this code (the block element tool) still works right?

[Jon Sonesen, 2018/03/30 03:09:55]

Oh man, well I had tested it but got the block element issue confused with
another ticket. Which explains why the behavior was different when testing the
other ticket on the current release. My bad, I fixy

[kzar, 2018/04/03 12:08:57]

Doing `info.application` doesn't work then? (Seems kind of surprising.)

-        navigator.oscpu.startsWith("Linux"))
+    if (info.application == "firefox" && navigator.oscpu.startsWith("Linux"))
     {
       // Work around https://bugzil.la/1408446
       browser.windows.update(window.id, {width: window.width + 1});
     }
     return popupPageId;
   });
 });
 
 port.on("composer.getFilters", (message, sender) =>
 {
   return composeFilters({
     tagName: message.tagName,
     id: message.id,
     src: message.src,
     style: message.style,
     classes: message.classes,
     urls: message.urls,
     type: message.mediatype,
     baseURL: message.baseURL,
     page: sender.page,
     frame: sender.frame
   });
 });
 
-port.on("composer.quoteCSS", (message, sender) =>
-{
-  return quoteCSS(message.CSS);
-});
-
 ext.pages.onLoading.addListener(page =>
 {
   // When tabs start loading we send them a message to ensure that the state
   // of the "block element" tool is reset. This is necessary since Firefox will
   // sometimes cache the state of a tab when the user navigates back / forward,
   // which includes the state of the "block element" tool.
   // Since sending this message will often fail (e.g. for new tabs which have
   // just been opened) we catch and ignore any exception thrown.
   browser.tabs.sendMessage(
     page.id, {type: "composer.content.finished"}
   ).catch(() => {});
 });