Unified Diff: ext/background.js
Issue 29421712:
Issue 5184 - Support Firefox-specific webRequest types (Closed)
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Move logic to requestBlocker.js
Created May 18, 2017, 1:14 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
lib/requestBlocker.js » ('j')
|
lib/requestBlocker.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: ext/background.js |
| =================================================================== |
| --- a/ext/background.js |
| +++ b/ext/background.js |
| @@ -580,26 +580,23 @@ |
| return; |
| // We are looking for the frame that contains the element which |
| // has triggered this request. For most requests (e.g. images) we |
| // can just use the request's frame ID, but for subdocument requests |
| // (e.g. iframes) we must instead use the request's parent frame ID. |
| let {frameId, type} = details; |
| if (type == "sub_frame") |
| - { |
| frameId = details.parentFrameId; |
| - type = "SUBDOCUMENT"; |
| - } |
| let frame = ext.getFrame(details.tabId, frameId); |
| if (frame) |
| { |
| let results = ext.webRequest.onBeforeRequest._dispatch( |
| - url, type.toUpperCase(), new Page({id: details.tabId}), frame |
| + url, type, new Page({id: details.tabId}), frame |
| ); |
| if (results.indexOf(false) != -1) |
| return {cancel: true}; |
| } |
| }, {urls: ["<all_urls>"]}, ["blocking"]); |
« no previous file with comments
|
« no previous file
|
lib/requestBlocker.js » ('j')
|
lib/requestBlocker.js » ('J')
