From 9030bc6e537fefba0e78388ca64a5d59c0e6e140 Mon Sep 17 00:00:00 2001
From: Deathamns <deathamns@gmail.com>
Date: Tue, 27 Jan 2015 17:56:04 +0100
Subject: [PATCH] Firefox: use correct data for parentFrameId

---
 platform/firefox/frameModule.js     | 3 +--
 platform/firefox/vapi-background.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/firefox/frameModule.js b/platform/firefox/frameModule.js
index 5e0f74f21..1124ca046 100644
--- a/platform/firefox/frameModule.js
+++ b/platform/firefox/frameModule.js
@@ -158,7 +158,6 @@ const contentObserver = {
         }
 
         let isTopLevel = context === context.top;
-        let frameId = isTopLevel ? 0 : this.getFrameId(context);
         let parentFrameId;
 
         if ( isTopLevel ) {
@@ -171,7 +170,7 @@ const contentObserver = {
 
         let messageManager = getMessageManager(context);
         let details = {
-            frameId: frameId,
+            frameId: isTopLevel ? 0 : this.getFrameId(context),
             openerURL: openerURL,
             parentFrameId: parentFrameId,
             type: type,
diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index e3cdd6cb2..a9820432e 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -988,7 +988,7 @@ var httpObserver = {
 
             result = vAPI.net.onHeadersReceived.callback({
                 hostname: URI.asciiHost,
-                parentFrameId: channelData[0] === this.MAIN_FRAME ? -1 : 0,
+                parentFrameId: channelData[4],
                 responseHeaders: result ? [{name: topic, value: result}] : [],
                 tabId: channelData[1],
                 url: URI.asciiSpec