Commit 801dae8f authored by Iulian Moraru's avatar Iulian Moraru
Browse files

Backed out 14 changesets (bug 1607634, bug 1814683, bug 1815177, bug 1814686)... 

Backed out 14 changesets (bug 1607634, bug 1814683, bug 1815177, bug 1814686) for causing build bustages on MaybeStorageBase. CLOSED TREE

Backed out changeset ae1c0551cea5 (bug 1815177)
Backed out changeset a11cafaa1884 (bug 1814686)
Backed out changeset 621507521762 (bug 1814686)
Backed out changeset ad692c73e381 (bug 1814686)
Backed out changeset 3be031e503dc (bug 1607634)
Backed out changeset aebbaa145d2d (bug 1607634)
Backed out changeset 9aa1f346fe14 (bug 1607634)
Backed out changeset e3eb77ad55ca (bug 1607634)
Backed out changeset e60591e5d5cf (bug 1607634)
Backed out changeset 6e43042d204a (bug 1814683)
Backed out changeset 1706e88652d6 (bug 1814683)
Backed out changeset 6878a1590e91 (bug 1814683)
Backed out changeset b1c980c834d8 (bug 1814683)
Backed out changeset 94480b82d102 (bug 1814683)
parent 68184463

accessible/android/DocAccessibleWrap.cpp

+14 −16
Original line number Diff line number Diff line
@@ -148,11 +148,11 @@ void DocAccessibleWrap::CacheViewportCallback(nsITimer* aTimer, 
      accessible->Description(description);



      cacheData.AppendElement(BatchData(

          OriginDocument(WrapNotNull(accessible->Document()->IPCDoc())),

          UNIQUE_ID(accessible), accessible->State(), accessible->Bounds(),

          accessible->ActionCount(), name, textValue, nodeID, description,

          accessible->Document()->IPCDoc(), UNIQUE_ID(accessible),

          accessible->State(), accessible->Bounds(), accessible->ActionCount(),

          name, textValue, nodeID, description, UnspecifiedNaN<double>(),

          UnspecifiedNaN<double>(), UnspecifiedNaN<double>(),

          UnspecifiedNaN<double>(), UnspecifiedNaN<double>(), nullptr));

          UnspecifiedNaN<double>(), nullptr));

    }



    ipcDoc->SendBatch(eBatch_Viewport, cacheData);
@@ -186,8 +186,7 @@ void DocAccessibleWrap::CacheViewportCallback(nsITimer* aTimer, 
        // In that case, just throw away this update. We will get a new one soon

        // enough.

        ipcDoc->GetPlatformExtension()->SendSetPivotBoundaries(

            WrapNotNull(firstDoc), UNIQUE_ID(first), WrapNotNull(lastDoc),

            UNIQUE_ID(last));

            firstDoc, UNIQUE_ID(first), lastDoc, UNIQUE_ID(last));

      }

    } else if (RefPtr<SessionAccessibility> sessionAcc =

                   SessionAccessibility::GetInstanceFor(docAcc)) {
@@ -257,10 +256,10 @@ void DocAccessibleWrap::CacheFocusPath(AccessibleWrap* aAccessible) { 
      nsAutoString description;

      acc->Description(description);

      RefPtr<AccAttributes> attributes = acc->Attributes();

      cacheData.AppendElement(BatchData(

          OriginDocument(WrapNotNull(acc->Document()->IPCDoc())),

          UNIQUE_ID(acc), acc->State(), acc->Bounds(), acc->ActionCount(), name,

          textValue, nodeID, description, acc->CurValue(), acc->MinValue(),

      cacheData.AppendElement(

          BatchData(acc->Document()->IPCDoc(), UNIQUE_ID(acc), acc->State(),

                    acc->Bounds(), acc->ActionCount(), name, textValue, nodeID,

                    description, acc->CurValue(), acc->MinValue(),

                    acc->MaxValue(), acc->Step(), attributes));

      mFocusPath.InsertOrUpdate(acc->UniqueID(), RefPtr{acc});

    }
@@ -299,11 +298,10 @@ void DocAccessibleWrap::UpdateFocusPathBounds() { 
      }



      boundsData.AppendElement(BatchData(

          OriginDocument(WrapNotNull(accessible->Document()->IPCDoc())),

          UNIQUE_ID(accessible), 0, accessible->Bounds(), 0, nsString(),

          nsString(), nsString(), nsString(), UnspecifiedNaN<double>(),

          UnspecifiedNaN<double>(), UnspecifiedNaN<double>(),

          UnspecifiedNaN<double>(), RefPtr<AccAttributes>{}));

          accessible->Document()->IPCDoc(), UNIQUE_ID(accessible), 0,

          accessible->Bounds(), 0, nsString(), nsString(), nsString(),

          nsString(), UnspecifiedNaN<double>(), UnspecifiedNaN<double>(),

          UnspecifiedNaN<double>(), UnspecifiedNaN<double>(), nullptr));

    }



    ipcDoc->SendBatch(eBatch_BoundsUpdate, boundsData);

accessible/base/NotificationController.cpp

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ void NotificationController::WillRefresh(mozilla::TimeStamp aTime) { 
      MOZ_DIAGNOSTIC_ASSERT(id);

      DocAccessibleChild* ipcDoc = childDoc->IPCDoc();

      if (ipcDoc) {

        parentIPCDoc->SendBindChildDoc(WrapNotNull(ipcDoc), id);

        parentIPCDoc->SendBindChildDoc(ipcDoc, id);

        continue;

      }

accessible/ipc/DocAccessibleParent.cpp

+3 −3
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ mozilla::ipc::IPCResult DocAccessibleParent::RecvRoleChangedEvent( 
}



mozilla::ipc::IPCResult DocAccessibleParent::RecvBindChildDoc(

    NotNull<PDocAccessibleParent*> aChildDoc, const uint64_t& aID) {

    PDocAccessibleParent* aChildDoc, const uint64_t& aID) {

  ACQUIRE_ANDROID_LOCK

  // One document should never directly be the child of another.

  // We should always have at least an outer doc accessible in between.
@@ -814,7 +814,7 @@ mozilla::ipc::IPCResult DocAccessibleParent::RecvBindChildDoc( 


  MOZ_ASSERT(CheckDocTree());



  auto childDoc = static_cast<DocAccessibleParent*>(aChildDoc.get());

  auto childDoc = static_cast<DocAccessibleParent*>(aChildDoc);

  childDoc->Unbind();

  ipc::IPCResult result = AddChildDoc(childDoc, aID, false);

  MOZ_ASSERT(result);
@@ -1249,7 +1249,7 @@ mozilla::ipc::IPCResult DocAccessibleParent::RecvBatch( 
  nsTArray<RemoteAccessible*> proxies(aData.Length());

  for (size_t i = 0; i < aData.Length(); i++) {

    DocAccessibleParent* doc = static_cast<DocAccessibleParent*>(

        aData.ElementAt(i).Document().get_PDocAccessible().AsParent().get());

        aData.ElementAt(i).Document().get_PDocAccessibleParent());

    MOZ_ASSERT(doc);



    if (doc->IsShutdown()) {

accessible/ipc/DocAccessibleParent.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ class DocAccessibleParent : public RemoteAccessible, 
      const a11y::role& aRole, const uint8_t& aRoleMapEntryIndex) final;



  virtual mozilla::ipc::IPCResult RecvBindChildDoc(

      NotNull<PDocAccessibleParent*> aChildDoc, const uint64_t& aID) override;

      PDocAccessibleParent* aChildDoc, const uint64_t& aID) override;



  void Unbind() {

    if (DocAccessibleParent* parent = ParentDoc()) {

accessible/ipc/DocAccessibleTypes.ipdlh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ namespace a11y { 
struct CacheData

{

  uint64_t ID;

  nullable AccAttributes Fields;

  AccAttributes Fields;

};



}