Commit b9621d63 authored by Simon Giesecke's avatar Simon Giesecke
Browse files

Bug 1695162 - Use range-based for instead of custom hashtable iterators. r=xpcom-reviewers,kmag

parent 07e9a5b0
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -234,10 +234,10 @@ void nsChromeRegistryChrome::SendRegisteredChrome(
  nsTArray<SubstitutionMapping> resources;
  nsTArray<OverrideMapping> overrides;

  for (auto iter = mPackagesHash.Iter(); !iter.Done(); iter.Next()) {
  for (const auto& entry : mPackagesHash) {
    ChromePackage chromePackage;
    ChromePackageFromPackageEntry(iter.Key(), iter.UserData(), &chromePackage,
                                  SKIN);
    ChromePackageFromPackageEntry(entry.GetKey(), entry.GetWeak(),
                                  &chromePackage, SKIN);
    packages.AppendElement(chromePackage);
  }

@@ -258,14 +258,14 @@ void nsChromeRegistryChrome::SendRegisteredChrome(
    NS_ENSURE_SUCCESS_VOID(rv);
  }

  for (auto iter = mOverrideTable.Iter(); !iter.Done(); iter.Next()) {
  for (const auto& entry : mOverrideTable) {
    SerializedURI chromeURI, overrideURI;

    SerializeURI(iter.Key(), chromeURI);
    SerializeURI(iter.UserData(), overrideURI);
    SerializeURI(entry.GetKey(), chromeURI);
    SerializeURI(entry.GetWeak(), overrideURI);

    OverrideMapping override = {chromeURI, overrideURI};
    overrides.AppendElement(override);
    overrides.AppendElement(
        OverrideMapping{std::move(chromeURI), std::move(overrideURI)});
  }

  nsAutoCString appLocale;
+2 −2
Original line number Diff line number Diff line
@@ -395,8 +395,8 @@ BrowsingContextGroup* BrowsingContextGroup::GetChromeGroup() {

void BrowsingContextGroup::GetDocGroups(nsTArray<DocGroup*>& aDocGroups) {
  MOZ_ASSERT(NS_IsMainThread());
  for (auto iter = mDocGroups.ConstIter(); !iter.Done(); iter.Next()) {
    aDocGroups.AppendElement(iter.Data());
  for (const auto& entry : mDocGroups) {
    aDocGroups.AppendElement(entry.GetData());
  }
}

+0 −2
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ class BrowsingContextGroup final : public nsWrapperCache {
  // Called by Document when a Document needs to be removed to a DocGroup.
  void RemoveDocument(const nsACString& aKey, Document* aDocument);

  auto DocGroups() const { return mDocGroups.ConstIter(); }

  mozilla::ThrottledEventQueue* GetTimerEventQueue() const {
    return mTimerEventQueue;
  }
+4 −4
Original line number Diff line number Diff line
@@ -412,8 +412,8 @@ RefPtr<ClientOpPromise> ClientManagerService::MatchAll(

  RefPtr<PromiseListHolder> promiseList = new PromiseListHolder();

  for (auto iter = mSourceTable.Iter(); !iter.Done(); iter.Next()) {
    ClientSourceParent* source = iter.UserData();
  for (const auto& entry : mSourceTable) {
    ClientSourceParent* source = entry.GetWeak();
    MOZ_DIAGNOSTIC_ASSERT(source);

    if (source->IsFrozen() || !source->ExecutionReady()) {
@@ -508,8 +508,8 @@ RefPtr<ClientOpPromise> ClientManagerService::Claim(

  RefPtr<PromiseListHolder> promiseList = new PromiseListHolder();

  for (auto iter = mSourceTable.Iter(); !iter.Done(); iter.Next()) {
    ClientSourceParent* source = iter.UserData();
  for (const auto& entry : mSourceTable) {
    ClientSourceParent* source = entry.GetWeak();
    MOZ_DIAGNOSTIC_ASSERT(source);

    if (source->IsFrozen()) {
+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsCommandManager)
  NS_IMPL_CYCLE_COLLECTION_UNLINK_WEAK_REFERENCE
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsCommandManager)
  for (auto iter = tmp->mObserversTable.Iter(); !iter.Done(); iter.Next()) {
    nsCommandManager::ObserverList* observers = iter.UserData();
  for (const auto& entry : tmp->mObserversTable) {
    nsCommandManager::ObserverList* observers = entry.GetWeak();
    int32_t numItems = observers->Length();
    for (int32_t i = 0; i < numItems; ++i) {
      cb.NoteXPCOMChild(observers->ElementAt(i));
Loading