From 84b81f751cc74d0d7db4d4c9ccb8a9139e97893d Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Fri, 10 Jun 2016 13:21:58 -0400
Subject: [PATCH] code review re.
 https://github.com/gorhill/uMatrix/issues/554: use channel data when
 available

---
 platform/firefox/vapi-background.js | 48 ++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index 08c3a8bea..584160b1a 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -2016,6 +2016,15 @@ var httpObserver = {
     // https://github.com/gorhill/uBlock/issues/959
     //   Try to synthesize a pending request from a behind-the-scene request.
     synthesizePendingRequest: function(channel, rawtype) {
+        var data = this.channelDataFromChannel(channel);
+        if ( data !== null ) {
+            return {
+                frameId: data[0],
+                parentFrameId: data[1],
+                tabId: data[2],
+                rawtype: data[3]
+            };
+        }
         var tabId = this.tabIdFromChannel(channel);
         if ( tabId === vAPI.noTabId ) {
             return null;
@@ -2116,34 +2125,45 @@ var httpObserver = {
         }
     },
 
+    channelDataFromChannel: function(channel) {
+        if ( channel instanceof Ci.nsIWritablePropertyBag ) {
+            try {
+                return channel.getProperty(this.REQDATAKEY) || null;
+            } catch (ex) {
+            }
+        }
+        return null;
+    },
+
     observe: function(channel, topic) {
         if ( channel instanceof Ci.nsIHttpChannel === false ) {
             return;
         }
 
         var URI = channel.URI;
+        var channelData = this.channelDataFromChannel(channel);
 
         if ( topic === 'http-on-examine-response' ) {
-            if ( channel instanceof Ci.nsIWritablePropertyBag === false ) {
-                return;
+            if ( channelData !== null ) {
+                this.handleResponseHeaders(channel, URI, channelData);
             }
-
-            var channelData;
-            try {
-                channelData = channel.getProperty(this.REQDATAKEY);
-            } catch (ex) {
-            }
-            if ( !channelData ) {
-                return;
-            }
-
-            this.handleResponseHeaders(channel, URI, channelData);
-
             return;
         }
 
         // http-on-modify-request
 
+        // The channel was previously serviced.
+        if ( channelData !== null ) {
+            this.handleRequest(channel, URI, {
+                frameId: channelData[0],
+                parentFrameId: channelData[1],
+                tabId: channelData[2],
+                rawtype: channelData[3]
+            });
+            return;
+        }
+
+        // The channel was never serviced.
         var pendingRequest = this.lookupPendingRequest(URI.spec);
 
         // https://github.com/gorhill/uMatrix/issues/390#issuecomment-155759004