Bug 1039952 - Part 2: Move getInnerId to actors/webbrowser.js. r=me
authorErik Vold <evold@mozilla.com>
Tue, 16 Sep 2014 10:55:33 -0700
changeset 228681 ddcde29ad05ac17ac8c456850edd2ccbfb3805ec
parent 228680 bc5cc000624d260f0dd026259987f74ea463e16c
child 228682 3be4f9ecef3c85502d5485dd59b517d6e0baf9b7
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1039952
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1039952 - Part 2: Move getInnerId to actors/webbrowser.js. r=me
addon-sdk/source/test/addons/page-mod-debugger-post/main.js
toolkit/devtools/server/actors/script.js
toolkit/devtools/server/actors/webbrowser.js
--- a/addon-sdk/source/test/addons/page-mod-debugger-post/main.js
+++ b/addon-sdk/source/test/addons/page-mod-debugger-post/main.js
@@ -130,9 +130,12 @@ function closeConnection() {
   let deferred = promise.defer();
   gClient.close(deferred.resolve);
   return deferred.promise;
 }
 
 // bug 1042976 - temporary test disable
 module.exports = {};
 
+// bug 1042976 - temporary test disable
+module.exports = {};
+
 require('sdk/test/runner').runTestsFromModule(module);
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -5428,16 +5428,21 @@ function makeDebuggeeValueIfNeeded(obj, 
   return value;
 }
 
 function getInnerId(window) {
   return window.QueryInterface(Ci.nsIInterfaceRequestor).
                 getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
 };
 
+function getInnerId(window) {
+  return window.QueryInterface(Ci.nsIInterfaceRequestor).
+                getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
+};
+
 const symbolProtoToString = typeof Symbol === "function" ? Symbol.prototype.toString : null;
 
 function getSymbolName(symbol) {
   const name = symbolProtoToString.call(symbol).slice("Symbol(".length, -1);
   return name || undefined;
 }
 
 exports.register = function(handle) {
--- a/toolkit/devtools/server/actors/webbrowser.js
+++ b/toolkit/devtools/server/actors/webbrowser.js
@@ -38,16 +38,21 @@ function getWindowID(window) {
                .getInterface(Ci.nsIDOMWindowUtils)
                .currentInnerWindowID;
 }
 
 /**
  * Browser-specific actors.
  */
 
+function getInnerId(window) {
+  return window.QueryInterface(Ci.nsIInterfaceRequestor).
+                getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
+};
+
 /**
  * Yield all windows of type |aWindowType|, from the oldest window to the
  * youngest, using nsIWindowMediator::getEnumerator. We're usually
  * interested in "navigator:browser" windows.
  */
 function allAppShellDOMWindows(aWindowType)
 {
   let e = Services.wm.getEnumerator(aWindowType);