Bug 1014141 - Fix a regression in the remote debugger;r=mar.castellucio;r=past
authorEddy Bruel <ejpbruel@mozilla.com>
Wed, 18 Jun 2014 15:26:53 +0200
changeset 189299 bd63a8720a1bab4bda0041e2e4f403235885ed60
parent 189298 599ccafa98bcdcd9d270b5df7d95ae72af0ab08b
child 189300 748d9c5a851676edc73c8a60357e22cdb9597992
push id7342
push userejpbruel@mozilla.com
push dateWed, 18 Jun 2014 13:27:13 +0000
treeherderfx-team@bd63a8720a1b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmar.castellucio, past
bugs1014141
milestone33.0a1
Bug 1014141 - Fix a regression in the remote debugger;r=mar.castellucio;r=past
toolkit/devtools/server/actors/webbrowser.js
webapprt/content/dbg-webapp-actors.js
--- a/toolkit/devtools/server/actors/webbrowser.js
+++ b/toolkit/devtools/server/actors/webbrowser.js
@@ -43,16 +43,18 @@ XPCOMUtils.defineLazyGetter(this, "event
 function allAppShellDOMWindows(aWindowType)
 {
   let e = Services.wm.getEnumerator(aWindowType);
   while (e.hasMoreElements()) {
     yield e.getNext();
   }
 }
 
+exports.allAppShellDOMWindows = allAppShellDOMWindows;
+
 /**
  * Retrieve the window type of the top-level window |aWindow|.
  */
 function appShellDOMWindowType(aWindow) {
   /* This is what nsIWindowMediator's enumerator checks. */
   return aWindow.document.documentElement.getAttribute('windowtype');
 }
 
--- a/webapprt/content/dbg-webapp-actors.js
+++ b/webapprt/content/dbg-webapp-actors.js
@@ -1,15 +1,19 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 'use strict';
 
 const { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const { BrowserTabActor, BrowserTabList, allAppShellDOMWindows,
+        sendShutdownEvent } = devtools.require("devtools/server/actors/webbrowser");
+const { RootActor } = devtools.require("devtools/server/actors/root");
 
 /**
  * WebappRT-specific actors.
  */
 
 /**
  * Construct a root actor appropriate for use in a server running in the webapp
  * runtime. The returned root actor: