1186805 - Replace nsBaseHashtable::EnumerateRead() calls in dom/datastore/ with iterators

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Nicholas Nethercote [inactive]]

Because iterators are so much nicer than enumerate functions.

There are five occurrences of EnumerateRead() in this directory.

A note to the assignee: to preserve existing behaviour, you should probably use
nsBaseHashtable::Iterator::UserData() rather than nsBaseHashtable::Iterator::Data(). (The latter should be used when replacing nsBaseHashtable::Enumerate()).

Comment 1

[Andrea Marchesini [:baku]]

Attachment: ds.patch

Comment 2

[Nicholas Nethercote [inactive]]

Comment on attachment 8667321 [details] [diff] [review]
ds.patch

Review of attachment 8667321 [details] [diff] [review]:
-----------------------------------------------------------------

Such an improvement. Thank you. r=me with the nits below addressed.

::: dom/datastore/DataStoreService.cpp
@@ -331,5 @@
> -
> -  auto* data = static_cast<GetDataStoreInfosData*>(aUserData);
> -  if (aAppId == data->mAppId) {
> -    return PL_DHASH_NEXT;
> -  }

This if-block didn't survive the transition. Is that intended? I can't see why you would remove it.

@@ +1023,5 @@
> +      continue;
> +    }
> +
> +    if (!aOwner.IsEmpty() &&
> +        !aOwner.Equals(iter.UserData()->mManifestURL)) {

There are five occurrences of iter.UserData() in this function. Please create a local variable for it.

@@ +1229,5 @@
> +  for (auto iter = apps->ConstIter(); !iter.Done(); iter.Next()) {
> +    bool readOnly = aReadOnly || iter.UserData()->mReadOnly;
> +
> +    rv = ResetPermission(iter.Key(), iter.UserData()->mOriginURL,
> +                         iter.UserData()->mManifestURL,

Again, please factor out the repeated iter.UserData() calls.

Comment 3

[Andrea Marchesini [:baku]]

Attachment: ds.patch

Comment 4

[Andrea Marchesini [:baku]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4468b86a6203

Comment 5

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/4468b86a6203