Backed out changeset d1cfae63f790 (bug 1297549) for talos bustage

dom/ipc/PBrowser.ipdl

@@ -837,14 +837,6 @@ child:
      */
     async Print(uint64_t aOuterWindowID, PrintData aPrintData);
 
-    /**
-     * Update the child with the tab's current top-level native window handle.
-     * This is used by a11y objects who must expose their native window.
-     *
-     * @param aNewHandle The native window handle of the tab's top-level window.
-     */
-    async UpdateNativeWindowHandle(uintptr_t aNewHandle);
-
 /*
  * FIXME: write protocol!
 

dom/ipc/TabChild.cpp

@@ -548,9 +548,6 @@ TabChild::TabChild(nsIContentChild* aManager,
   , mDidSetRealShowInfo(false)
   , mDidLoadURLInit(false)
   , mAPZChild(nullptr)
-#if defined(XP_WIN) && defined(ACCESSIBILITY)
-  , mNativeWindowHandle(0)
-#endif
   , mLayerObserverEpoch(0)
 {
   // In the general case having the TabParent tell us if APZ is enabled or not
@@ -2537,17 +2534,6 @@ TabChild::RecvPrint(const uint64_t& aOuterWindowID, const PrintData& aPrintData)
   return true;
 }
 
-bool
-TabChild::RecvUpdateNativeWindowHandle(const uintptr_t& aNewHandle)
-{
-#if defined(XP_WIN) && defined(ACCESSIBILITY)
-  mNativeWindowHandle = aNewHandle;
-  return true;
-#else
-  return false;
-#endif
-}
-
 bool
 TabChild::RecvDestroy()
 {

dom/ipc/TabChild.h

@@ -590,8 +590,6 @@ public:
   virtual bool RecvPrint(const uint64_t& aOuterWindowID,
                          const PrintData& aPrintData) override;
 
-  virtual bool RecvUpdateNativeWindowHandle(const uintptr_t& aNewHandle) override;
-
   /**
    * Native widget remoting protocol for use with windowed plugins with e10s.
    */
@@ -650,10 +648,6 @@ public:
       mAPZChild = aAPZChild;
   }
 
-#if defined(XP_WIN) && defined(ACCESSIBILITY)
-  uintptr_t GetNativeWindowHandle() const { return mNativeWindowHandle; }
-#endif
-
   // Request that the docshell be marked as active.
   void ForcePaint(uint64_t aLayerObserverEpoch);
 
@@ -792,11 +786,6 @@ private:
   // dangling pointer.
   layers::APZChild* mAPZChild;
 
-#if defined(XP_WIN) && defined(ACCESSIBILITY)
-  // The handle associated with the native window that contains this tab
-  uintptr_t mNativeWindowHandle;
-#endif // defined(XP_WIN)
-
   // The most recently seen layer observer epoch in RecvSetDocShellIsActive.
   uint64_t mLayerObserverEpoch;
 

dom/ipc/TabParent.cpp

@@ -400,17 +400,6 @@ TabParent::SetOwnerElement(Element* aElement)
     Unused << SendSetUseGlobalHistory(useGlobalHistory);
   }
 
-#if defined(XP_WIN) && defined(ACCESSIBILITY)
-  if (!mIsDestroyed) {
-    uintptr_t newWindowHandle = 0;
-    if (nsCOMPtr<nsIWidget> widget = GetWidget()) {
-      newWindowHandle =
-        reinterpret_cast<uintptr_t>(widget->GetNativeData(NS_NATIVE_WINDOW));
-    }
-    Unused << SendUpdateNativeWindowHandle(newWindowHandle);
-  }
-#endif
-
   AddWindowListeners();
   TryCacheDPIAndScale();
 }