Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Firefox: use correct data for parentFrameId

This commit is contained in:
Deathamns 2015-01-27 17:56:04 +01:00
parent 77133ae3f9
commit 9030bc6e53
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/firefox/frameModule.js
View File

@ -158,7 +158,6 @@ const contentObserver = {
} }
let isTopLevel = context === context.top; let isTopLevel = context === context.top;
let frameId = isTopLevel ? 0 : this.getFrameId(context);
let parentFrameId; let parentFrameId;
if ( isTopLevel ) { if ( isTopLevel ) {
@ -171,7 +170,7 @@ const contentObserver = {
let messageManager = getMessageManager(context); let messageManager = getMessageManager(context);
let details = { let details = {
frameId: frameId, frameId: isTopLevel ? 0 : this.getFrameId(context),
openerURL: openerURL, openerURL: openerURL,
parentFrameId: parentFrameId, parentFrameId: parentFrameId,
type: type, type: type,

2
platform/firefox/vapi-background.js
View File

@ -988,7 +988,7 @@ var httpObserver = {
result = vAPI.net.onHeadersReceived.callback({ result = vAPI.net.onHeadersReceived.callback({
hostname: URI.asciiHost, hostname: URI.asciiHost,
parentFrameId: channelData[0] === this.MAIN_FRAME ? -1 : 0, parentFrameId: channelData[4],
responseHeaders: result ? [{name: topic, value: result}] : [], responseHeaders: result ? [{name: topic, value: result}] : [],
tabId: channelData[1], tabId: channelData[1],
url: URI.asciiSpec url: URI.asciiSpec