LEFT | RIGHT |
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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2017 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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 let page = new ext.Page({id: details.tabId}); | 176 let page = new ext.Page({id: details.tabId}); |
177 | 177 |
178 for (let header of details.responseHeaders) | 178 for (let header of details.responseHeaders) |
179 { | 179 { |
180 if (header.name.toLowerCase() == "x-adblock-key" && header.value) | 180 if (header.name.toLowerCase() == "x-adblock-key" && header.value) |
181 { | 181 { |
182 let url = new URL(details.url); | 182 let url = new URL(details.url); |
183 let key = checkKey(header.value, url); | 183 let key = checkKey(header.value, url); |
184 if (key) | 184 if (key) |
185 { | 185 { |
186 // For pre-rendered tabs we don't know for sure the navigation is going | |
187 // to happen until the onCommitted event fires. Unfortunately if we want | |
188 // sitekey whitelisting to work for requests made before onCommitted has | |
189 // been fired we must update the page structure now anyway. | |
190 ext._updatePageFrameStructure(details.frameId, details.tabId, | |
191 details.url, true); | |
192 recordKey(key, page, url); | 186 recordKey(key, page, url); |
193 break; | 187 break; |
194 } | 188 } |
195 } | 189 } |
196 } | 190 } |
197 } | 191 } |
198 | 192 |
199 if (typeof chrome == "object") | 193 if (typeof chrome == "object") |
200 { | 194 { |
201 chrome.webRequest.onHeadersReceived.addListener( | 195 chrome.webRequest.onHeadersReceived.addListener( |
202 onHeadersReceived, | 196 onHeadersReceived, |
203 { | 197 { |
204 urls: ["http://*/*", "https://*/*"], | 198 urls: ["http://*/*", "https://*/*"], |
205 types: ["main_frame", "sub_frame"] | 199 types: ["main_frame", "sub_frame"] |
206 }, | 200 }, |
207 ["responseHeaders"] | 201 ["responseHeaders"] |
208 ); | 202 ); |
209 } | 203 } |
LEFT | RIGHT |