[Pkg-mozext-commits] [firebug] 21/24: Make sure PrefLoader doesn't leak into the global scope (related to issue 5768)

[David Prévot]

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

taffit pushed a commit to tag firebug-1.10.4
in repository firebug.

commit bc0f819fedb641feea029fde3ab8c7cdfea23e8b
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Tue Oct 9 14:45:51 2012 +0200

    Make sure PrefLoader doesn't leak into the global scope (related to issue 5768)
---
 extension/content/firebug/firefox/browserOverlay.js            | 6 +++++-
 tests/FBTest/content/overlayFirebug.js                         | 5 ++++-
 trace/FBTrace/chrome/firebug/content/firefox/browserOverlay.js | 6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/extension/content/firebug/firefox/browserOverlay.js b/extension/content/firebug/firefox/browserOverlay.js
index b4c3d2b..76df60d 100644
--- a/extension/content/firebug/firefox/browserOverlay.js
+++ b/extension/content/firebug/firefox/browserOverlay.js
@@ -9,7 +9,11 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://firebug/fbtrace.js");
 Cu.import("resource://firebug/loader.js");
-Cu.import("resource://firebug/prefLoader.js");
+
+// Make sure PrefLoader variable doesn't leak into the global scope.
+var prefLoaderScope = {};
+Cu.import("resource://firebug/prefLoader.js", prefLoaderScope);
+var PrefLoader = prefLoaderScope.PrefLoader;
 
 const firstRunPage = "https://getfirebug.com/firstrun#Firebug ";
 
diff --git a/tests/FBTest/content/overlayFirebug.js b/tests/FBTest/content/overlayFirebug.js
index ecd2ff0..76dc9d9 100644
--- a/tests/FBTest/content/overlayFirebug.js
+++ b/tests/FBTest/content/overlayFirebug.js
@@ -22,7 +22,10 @@ var cmdLineHandler = Cc["@mozilla.org/commandlinehandler/general-startup;1?type=
 
 var wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
 
-Cu.import("resource://firebug/prefLoader.js");
+// Make sure PrefLoader variable doesn't leak into the global scope.
+var prefLoaderScope = {};
+Cu.import("resource://firebug/prefLoader.js", prefLoaderScope);
+var PrefLoader = prefLoaderScope.PrefLoader;
 var getPref = PrefLoader.getPref;
 
 Cu.import("resource://firebug/fbtrace.js");
diff --git a/trace/FBTrace/chrome/firebug/content/firefox/browserOverlay.js b/trace/FBTrace/chrome/firebug/content/firefox/browserOverlay.js
index 8aa4423..e009325 100644
--- a/trace/FBTrace/chrome/firebug/content/firefox/browserOverlay.js
+++ b/trace/FBTrace/chrome/firebug/content/firefox/browserOverlay.js
@@ -9,7 +9,11 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://firebug/fbtrace.js");
 Cu.import("resource://firebug/loader.js");
-Cu.import("resource://firebug/prefLoader.js");
+
+// Make sure PrefLoader variable doesn't leak into the global scope.
+var prefLoaderScope = {};
+Cu.import("resource://firebug/prefLoader.js", prefLoaderScope);
+var PrefLoader = prefLoaderScope.PrefLoader;
 
 var Locale = Cu.import("resource://firebug/locale.js").Locale;
 

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