Bug 1039952 - Part 2: Move getInnerId to actors/webbrowser.js. r=me

addon-sdk/source/test/addons/page-mod-debugger-post/main.js

@@ -135,4 +135,7 @@ function closeConnection() {
 // bug 1042976 - temporary test disable
 module.exports = {};
 
+// bug 1042976 - temporary test disable
+module.exports = {};
+
 require('sdk/test/runner').runTestsFromModule(module);

toolkit/devtools/server/actors/script.js

@@ -5433,6 +5433,11 @@ function getInnerId(window) {
                 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) {

toolkit/devtools/server/actors/webbrowser.js

@@ -43,6 +43,11 @@ function getWindowID(window) {
  * 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