Commit 613e20d1 authored by Simon Giesecke's avatar Simon Giesecke
Browse files

Bug 1184468 - Use nsBaseHashtable::Values. r=xpcom-reviewers,nika 

Differential Revision: https://phabricator.services.mozilla.com/D108587
parent 0954ebd2

accessible/base/DocManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ DocAccessible* DocManager::GetDocAccessible(const PresShell* aPresShell) { 
}



LocalAccessible* DocManager::FindAccessibleInCache(nsINode* aNode) const {

  for (const auto& entry : mDocAccessibleCache) {

    DocAccessible* docAccessible = entry.GetData().get();

  for (const auto& docAccessible : mDocAccessibleCache.Values()) {

    NS_ASSERTION(docAccessible,

                 "No doc accessible for the object in doc accessible cache!");

accessible/generic/ApplicationAccessible.cpp

+1 −2
Original line number Diff line number Diff line
@@ -123,8 +123,7 @@ void ApplicationAccessible::Init() { 
    return;

  }



  for (const auto& entry : *windowsById) {

    nsGlobalWindowOuter* window = entry.GetData();

  for (const auto& window : windowsById->Values()) {

    if (window->GetDocShell() && window->IsRootOuterWindow()) {

      if (RefPtr<dom::Document> docNode = window->GetExtantDoc()) {

        GetAccService()->GetDocAccessible(docNode);  // ensure creation

accessible/generic/DocAccessible.cpp

+3 −5
Original line number Diff line number Diff line
@@ -115,9 +115,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(DocAccessible, 
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNotificationController)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVirtualCursor)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChildDocuments)

  for (const auto& hashEntry : tmp->mDependentIDsHashes) {

    for (const auto& providerEntry : *hashEntry.GetData()) {

      AttrRelProviders* providers = providerEntry.GetData().get();

  for (const auto& hashEntry : tmp->mDependentIDsHashes.Values()) {

    for (const auto& providers : hashEntry->Values()) {

      for (int32_t provIdx = providers->Length() - 1; provIdx >= 0; provIdx--) {

        NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(

            cb, "content of dependent ids hash entry of document accessible");
@@ -130,8 +129,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(DocAccessible, 
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAccessibleCache)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAnchorJumpElm)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInvalidationList)

  for (const auto& arEntry : tmp->mARIAOwnsHash) {

    nsTArray<RefPtr<LocalAccessible>>* ar = arEntry.GetData().get();

  for (const auto& ar : tmp->mARIAOwnsHash.Values()) {

    for (uint32_t i = 0; i < ar->Length(); i++) {

      NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mARIAOwnsHash entry item");

      cb.NoteXPCOMChild(ar->ElementAt(i));

docshell/base/BrowsingContext.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1333,8 +1333,8 @@ void BrowsingContext::DiscardFromContentParent(ContentParent* aCP) { 


  if (sBrowsingContexts) {

    AutoTArray<RefPtr<BrowsingContext>, 8> toDiscard;

    for (const auto& entry : *sBrowsingContexts) {

      auto* bc = entry.GetData()->Canonical();

    for (const auto& data : sBrowsingContexts->Values()) {

      auto* bc = data->Canonical();

      if (!bc->IsDiscarded() && bc->IsEmbeddedInProcess(aCP->ChildID())) {

        toDiscard.AppendElement(bc);

      }
@@ -2693,8 +2693,8 @@ bool BrowsingContext::LegacyCheckOnlyOwningProcessCanSet( 
  return true;

}



auto BrowsingContext::LegacyRevertIfNotOwningOrParentProcess(ContentParent* aSource)

    -> CanSetResult {

auto BrowsingContext::LegacyRevertIfNotOwningOrParentProcess(

    ContentParent* aSource) -> CanSetResult {

  if (aSource) {

    MOZ_ASSERT(XRE_IsParentProcess());

docshell/base/BrowsingContextGroup.cpp

+4 −9
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ void BrowsingContextGroup::Destroy() { 
  // Make sure to call `RemoveBrowsingContextGroup` for every entry in both

  // `mHosts` and `mSubscribers`. This will visit most entries twice, but

  // `RemoveBrowsingContextGroup` is safe to call multiple times.

  for (auto& entry : mHosts) {

    entry.GetData()->RemoveBrowsingContextGroup(this);

  for (auto& entry : mHosts.Values()) {

    entry->RemoveBrowsingContextGroup(this);

  }

  for (auto& entry : mSubscribers) {

    entry.GetKey()->RemoveBrowsingContextGroup(this);
@@ -395,9 +395,7 @@ BrowsingContextGroup* BrowsingContextGroup::GetChromeGroup() { 


void BrowsingContextGroup::GetDocGroups(nsTArray<DocGroup*>& aDocGroups) {

  MOZ_ASSERT(NS_IsMainThread());

  for (const auto& entry : mDocGroups) {

    aDocGroups.AppendElement(entry.GetData());

  }

  AppendToArray(aDocGroups, mDocGroups.Values());

}



already_AddRefed<DocGroup> BrowsingContextGroup::AddDocument(
@@ -443,10 +441,7 @@ void BrowsingContextGroup::GetAllGroups( 
    return;

  }



  aGroups.SetCapacity(sBrowsingContextGroups->Count());

  for (auto& group : *sBrowsingContextGroups) {

    aGroups.AppendElement(group.GetData());

  }

  aGroups = ToArray(sBrowsingContextGroups->Values());

}



NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(BrowsingContextGroup, mContexts,