Commit f54ee076 authored by Csoregi Natalia's avatar Csoregi Natalia
Browse files

Backed out 13 changesets (bug 708901, bug 1184468) for causing build bustage... 

Backed out 13 changesets (bug 708901, bug 1184468) for causing build bustage on GeckoViewHistory.cpp. CLOSED TREE

Backed out changeset b1e4c01e63b8 (bug 708901)
Backed out changeset 37b52cce83c0 (bug 708901)
Backed out changeset eee75f33f060 (bug 708901)
Backed out changeset 479bf64c7986 (bug 708901)
Backed out changeset 15a8fb94d15d (bug 708901)
Backed out changeset be31ccd9a61d (bug 708901)
Backed out changeset fc54f4eaedd5 (bug 708901)
Backed out changeset 03c3a56c3d13 (bug 708901)
Backed out changeset 73f11d3c1298 (bug 708901)
Backed out changeset aed22fd80893 (bug 708901)
Backed out changeset 74d8249fbe7e (bug 708901)
Backed out changeset acb725eb3c1d (bug 1184468)
Backed out changeset 70f3ea6efec4 (bug 1184468)
parent da1b59c4

accessible/windows/msaa/AccessibleWrap.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1501,12 +1501,12 @@ static bool VisitDocAccessibleParentDescendantsAtTopLevelInContentProcess( 
  // We can't use BrowserBridgeParent::VisitAllDescendants because it doesn't

  // provide a way to stop the search.

  const auto& bridges = aBrowser->ManagedPBrowserBridgeParent();

  return std::all_of(bridges.cbegin(), bridges.cend(), [&](const auto& key) {

    auto* bridge = static_cast<dom::BrowserBridgeParent*>(key);

  for (auto iter = bridges.ConstIter(); !iter.Done(); iter.Next()) {

    auto bridge = static_cast<dom::BrowserBridgeParent*>(iter.Get()->GetKey());

    dom::BrowserParent* childBrowser = bridge->GetBrowserParent();

    DocAccessibleParent* childDocAcc = childBrowser->GetTopLevelDocAccessible();

    if (!childDocAcc || childDocAcc->IsShutdown()) {

      return true;

      continue;

    }

    if (!aCallback(childDocAcc)) {

      return false;  // Stop traversal.
@@ -1515,8 +1515,8 @@ static bool VisitDocAccessibleParentDescendantsAtTopLevelInContentProcess( 
            childBrowser, aCallback)) {

      return false;  // Stop traversal.

    }

  }

  return true;  // Continue traversal.

  });

}



already_AddRefed<IAccessible> AccessibleWrap::GetRemoteIAccessibleFor(

caps/DomainPolicy.cpp

+6 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ NS_IMETHODIMP 
DomainSet::Add(nsIURI* aDomain) {

  nsCOMPtr<nsIURI> clone = GetCanonicalClone(aDomain);

  NS_ENSURE_TRUE(clone, NS_ERROR_FAILURE);

  mHashTable.Insert(clone);

  mHashTable.PutEntry(clone);

  if (XRE_IsParentProcess()) {

    return BroadcastDomainSetChange(mType, ADD_DOMAIN, aDomain);

  }
@@ -159,7 +159,7 @@ NS_IMETHODIMP 
DomainSet::Remove(nsIURI* aDomain) {

  nsCOMPtr<nsIURI> clone = GetCanonicalClone(aDomain);

  NS_ENSURE_TRUE(clone, NS_ERROR_FAILURE);

  mHashTable.Remove(clone);

  mHashTable.RemoveEntry(clone);

  if (XRE_IsParentProcess()) {

    return BroadcastDomainSetChange(mType, REMOVE_DOMAIN, aDomain);

  }
@@ -215,7 +215,10 @@ DomainSet::ContainsSuperDomain(nsIURI* aDomain, bool* aContains) { 
}



void DomainSet::CloneSet(nsTArray<RefPtr<nsIURI>>* aDomains) {

  AppendToArray(*aDomains, mHashTable);

  for (auto iter = mHashTable.Iter(); !iter.Done(); iter.Next()) {

    nsIURI* key = iter.Get()->GetKey();

    aDomains->AppendElement(key);

  }

}



} /* namespace mozilla */

caps/DomainPolicy.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define DomainPolicy_h__



#include "nsIDomainPolicy.h"

#include "nsTHashSet.h"

#include "nsTHashtable.h"

#include "nsURIHashKey.h"



namespace mozilla {
@@ -40,7 +40,7 @@ class DomainSet final : public nsIDomainSet { 


 protected:

  virtual ~DomainSet() {}

  nsTHashSet<nsURIHashKey> mHashTable;

  nsTHashtable<nsURIHashKey> mHashTable;

  DomainSetType mType;

};

docshell/base/BaseHistory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ bool BaseHistory::CanStore(nsIURI* aURI) { 
}



void BaseHistory::ScheduleVisitedQuery(nsIURI* aURI) {

  mPendingQueries.Insert(aURI);

  mPendingQueries.PutEntry(aURI);

  if (mStartPendingVisitedQueriesScheduled) {

    return;

  }
@@ -67,7 +67,7 @@ void BaseHistory::ScheduleVisitedQuery(nsIURI* aURI) { 
}



void BaseHistory::CancelVisitedQueryIfPossible(nsIURI* aURI) {

  mPendingQueries.Remove(aURI);

  mPendingQueries.RemoveEntry(aURI);

  // TODO(bug 1591393): It could be worth to make this virtual and allow places

  // to stop the existing database query? Needs some measurement.

}

docshell/base/BaseHistory.h

+1 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#include "IHistory.h"

#include "mozilla/dom/ContentParent.h"

#include "nsTHashSet.h"



/* A base class for history implementations that implement link coloring. */
@@ -41,7 +40,7 @@ class BaseHistory : public IHistory { 
    }

  };



  using PendingVisitedQueries = nsTHashSet<nsURIHashKey>;

  using PendingVisitedQueries = nsTHashtable<nsURIHashKey>;

  using PendingVisitedResults = nsTArray<mozilla::dom::VisitedQueryResult>;



  // Starts all the queries in the pending queries list, potentially at the same