Backed out changeset 05a5f9d8249f (bug 1343728)

dom/ipc/ContentChild.cpp

@@ -857,17 +857,6 @@ ContentChild::ProvideWindowCommon(TabChild* aTabOpener,
   uint32_t maxTouchPoints = 0;
   DimensionInfo dimensionInfo;
 
-  nsCOMPtr<nsPIDOMWindowInner> parentTopInnerWindow;
-  if (aParent) {
-    nsCOMPtr<nsPIDOMWindowOuter> parentTopWindow =
-      nsPIDOMWindowOuter::From(aParent)->GetTop();
-    if (parentTopWindow) {
-      parentTopInnerWindow = parentTopWindow->GetCurrentInnerWindow();
-    }
-  }
-
-  // Send down the request to open the window.
-  RefPtr<CreateWindowPromise> windowCreated;
   if (aIframeMoz) {
     MOZ_ASSERT(aTabOpener);
     nsAutoCString url;
@@ -880,11 +869,10 @@ ContentChild::ProvideWindowCommon(TabChild* aTabOpener,
       url.SetIsVoid(true);
     }
 
-    // NOTE: BrowserFrameOpenWindowPromise is the same type as
+    newChild->SendBrowserFrameOpenWindow(aTabOpener, renderFrame, NS_ConvertUTF8toUTF16(url),
-    // CreateWindowPromise, and this code depends on that fact.
+                                         name, NS_ConvertUTF8toUTF16(features),
-    windowCreated =
+                                         aWindowIsNew, &textureFactoryIdentifier,
-      newChild->SendBrowserFrameOpenWindow(aTabOpener, renderFrame, NS_ConvertUTF8toUTF16(url),
+                                         &layersId, &compositorOptions, &maxTouchPoints);
-                                           name, NS_ConvertUTF8toUTF16(features));
   } else {
     nsAutoCString baseURIString;
     float fullZoom;
@@ -893,89 +881,30 @@ ContentChild::ProvideWindowCommon(TabChild* aTabOpener,
       return rv;
     }
 
-    windowCreated =
+    if (!SendCreateWindow(aTabOpener, newChild, renderFrame,
-      SendCreateWindow(aTabOpener, newChild, renderFrame,
+                          aChromeFlags, aCalledFromJS, aPositionSpecified,
-                       aChromeFlags, aCalledFromJS, aPositionSpecified,
+                          aSizeSpecified,
-                       aSizeSpecified,
+                          features,
-                       features,
+                          baseURIString,
-                       baseURIString,
+                          fullZoom,
-                       fullZoom);
+                          &rv,
-  }
+                          aWindowIsNew,
-
+                          &frameScripts,
-  // Await the promise being resolved. When the promise is resolved, we'll set
+                          &urlToLoad,
-  // the `ready` local variable, which will cause us to exit our nested event
+                          &textureFactoryIdentifier,
-  // loop.
+                          &layersId,
-  bool ready = false;
+                          &compositorOptions,
-  windowCreated->Then(SystemGroup::EventTargetFor(TaskCategory::Other), __func__,
+                          &maxTouchPoints,
-                      [&] (const CreatedWindowInfo& info) {
+                          &dimensionInfo)) {
-                        rv = info.rv();
+      PRenderFrameChild::Send__delete__(renderFrame);
-                        *aWindowIsNew = info.windowOpened();
+      return NS_ERROR_NOT_AVAILABLE;
-                        frameScripts = info.frameScripts();
-                        urlToLoad = info.urlToLoad();
-                        textureFactoryIdentifier = info.textureFactoryIdentifier();
-                        layersId = info.layersId();
-                        compositorOptions = info.compositorOptions();
-                        maxTouchPoints = info.maxTouchPoints();
-                        dimensionInfo = info.dimensions();
-                        ready = true;
-                      },
-                      [&] (const CreateWindowPromise::RejectValueType aReason) {
-                        NS_WARNING("windowCreated promise rejected");
-                        rv = NS_ERROR_NOT_AVAILABLE;
-                        ready = true;
-                      });
-
-  // =======================
-  // Begin Nested Event Loop
-  // =======================
-
-  // We have to wait for a response from either SendCreateWindow or
-  // SendBrowserFrameOpenWindow with information we're going to need to return
-  // from this function, So we spin a nested event loop until they get back to
-  // us.
-
-  // Prevent the docshell from becoming active while the nested event loop is
-  // spinning.
-  newChild->AddPendingDocShellBlocker();
-  auto removePendingDocShellBlocker = MakeScopeExit([&] {
-    if (newChild) {
-      newChild->RemovePendingDocShellBlocker();
     }
-  });
 
-  // Suspend our window if we have one to make sure we don't re-enter it.
+    if (NS_FAILED(rv)) {
-  if (parentTopInnerWindow) {
+      PRenderFrameChild::Send__delete__(renderFrame);
-    parentTopInnerWindow->Suspend();
+      return rv;
+    }
   }
-
-  {
-    AutoNoJSAPI nojsapi;
-
-    // Spin the event loop until we get a response. Callers of this function
-    // already have to guard against an inner event loop spinning in the
-    // non-e10s case because of the need to spin one to create a new chrome
-    // window.
-    SpinEventLoopUntil([&] () { return ready; });
-    MOZ_RELEASE_ASSERT(ready,
-                       "We are on the main thread, so we should not exit this "
-                       "loop without ready being true.");
-  }
-
-  if (parentTopInnerWindow) {
-    parentTopInnerWindow->Resume();
-  }
-
-  // =====================
-  // End Nested Event Loop
-  // =====================
-
-  // Handle the error which we got back from the parent process, if we got
-  // one.
-  if (NS_FAILED(rv)) {
-    PRenderFrameChild::Send__delete__(renderFrame);
-    return rv;
-  }
-
   if (!*aWindowIsNew) {
     PRenderFrameChild::Send__delete__(renderFrame);
     return NS_ERROR_ABORT;

dom/ipc/ContentParent.cpp

@@ -4630,28 +4630,25 @@ ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
                                 const nsCString& aFeatures,
                                 const nsCString& aBaseURI,
                                 const float& aFullZoom,
-                                CreateWindowResolver&& aResolve)
+                                nsresult* aResult,
+                                bool* aWindowIsNew,
+                                InfallibleTArray<FrameScriptInfo>* aFrameScripts,
+                                nsCString* aURLToLoad,
+                                TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                                uint64_t* aLayersId,
+                                CompositorOptions* aCompositorOptions,
+                                uint32_t* aMaxTouchPoints,
+                                DimensionInfo* aDimensions)
 {
-  nsresult rv = NS_OK;
-  CreatedWindowInfo cwi;
-
   // We always expect to open a new window here. If we don't, it's an error.
-  cwi.windowOpened() = true;
+  *aWindowIsNew = true;
-
+  *aResult = NS_OK;
-  // Make sure to resolve the resolver when this function exits, even if we
-  // failed to generate a valid response.
-  auto resolveOnExit = MakeScopeExit([&] {
-    // Copy over the nsresult, and then resolve.
-    cwi.rv() = rv;
-    aResolve(cwi);
-  });
 
   TabParent* newTab = TabParent::GetFrom(aNewTab);
   MOZ_ASSERT(newTab);
 
   auto destroyNewTabOnError = MakeScopeExit([&] {
-    // We always expect to open a new window here. If we don't, it's an error.
+    if (!*aWindowIsNew || NS_FAILED(*aResult)) {
-    if (!cwi.windowOpened() || NS_FAILED(rv)) {
       if (newTab) {
         newTab->Destroy();
       }
@@ -4662,7 +4659,7 @@ ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
   // we must have an opener.
   newTab->SetHasContentOpener(true);
 
-  TabParent::AutoUseNewTab aunt(newTab, &cwi.urlToLoad());
+  TabParent::AutoUseNewTab aunt(newTab, aURLToLoad);
   const uint64_t nextTabParentId = ++sNextTabParentId;
   sNextTabParents.Put(nextTabParentId, newTab);
 
@@ -4671,35 +4668,35 @@ ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
     CommonCreateWindow(aThisTab, /* aSetOpener = */ true, aChromeFlags,
                        aCalledFromJS, aPositionSpecified, aSizeSpecified,
                        nullptr, aFeatures, aBaseURI, aFullZoom,
-                       nextTabParentId, NullString(), rv,
+                       nextTabParentId, NullString(), *aResult,
-                       newRemoteTab, &cwi.windowOpened());
+                       newRemoteTab, aWindowIsNew);
   if (!ipcResult) {
     return ipcResult;
   }
 
-  if (NS_WARN_IF(NS_FAILED(rv))) {
+  if (NS_WARN_IF(NS_FAILED(*aResult))) {
     return IPC_OK();
   }
 
   if (sNextTabParents.GetAndRemove(nextTabParentId).valueOr(nullptr)) {
-    cwi.windowOpened() = false;
+    *aWindowIsNew = false;
   }
   MOZ_ASSERT(TabParent::GetFrom(newRemoteTab) == newTab);
 
-  newTab->SwapFrameScriptsFrom(cwi.frameScripts());
+  newTab->SwapFrameScriptsFrom(*aFrameScripts);
 
   RenderFrameParent* rfp = static_cast<RenderFrameParent*>(aRenderFrame);
   if (!newTab->SetRenderFrame(rfp) ||
-      !newTab->GetRenderFrameInfo(&cwi.textureFactoryIdentifier(), &cwi.layersId())) {
+      !newTab->GetRenderFrameInfo(aTextureFactoryIdentifier, aLayersId)) {
-    rv = NS_ERROR_FAILURE;
+    *aResult = NS_ERROR_FAILURE;
   }
-  cwi.compositorOptions() = rfp->GetCompositorOptions();
+  *aCompositorOptions = rfp->GetCompositorOptions();
 
   nsCOMPtr<nsIWidget> widget = newTab->GetWidget();
-  if (widget) {
+  *aMaxTouchPoints = widget ? widget->GetMaxTouchPoints() : 0;
-    cwi.maxTouchPoints() = widget->GetMaxTouchPoints();
+
-    cwi.dimensions() = newTab->GetDimensionInfo();
+  // NOTE: widget must be set for this to return a meaningful value.
-  }
+  *aDimensions = widget ? newTab->GetDimensionInfo() : DimensionInfo();
 
   return IPC_OK();
 }

dom/ipc/ContentParent.h

@@ -536,7 +536,15 @@ public:
                    const nsCString& aFeatures,
                    const nsCString& aBaseURI,
                    const float& aFullZoom,
-                   CreateWindowResolver&& aResolve) override;
+                   nsresult* aResult,
+                   bool* aWindowIsNew,
+                   InfallibleTArray<FrameScriptInfo>* aFrameScripts,
+                   nsCString* aURLToLoad,
+                   layers::TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                   uint64_t* aLayersId,
+                   mozilla::layers::CompositorOptions* aCompositorOptions,
+                   uint32_t* aMaxTouchPoints,
+                   DimensionInfo* aDimensions) override;
 
   virtual mozilla::ipc::IPCResult RecvCreateWindowInDifferentProcess(
     PBrowserParent* aThisTab,

dom/ipc/DOMTypes.ipdlh

@@ -22,8 +22,6 @@ using CSSRect from "Units.h";
 using CSSSize from "Units.h";
 using mozilla::LayoutDeviceIntPoint from "Units.h";
 using mozilla::dom::ScreenOrientationInternal from "mozilla/dom/ScreenOrientation.h";
-using struct mozilla::layers::TextureFactoryIdentifier from "mozilla/layers/CompositorTypes.h";
-using mozilla::layers::CompositorOptions from "mozilla/layers/CompositorOptions.h";
 
 namespace mozilla {
 namespace dom {
@@ -98,27 +96,5 @@ struct DimensionInfo
   LayoutDeviceIntPoint chromeDisp;
 };
 
-struct FrameScriptInfo
-{
-  nsString url;
-  bool runInGlobalScope;
-};
-
-/**
- * The information required to complete a window creation request.
- */
-struct CreatedWindowInfo
-{
-  nsresult rv;
-  bool windowOpened;
-  FrameScriptInfo[] frameScripts;
-  nsCString urlToLoad;
-  TextureFactoryIdentifier textureFactoryIdentifier;
-  uint64_t layersId;
-  CompositorOptions compositorOptions;
-  uint32_t maxTouchPoints;
-  DimensionInfo dimensions;
-};
-
 } // namespace dom
 } // namespace mozilla

dom/ipc/PBrowser.ipdl

@@ -459,9 +459,13 @@ parent:
      *
      * @param opener the PBrowser whose content called window.open.
      */
-    async BrowserFrameOpenWindow(PBrowser opener, PRenderFrame renderFrame,
+    sync BrowserFrameOpenWindow(PBrowser opener, PRenderFrame renderFrame,
-                                 nsString aURL, nsString aName, nsString aFeatures)
+                                nsString aURL, nsString aName, nsString aFeatures)
-        returns (CreatedWindowInfo window);
+      returns (bool windowOpened,
+               TextureFactoryIdentifier textureFactoryIdentifier,
+               uint64_t layersId,
+               CompositorOptions compositorOptions,
+               uint32_t maxTouchPoints);
 
     /**
      * Tells the containing widget whether the given input block results in a

dom/ipc/PContent.ipdl

@@ -176,6 +176,14 @@ struct DomainPolicyClone
     URIParams[] superWhitelist;
 };
 
+
+
+struct FrameScriptInfo
+{
+    nsString url;
+    bool runInGlobalScope;
+};
+
 struct AndroidSystemInfo
 {
     nsString device;
@@ -979,17 +987,25 @@ parent:
     sync GetGraphicsDeviceInitData()
         returns (ContentDeviceData aData);
 
-    async CreateWindow(nullable PBrowser aThisTab,
+    sync CreateWindow(nullable PBrowser aThisTab,
-                       PBrowser aNewTab,
+                      PBrowser aNewTab,
-                       PRenderFrame aRenderFrame,
+                      PRenderFrame aRenderFrame,
-                       uint32_t aChromeFlags,
+                      uint32_t aChromeFlags,
-                       bool aCalledFromJS,
+                      bool aCalledFromJS,
-                       bool aPositionSpecified,
+                      bool aPositionSpecified,
-                       bool aSizeSpecified,
+                      bool aSizeSpecified,
-                       nsCString aFeatures,
+                      nsCString aFeatures,
-                       nsCString aBaseURI,
+                      nsCString aBaseURI,
-                       float aFullZoom)
+                      float aFullZoom)
-        returns (CreatedWindowInfo window);
+      returns (nsresult rv,
+               bool windowOpened,
+               FrameScriptInfo[] frameScripts,
+               nsCString urlToLoad,
+               TextureFactoryIdentifier textureFactoryIdentifier,
+               uint64_t layersId,
+               CompositorOptions compositorOptions,
+               uint32_t maxTouchPoints,
+               DimensionInfo dimensions);
 
     async CreateWindowInDifferentProcess(
       PBrowser aThisTab,

dom/ipc/TabParent.cpp

@@ -2583,27 +2583,21 @@ TabParent::RecvBrowserFrameOpenWindow(PBrowserParent* aOpener,
                                       const nsString& aURL,
                                       const nsString& aName,
                                       const nsString& aFeatures,
-                                      BrowserFrameOpenWindowResolver&& aResolve)
+                                      bool* aOutWindowOpened,
+                                      TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                                      uint64_t* aLayersId,
+                                      CompositorOptions* aCompositorOptions,
+                                      uint32_t* aMaxTouchPoints)
 {
-  CreatedWindowInfo cwi;
   BrowserElementParent::OpenWindowResult opened =
     BrowserElementParent::OpenWindowOOP(TabParent::GetFrom(aOpener),
                                         this, aRenderFrame, aURL, aName, aFeatures,
-                                        &cwi.textureFactoryIdentifier(),
+                                        aTextureFactoryIdentifier, aLayersId);
-                                        &cwi.layersId());
+  *aCompositorOptions = static_cast<RenderFrameParent*>(aRenderFrame)->GetCompositorOptions();
-  cwi.compositorOptions() =
+  *aOutWindowOpened = (opened == BrowserElementParent::OPEN_WINDOW_ADDED);
-    static_cast<RenderFrameParent*>(aRenderFrame)->GetCompositorOptions();
-  cwi.windowOpened() = (opened == BrowserElementParent::OPEN_WINDOW_ADDED);
   nsCOMPtr<nsIWidget> widget = GetWidget();
-  if (widget) {
+  *aMaxTouchPoints = widget ? widget->GetMaxTouchPoints() : 0;
-    cwi.maxTouchPoints() = widget->GetMaxTouchPoints();
+  if (!*aOutWindowOpened) {
-    cwi.dimensions() = GetDimensionInfo();
-  }
-
-  // Resolve the request with the information we collected.
-  aResolve(cwi);
-
-  if (!cwi.windowOpened()) {
     Destroy();
   }
   return IPC_OK();

dom/ipc/TabParent.h

@@ -165,13 +165,16 @@ public:
   virtual mozilla::ipc::IPCResult
   RecvSetHasBeforeUnload(const bool& aHasBeforeUnload) override;
 
-  virtual mozilla::ipc::IPCResult
+  virtual mozilla::ipc::IPCResult RecvBrowserFrameOpenWindow(PBrowserParent* aOpener,
-  RecvBrowserFrameOpenWindow(PBrowserParent* aOpener,
+                                                             PRenderFrameParent* aRenderFrame,
-                             PRenderFrameParent* aRenderFrame,
+                                                             const nsString& aURL,
-                             const nsString& aURL,
+                                                             const nsString& aName,
-                             const nsString& aName,
+                                                             const nsString& aFeatures,
-                             const nsString& aFeatures,
+                                                             bool* aOutWindowOpened,
-                             BrowserFrameOpenWindowResolver&& aResolve) override;
+                                                             TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                                                             uint64_t* aLayersId,
+                                                             CompositorOptions* aCompositorOptions,
+                                                             uint32_t* aMaxTouchPoints) override;
 
   virtual mozilla::ipc::IPCResult
   RecvSyncMessage(const nsString& aMessage,

ipc/ipdl/sync-messages.ini

@@ -839,6 +839,8 @@ description =
 description =
 [PBrowser::GetWidgetRounding]
 description =
+[PBrowser::BrowserFrameOpenWindow]
+description =
 [PBrowser::RequestNativeKeyBindings]
 description =
 [PBrowser::GetTabCount]
@@ -907,6 +909,8 @@ description =
 description =
 [PContent::GetGraphicsDeviceInitData]
 description =
+[PContent::CreateWindow]
+description =
 [PContent::GetAndroidSystemInfo]
 description =
 [PContent::UngrabPointer]