Backed out 2 changesets (bug 1470510) for build bustage on /build/src/widget/cocoa/nsChildView.mm. CLOSED TREE

Backed out changeset 5967bf633574 (bug 1470510)
Backed out changeset 067a556bb614 (bug 1470510)

--HG--
rename : xpfe/appshell/nsIAppWindow.idl => xpfe/appshell/nsIXULWindow.idl
rename : xpfe/appshell/AppWindow.cpp => xpfe/appshell/nsXULWindow.cpp
rename : xpfe/appshell/AppWindow.h => xpfe/appshell/nsXULWindow.h
extra : amend_source : 752d828c6a0726c3f2df57a25741e38b36b75d6b

Author: dgluca

accessible/generic/RootAccessible.cpp

@@ -45,7 +45,7 @@
 #include "nsGlobalWindow.h"
 
 #ifdef MOZ_XUL
-#  include "nsIAppWindow.h"
+#  include "nsIXULWindow.h"
 #endif
 
 using namespace mozilla;
@@ -97,18 +97,18 @@ role RootAccessible::NativeRole() const {
 uint32_t RootAccessible::GetChromeFlags() const {
   // Return the flag set for the top level window as defined
   // by nsIWebBrowserChrome::CHROME_WINDOW_[FLAGNAME]
-  // Not simple: nsIAppWindow is not just a QI from nsIDOMWindow
+  // Not simple: nsIXULWindow is not just a QI from nsIDOMWindow
   nsCOMPtr<nsIDocShell> docShell = nsCoreUtils::GetDocShellFor(mDocumentNode);
   NS_ENSURE_TRUE(docShell, 0);
   nsCOMPtr<nsIDocShellTreeOwner> treeOwner;
   docShell->GetTreeOwner(getter_AddRefs(treeOwner));
   NS_ENSURE_TRUE(treeOwner, 0);
-  nsCOMPtr<nsIAppWindow> appWin(do_GetInterface(treeOwner));
-  if (!appWin) {
+  nsCOMPtr<nsIXULWindow> xulWin(do_GetInterface(treeOwner));
+  if (!xulWin) {
     return 0;
   }
   uint32_t chromeFlags;
-  appWin->GetChromeFlags(&chromeFlags);
+  xulWin->GetChromeFlags(&chromeFlags);
   return chromeFlags;
 }
 #endif

browser/base/content/browser.js

@@ -1759,7 +1759,7 @@ var gBrowserInit = {
     // This needs setting up before we create the first remote browser.
     window.docShell.treeOwner
       .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIAppWindow).XULBrowserWindow = window.XULBrowserWindow;
+      .getInterface(Ci.nsIXULWindow).XULBrowserWindow = window.XULBrowserWindow;
     window.browserDOMWindow = new nsBrowserAccess();
 
     gBrowser = window._gBrowser;
@@ -2534,7 +2534,7 @@ var gBrowserInit = {
     window.XULBrowserWindow = null;
     window.docShell.treeOwner
       .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIAppWindow).XULBrowserWindow = null;
+      .getInterface(Ci.nsIXULWindow).XULBrowserWindow = null;
     window.browserDOMWindow = null;
   },
 };

browser/components/BrowserGlue.jsm

@@ -449,11 +449,11 @@ let LEGACY_ACTORS = {
     // Set the size to use when the user leaves the maximized mode.
     // The persisted size is the outer size, but the height/width
     // attributes set the inner size.
-    let appWin = win.docShell.treeOwner
+    let xulWin = win.docShell.treeOwner
       .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIAppWindow);
