Backed out changeset a1e773337202 (bug 1350633)

mozilla-spidermonkey · Jun 28, 2017 · f0eebc3 · f0eebc3
1 parent b93d8d2
commit f0eebc3
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 41 deletions.
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
@@ -149,6 +149,11 @@ parent:
 
     async PPaymentRequest();
 
+    /**
+     * Return native data of root widget
+     */
+    nested(inside_cpow) sync GetWidgetNativeData() returns (WindowsHandle value);
+
     /**
      * Sends an NS_NATIVE_CHILD_OF_SHAREABLE_WINDOW to be adopted by the
      * widget's shareable window on the chrome side. Only used on Windows.
@@ -889,12 +894,6 @@ child:
      */
     async SetOriginAttributes(OriginAttributes aOriginAttributes);
 
-    /**
-     * Pass the current handle for the current native widget to the content
-     * process, so it can be used by PuppetWidget.
-     */
-    async SetWidgetNativeData(WindowsHandle aHandle);
-
 /*
  * FIXME: write protocol!
 

diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
@@ -411,7 +411,6 @@ TabChild::TabChild(nsIContentChild* aManager,
   , mPendingDocShellPreserveLayers(false)
   , mPendingDocShellReceivedMessage(false)
   , mPendingDocShellBlockers(0)
-  , mWidgetNativeData(0)
 {
   nsWeakPtr weakPtrThis(do_GetWeakReference(static_cast<nsITabChild*>(this)));  // for capture by the lambda
   mSetAllowedTouchBehaviorCallback = [weakPtrThis](uint64_t aInputBlockId,
@@ -3212,13 +3211,6 @@ TabChild::RecvSetOriginAttributes(const OriginAttributes& aOriginAttributes)
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult
-TabChild::RecvSetWidgetNativeData(const WindowsHandle& aWidgetNativeData)
-{
-  mWidgetNativeData = aWidgetNativeData;
-  return IPC_OK();
-}
-
 mozilla::plugins::PPluginWidgetChild*
 TabChild::AllocPPluginWidgetChild()
 {

diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
@@ -697,12 +697,6 @@ class TabChild final : public TabChildBase,
   void AddPendingDocShellBlocker();
   void RemovePendingDocShellBlocker();
 
-  // The HANDLE object for the widget this TabChild in.
-  WindowsHandle WidgetNativeData()
-  {
-    return mWidgetNativeData;
-  }
-
 protected:
   virtual ~TabChild();
 
@@ -744,8 +738,6 @@ class TabChild final : public TabChildBase,
 
   virtual mozilla::ipc::IPCResult RecvSetOriginAttributes(const OriginAttributes& aOriginAttributes) override;
 
-  virtual mozilla::ipc::IPCResult RecvSetWidgetNativeData(const WindowsHandle& aWidgetNativeData) override;
-
 private:
   void HandleDoubleTap(const CSSPoint& aPoint, const Modifiers& aModifiers,
                        const ScrollableLayerGuid& aGuid);
@@ -889,8 +881,6 @@ class TabChild final : public TabChildBase,
   bool mPendingDocShellReceivedMessage;
   uint32_t mPendingDocShellBlockers;
 
-  WindowsHandle mWidgetNativeData;
-
   DISALLOW_EVIL_CONSTRUCTORS(TabChild);
 };
 

diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
@@ -292,17 +292,6 @@ TabParent::SetOwnerElement(Element* aElement)
 
   AddWindowListeners();
   TryCacheDPIAndScale();
-
-  // Try to send down WidgetNativeData, now that this TabParent is associated
-  // with a widget.
-  nsCOMPtr<nsIWidget> widget = GetTopLevelWidget();
-  if (widget) {
-    WindowsHandle widgetNativeData = reinterpret_cast<WindowsHandle>(
-      widget->GetNativeData(NS_NATIVE_SHAREABLE_WINDOW));
-    if (widgetNativeData) {
-      Unused << SendSetWidgetNativeData(widgetNativeData);
-    }
-  }
 }
 
 void
@@ -2326,6 +2315,18 @@ TabParent::GetTopLevelWidget()
   return nullptr;
 }
 
+mozilla::ipc::IPCResult
+TabParent::RecvGetWidgetNativeData(WindowsHandle* aValue)
+{
+  *aValue = 0;
+  nsCOMPtr<nsIWidget> widget = GetTopLevelWidget();
+  if (widget) {
+    *aValue = reinterpret_cast<WindowsHandle>(
+      widget->GetNativeData(NS_NATIVE_SHAREABLE_WINDOW));
+  }
+  return IPC_OK();
+}
+
 mozilla::ipc::IPCResult
 TabParent::RecvSetNativeChildOfShareableWindow(const uintptr_t& aChildWindow)
 {

diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
@@ -305,6 +305,8 @@ class TabParent final : public PBrowserParent
 
   virtual mozilla::ipc::IPCResult RecvGetWidgetRounding(int32_t* aValue) override;
 
+  virtual mozilla::ipc::IPCResult RecvGetWidgetNativeData(WindowsHandle* aValue) override;
+
   virtual mozilla::ipc::IPCResult RecvSetNativeChildOfShareableWindow(const uintptr_t& childWindow) override;
 
   virtual mozilla::ipc::IPCResult RecvDispatchFocusToTopLevelWindow() override;

diff --git a/ipc/ipdl/sync-messages.ini b/ipc/ipdl/sync-messages.ini
@@ -821,6 +821,8 @@ description =
 description =
 [PBrowser::PPluginWidget]
 description =
+[PBrowser::GetWidgetNativeData]
+description =
 [PBrowser::DispatchFocusToTopLevelWindow]
 description =
 [PBrowser::NotifyIMEFocus]

diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp
@@ -1189,14 +1189,10 @@ PuppetWidget::GetNativeData(uint32_t aDataType)
 {
   switch (aDataType) {
   case NS_NATIVE_SHAREABLE_WINDOW: {
-    // NOTE: We can not have a tab child in some situations, such as when we're
-    // rendering to a fake widget for thumbnails.
-    if (!mTabChild) {
-      NS_WARNING("Need TabChild to get the nativeWindow from!");
-    }
+    MOZ_ASSERT(mTabChild, "Need TabChild to get the nativeWindow from!");
     mozilla::WindowsHandle nativeData = 0;
     if (mTabChild) {
-      nativeData = mTabChild->WidgetNativeData();
+      mTabChild->SendGetWidgetNativeData(&nativeData);
     }
     return (void*)nativeData;
   }