[Pkg-mozext-commits] [firebug] 02/15: #8000 Firebug doesn't work on nightly 48 (deprecated APIs)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firebug.

commit 3bcc4d9b19e8ea0e23085cab7b9fbb3f2d29dcc6
Author: Florent FAYOLLE <florent.fayolle69 at gmail.com>
Date:   Sat Mar 19 11:25:07 2016 +0100

    #8000 Firebug doesn't work on nightly 48 (deprecated APIs)
---
 extension/content/firebug/firefox/browserOverlay.js | 12 +++++++++++-
 extension/content/firebug/lib/http.js               | 15 +++++++++++++--
 extension/content/firebug/net/sourceCache.js        |  1 +
 extension/content/firebug/net/tabCache.js           |  1 +
 extension/modules/firebug-trace-service.js          |  3 +--
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
index 87df700..39ad5cb 100644
--- a/extension/content/firebug/firefox/browserOverlay.js
+++ b/extension/content/firebug/firefox/browserOverlay.js
@@ -447,7 +447,17 @@ BrowserOverlay.prototype =
         var versionURL = "chrome://firebug/content/branch.properties";
         var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
 
-        var channel = ioService.newChannel(versionURL, null, null);
+        var loadingPrincipal = servicesScope.Services.scriptSecurityManager.getSystemPrincipal();
+
+        var channel = ioService.newChannel2(
+            versionURL,
+            /* aOriginCharset */null,
+            /* aBaseURI */ null,
+            /* aLoadingNode */null,
+            loadingPrincipal,
+            /* aTriggeringPrincipal */ null,
+            /* aSecurityFlag */ Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
+            /* aContentPolicyType */ Ci.nsIContentPolicy.TYPE_OTHER);
         var input = channel.open();
         var sis = Cc["@mozilla.org/scriptableinputstream;1"].
             createInstance(Ci.nsIScriptableInputStream);
diff --git a/extension/content/firebug/lib/http.js b/extension/content/firebug/lib/http.js
index c2be8fc..b5b46fa 100644
--- a/extension/content/firebug/lib/http.js
+++ b/extension/content/firebug/lib/http.js
@@ -92,11 +92,22 @@ Http.readPostTextFromPage = function(url, context)
      }
 };
 
-Http.getResource = function(aURL, ignoreMissing)
+Http.getResource = function(aURL, ignoreMissing, doc)
 {
+    if (!doc) {
+        doc = Firebug.chrome.window.document;
+    }
     try
     {
-        var channel = ioService.newChannel(aURL, null, null);
+        var channel = ioService.newChannel2(
+            aURL,
+            /* aCharset */ null,
+            /* aBaseURI */ null,
+            /* aLoadingNode */ doc,
+            /* aLoadingPrincipal */ null,
+            /* aTriggeringPrincipal */ null,
+            /* aSecurityFlag */ null,
+            /* aContentPolicyType */ null);
         var input = channel.open();
 
         return Http.readFromStream(input);
diff --git a/extension/content/firebug/net/sourceCache.js b/extension/content/firebug/net/sourceCache.js
index 67a1c89..39cb97a 100644
--- a/extension/content/firebug/net/sourceCache.js
+++ b/extension/content/firebug/net/sourceCache.js
@@ -214,6 +214,7 @@ Firebug.SourceCache.prototype = Obj.extend(new EventSource(),
         var channel;
         try
         {
+            // TODO use newChannel2 here
             channel = ioService.newChannel(url, null, null);
             channel.loadFlags |= LOAD_FROM_CACHE | LOAD_BYPASS_LOCAL_CACHE_IF_BUSY;
 
diff --git a/extension/content/firebug/net/tabCache.js b/extension/content/firebug/net/tabCache.js
index f7578e6..da0e719 100644
--- a/extension/content/firebug/net/tabCache.js
+++ b/extension/content/firebug/net/tabCache.js
@@ -440,6 +440,7 @@ Firebug.TabCache.prototype = Obj.extend(SourceCache.prototype,
             if (url === "<unknown>")
                 return [Locale.$STR("message.sourceNotAvailableFor") + ": " + url];
 
+            // TODO use newChannel2 here
             var channel = ioService.newChannel(url, null, null);
 
             // These flag combination doesn't repost the request.
diff --git a/extension/modules/firebug-trace-service.js b/extension/modules/firebug-trace-service.js
index 489c6f9..d34e6db 100644
--- a/extension/modules/firebug-trace-service.js
+++ b/extension/modules/firebug-trace-service.js
@@ -138,8 +138,7 @@ TracerWrapper.prototype =
 
         // Create FBTrace proxy. As soon as FBTrace console is available it'll forward
         // all calls to it.
-        return Proxy.create(
-        {
+        return new Proxy({}, {
             get: function(target, name)
             {
                 return self.FBTrace ? self.FBTrace[name] : self.tracer[name];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git