Issue 6953 - Update frame structure for data URI frames

ext/background.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 233 matching lines @@
     }
 
     updatePageFrameStructure(details.frameId, details.tabId, details.url,
                              details.parentFrameId);
   },
   {types: ["main_frame", "sub_frame"], urls: ["http://*/*", "https://*/*"]},
   ["responseHeaders"]);
 
   browser.webNavigation.onBeforeNavigate.addListener(details =>
   {
-    // Requests can be made by about: and data: frames before the frame's
-    // onCommitted event has fired, so we update the frame structure for those
-    // now.
-    if (/^(about|data):/.test(details.url))

[Sebastian Noack, 2018/09/17 16:02:31]

Nit: I'm not sure if a regular expression is justified here.

[Manish Jethani, 2018/09/21 20:32:24]

Changed to String.startsWith.

I have a hunch that the regular expression is better choice though, but I'll
leave it like it is for now.

+    // Requests can be made by about:blank frames before the frame's
+    // onCommitted event has fired; besides, the parent frame's ID is not
+    // available in onCommitted, nor is the onHeadersReceived event fired for
+    // about: and data: frames; so we update the frame structure for such
+    // frames here.
+    if (details.url.startsWith("about:") || details.url.startsWith("data:"))
     {
       updatePageFrameStructure(details.frameId, details.tabId, details.url,
                                details.parentFrameId);
     }
   });
 
   browser.webNavigation.onCommitted.addListener(details =>
   {
     // We have to update the frame structure for documents that weren't
     // loaded over HTTP (including documents cached by Service Workers),
@@ skipping 333 matching lines @@
           return frames.get(0) || null;
         }
       };
     }
 
     return ext.onMessage._dispatch(
       message, sender, sendResponse
     ).includes(true);
   });
 }