From 65903a9c1814d6296cce85914f435c8e80fd3253 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 29 Sep 2017 13:34:21 -0700
Subject: [PATCH] Backed out changeset cfc8e7a8f4a4 (bug 1402951) for failures
 in test_ariaowns.html a=backout

MozReview-Commit-ID: EYzo4FvzoXe
---
 accessible/generic/DocAccessible.cpp      | 14 ++++++--------
 accessible/ipc/DocAccessibleChildBase.cpp | 15 +--------------
 accessible/ipc/DocAccessibleChildBase.h   |  5 -----
 accessible/ipc/DocAccessibleParent.cpp    |  5 -----
 accessible/ipc/other/PDocAccessible.ipdl  |  1 -
 accessible/ipc/win/DocAccessibleChild.h   |  3 +--
 accessible/ipc/win/PDocAccessible.ipdl    |  1 -
 7 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp
index fa6f3c6a70d5..60b160b21a78 100644
--- a/accessible/generic/DocAccessible.cpp
+++ b/accessible/generic/DocAccessible.cpp
@@ -1536,15 +1536,13 @@ DocAccessible::DoInitialUpdate()
     ParentDocument()->FireDelayedEvent(reorderEvent);
   }
 
-  if (IPCAccessibilityActive()) {
-    DocAccessibleChild* ipcDoc = IPCDoc();
-    MOZ_ASSERT(ipcDoc);
-    if (ipcDoc) {
-      for (auto idx = 0U; idx < mChildren.Length(); idx++) {
-        ipcDoc->InsertIntoIpcTree(this, mChildren.ElementAt(idx), idx);
-      }
-    }
+  TreeMutation mt(this);
+  uint32_t childCount = ChildCount();
+  for (uint32_t i = 0; i < childCount; i++) {
+    Accessible* child = GetChildAt(i);
+    mt.AfterInsertion(child);
   }
+  mt.Done();
 }
 
 void
diff --git a/accessible/ipc/DocAccessibleChildBase.cpp b/accessible/ipc/DocAccessibleChildBase.cpp
index 19a858aa6d9b..6a0ad9b7dbc6 100644
--- a/accessible/ipc/DocAccessibleChildBase.cpp
+++ b/accessible/ipc/DocAccessibleChildBase.cpp
@@ -80,19 +80,6 @@ DocAccessibleChildBase::SerializeTree(Accessible* aRoot,
   }
 }
 
-void
-DocAccessibleChildBase::InsertIntoIpcTree(Accessible* aParent,
-                                          Accessible* aChild,
-                                          uint32_t aIdxInParent)
-{
-  uint64_t parentID = aParent->IsDoc() ?
-    0 : reinterpret_cast<uint64_t>(aParent->UniqueID());
-  nsTArray<AccessibleData> shownTree;
-  ShowEventData data(parentID, aIdxInParent, shownTree, true);
-  SerializeTree(aChild, data.NewTree());
-  MaybeSendShowEvent(data, false);
-}
-
 void
 DocAccessibleChildBase::ShowEvent(AccShowEvent* aShowEvent)
 {
@@ -100,7 +87,7 @@ DocAccessibleChildBase::ShowEvent(AccShowEvent* aShowEvent)
   uint64_t parentID = parent->IsDoc() ? 0 : reinterpret_cast<uint64_t>(parent->UniqueID());
   uint32_t idxInParent = aShowEvent->GetAccessible()->IndexInParent();
   nsTArray<AccessibleData> shownTree;
-  ShowEventData data(parentID, idxInParent, shownTree, false);
+  ShowEventData data(parentID, idxInParent, shownTree);
   SerializeTree(aShowEvent->GetAccessible(), data.NewTree());
   MaybeSendShowEvent(data, aShowEvent->IsFromUserInput());
 }
diff --git a/accessible/ipc/DocAccessibleChildBase.h b/accessible/ipc/DocAccessibleChildBase.h
index 13146e5d44e2..b8a8bfde1d0c 100644
--- a/accessible/ipc/DocAccessibleChildBase.h
+++ b/accessible/ipc/DocAccessibleChildBase.h
@@ -45,11 +45,6 @@ public:
     SendShutdown();
   }
 
-  /**
-   * Serializes a shown tree and sends it to the chrome process.
-   */
-  void InsertIntoIpcTree(Accessible* aParent,
-                         Accessible* aChild, uint32_t aIdxInParent);
   void ShowEvent(AccShowEvent* aShowEvent);
 
   virtual void ActorDestroy(ActorDestroyReason) override
diff --git a/accessible/ipc/DocAccessibleParent.cpp b/accessible/ipc/DocAccessibleParent.cpp
index 34c334847c04..4bbf261273c5 100644
--- a/accessible/ipc/DocAccessibleParent.cpp
+++ b/accessible/ipc/DocAccessibleParent.cpp
@@ -79,11 +79,6 @@ DocAccessibleParent::RecvShowEvent(const ShowEventData& aData,
 
   MOZ_ASSERT(CheckDocTree());
 
-  // Just update, no events.
-  if (aData.EventSuppressed()) {
-    return IPC_OK();
-  }
-
   ProxyAccessible* target = parent->ChildAt(newChildIdx);
   ProxyShowHideEvent(target, parent, true, aFromUser);
 
diff --git a/accessible/ipc/other/PDocAccessible.ipdl b/accessible/ipc/other/PDocAccessible.ipdl
index ffed961185fa..4c084bbee125 100644
--- a/accessible/ipc/other/PDocAccessible.ipdl
+++ b/accessible/ipc/other/PDocAccessible.ipdl
@@ -29,7 +29,6 @@ struct ShowEventData
   uint64_t ID;
   uint32_t Idx;
   AccessibleData[] NewTree;
-  bool EventSuppressed;
 };
 
 struct Attribute
diff --git a/accessible/ipc/win/DocAccessibleChild.h b/accessible/ipc/win/DocAccessibleChild.h
index 6a59564481c6..4a94c161b70c 100644
--- a/accessible/ipc/win/DocAccessibleChild.h
+++ b/accessible/ipc/win/DocAccessibleChild.h
@@ -111,8 +111,7 @@ private:
     SerializedShow(DocAccessibleChild* aTarget,
                    ShowEventData& aEventData, bool aFromUser)
       : DeferredEvent(aTarget)
-      , mEventData(aEventData.ID(), aEventData.Idx(),
-                   nsTArray<AccessibleData>(), aEventData.EventSuppressed())
+      , mEventData(aEventData.ID(), aEventData.Idx(), nsTArray<AccessibleData>())
       , mFromUser(aFromUser)
     {
       // Since IPDL doesn't generate a move constructor for ShowEventData,
diff --git a/accessible/ipc/win/PDocAccessible.ipdl b/accessible/ipc/win/PDocAccessible.ipdl
index da7128e87a65..afd3b991efdc 100644
--- a/accessible/ipc/win/PDocAccessible.ipdl
+++ b/accessible/ipc/win/PDocAccessible.ipdl
@@ -29,7 +29,6 @@ struct ShowEventData
   uint64_t ID;
   uint32_t Idx;
   AccessibleData[] NewTree;
-  bool EventSuppressed;
 };
 
 struct Attribute