-    height -= appWin.outerToInnerHeightDifferenceInCSSPixels;
-    width -= appWin.outerToInnerWidthDifferenceInCSSPixels;
+      .getInterface(Ci.nsIXULWindow);
+    height -= xulWin.outerToInnerHeightDifferenceInCSSPixels;
+    width -= xulWin.outerToInnerWidthDifferenceInCSSPixels;
     docElt.setAttribute("height", height);
     docElt.setAttribute("width", width);
   } else {

browser/components/downloads/DownloadsTaskbar.jsm

@@ -131,7 +131,7 @@ var DownloadsTaskbar = {
     // Activate the indicator on the specified window.
     let docShell = aWindow.docShell.treeOwner
       .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIAppWindow).docShell;
+      .getInterface(Ci.nsIXULWindow).docShell;
     this._taskbarProgress = gWinTaskbar.getTaskbarProgress(docShell);
 
     // If the DownloadSummary object has already been created, we should update

browser/components/extensions/parent/ext-browser.js

@@ -1009,7 +1009,7 @@ class Window extends WindowBase {
   }
 
   get alwaysOnTop() {
-    return this.appWindow.zLevel >= Ci.nsIAppWindow.raisedZ;
+    return this.xulWindow.zLevel >= Ci.nsIXULWindow.raisedZ;
   }
 
   get isLastFocused() {

browser/components/extensions/test/browser/browser_ext_windows_create.js

@@ -172,7 +172,7 @@ add_task(async function testWindowCreate() {
     if (expected.chromeFlags) {
       let { chromeFlags } = latestWindow.docShell.treeOwner
         .QueryInterface(Ci.nsIInterfaceRequestor)
-        .getInterface(Ci.nsIAppWindow);
+        .getInterface(Ci.nsIXULWindow);
       for (let flag of expected.chromeFlags) {
         ok(
           chromeFlags & Ci.nsIWebBrowserChrome[flag],

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_context_and_chromeFlags.js

@@ -2,7 +2,7 @@
 
 /**
  * Given some window in the parent process, ensure that
- * the nsIAppWindow has the CHROME_PRIVATE_WINDOW chromeFlag,
+ * the nsIXULWindow has the CHROME_PRIVATE_WINDOW chromeFlag,
  * and that the usePrivateBrowsing property is set to true on
  * both the window's nsILoadContext, as well as on the initial
  * browser's content docShell nsILoadContext.
@@ -15,7 +15,7 @@ function assertWindowIsPrivate(win) {
   let winDocShell = win.docShell;
   let chromeFlags = winDocShell.treeOwner
     .QueryInterface(Ci.nsIInterfaceRequestor)
-    .getInterface(Ci.nsIAppWindow).chromeFlags;
+    .getInterface(Ci.nsIXULWindow).chromeFlags;
 
   if (!win.gBrowser.selectedBrowser.hasContentOpener) {
     Assert.ok(

browser/components/search/SearchTelemetry.jsm

@@ -244,10 +244,10 @@ class TelemetryHandler {
    * This is called when a new window is opened, and handles registration of
    * that window if it is a browser window.
    *
-   * @param {nsIAppWindow} appWin The xul window that was opened.
+   * @param {nsIXULWindow} xulWin The xul window that was opened.
    */
-  onOpenWindow(appWin) {
-    let win = appWin.docShell.domWindow;
+  onOpenWindow(xulWin) {
+    let win = xulWin.docShell.domWindow;
     win.addEventListener(
       "load",
       () => {
@@ -268,10 +268,10 @@ class TelemetryHandler {
    * Listener that is called when a window is closed, and handles deregistration of
    * that window if it is a browser window.
    *
-   * @param {nsIAppWindow} appWin The xul window that was closed.
+   * @param {nsIXULWindow} xulWin The xul window that was closed.
    */
-  onCloseWindow(appWin) {
-    let win = appWin.docShell.domWindow;
+  onCloseWindow(xulWin) {
+    let win = xulWin.docShell.domWindow;
 
     if (
       win.document.documentElement.getAttribute("windowtype") !=

browser/components/sessionstore/SessionStore.jsm

@@ -5259,7 +5259,7 @@ var SessionStoreInternal = {
   },
 
   /**
-   * on popup windows, the AppWindow's attributes seem not to be set correctly
+   * on popup windows, the XULWindow's attributes seem not to be set correctly
    * we use thus JSDOMWindow attributes for sizemode and normal window attributes
    * (and hope for reasonable values when maximized/minimized - since then
    * outerWidth/outerHeight aren't the dimensions of the restored window)
@@ -5298,13 +5298,13 @@ var SessionStoreInternal = {
         }
         // Width and height attribute report the inner size, but we want
         // to store the outer size, so add the difference.
-        let appWin = aWindow.docShell.treeOwner
+        let xulWin = aWindow.docShell.treeOwner
           .QueryInterface(Ci.nsIInterfaceRequestor)
-          .getInterface(Ci.nsIAppWindow);
+          .getInterface(Ci.nsIXULWindow);
         let diff =
           aAttribute == "width"
-            ? appWin.outerToInnerWidthDifferenceInCSSPixels
-            : appWin.outerToInnerHeightDifferenceInCSSPixels;
+            ? xulWin.outerToInnerWidthDifferenceInCSSPixels
+            : xulWin.outerToInnerHeightDifferenceInCSSPixels;
         return attr + diff;
       }
     }

browser/components/tests/startupRecorder.js

@@ -123,8 +123,8 @@ startupRecorder.prototype = {
     // not other types (for example, the gfx sanity test window)
     if (topic == firstPaintNotification) {
       // In the case we're handling xul-window-visible, we'll have been handed
-      // an nsIAppWindow instead of an nsIDOMWindow.
-      if (subject instanceof Ci.nsIAppWindow) {
+      // an nsIXULWindow instead of an nsIDOMWindow.
+      if (subject instanceof Ci.nsIXULWindow) {
         subject = subject
           .QueryInterface(Ci.nsIInterfaceRequestor)
           .getInterface(Ci.nsIDOMWindow);