Browse Source

Firefox: observe main_frame requests too

pull/2/head
Deathamns 10 years ago
committed by gorhill
parent
commit
500213f479
  1. 8
      platform/firefox/frameModule.js

8
platform/firefox/frameModule.js

@ -84,11 +84,13 @@ let contentPolicy = {
); );
}, },
shouldLoad: function(type, location, origin, context) { shouldLoad: function(type, location, origin, context) {
if (type === 6 || !context || !/^https?$/.test(location.scheme)) {
if (!context || !/^https?$/.test(location.scheme)) {
return this.ACCEPT; return this.ACCEPT;
} }
let win = (context.ownerDocument || context).defaultView;
let win = type === 6
? context.contentWindow
: (context.ownerDocument || context).defaultView;
if (!win) { if (!win) {
return this.ACCEPT; return this.ACCEPT;
@ -98,7 +100,7 @@ let contentPolicy = {
url: location.spec, url: location.spec,
type: type, type: type,
tabId: -1, tabId: -1,
frameId: win === win.top ? 0 : 1,
frameId: type === 6 ? -1 : (win === win.top ? 0 : 1),
parentFrameId: win === win.top ? -1 : 0 parentFrameId: win === win.top ? -1 : 0
})[0]; })[0];

Loading…
Cancel
Save