| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 details.parentFrameId); | 257 details.parentFrameId); |
| 258 }, | 258 }, |
| 259 {types: ["main_frame", "sub_frame"], urls: ["http://*/*", "https://*/*"]}, | 259 {types: ["main_frame", "sub_frame"], urls: ["http://*/*", "https://*/*"]}, |
| 260 ["responseHeaders"]); | 260 ["responseHeaders"]); |
| 261 | 261 |
| 262 browser.webNavigation.onBeforeNavigate.addListener(details => | 262 browser.webNavigation.onBeforeNavigate.addListener(details => |
| 263 { | 263 { |
| 264 // Requests can be made by about:blank frames before the frame's | 264 // Requests can be made by about:blank frames before the frame's |
| 265 // onCommitted event has fired, so we update the frame structure | 265 // onCommitted event has fired, so we update the frame structure |
| 266 // for those now. | 266 // for those now. |
| 267 if (details.url == "about:blank") | 267 if (details.url.startsWith("about:")) |
| 268 { | 268 { |
| 269 updatePageFrameStructure(details.frameId, details.tabId, details.url, | 269 updatePageFrameStructure(details.frameId, details.tabId, details.url, |
| 270 details.parentFrameId); | 270 details.parentFrameId); |
| 271 } | 271 } |
| 272 }); | 272 }); |
| 273 | 273 |
| 274 browser.webNavigation.onCommitted.addListener(details => | 274 browser.webNavigation.onCommitted.addListener(details => |
| 275 { | 275 { |
| 276 // We have to update the frame structure for documents that weren't | 276 // We have to update the frame structure for documents that weren't |
| 277 // loaded over HTTP (including documents cached by Service Workers), | 277 // loaded over HTTP (including documents cached by Service Workers), |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 return frames.get(0) || null; | 582 return frames.get(0) || null; |
| 583 } | 583 } |
| 584 }; | 584 }; |
| 585 } | 585 } |
| 586 | 586 |
| 587 return ext.onMessage._dispatch( | 587 return ext.onMessage._dispatch( |
| 588 message, sender, sendResponse | 588 message, sender, sendResponse |
| 589 ).includes(true); | 589 ).includes(true); |
| 590 }); | 590 }); |
| 591 } | 591 } |
| OLD | NEW |