1186796 - Replace nsBaseHashtable::EnumerateRead() calls in image/ with iterators

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Nicholas Nethercote [inactive]]

Because iterators are so much nicer than enumerate functions.

There are four 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

[Sotaro Ikeda [:sotaro]]

Attachment: patch - Replace nsBaseHashtable::EnumerateRead() calls in image/ with iterators

Comment 2

[Sotaro Ikeda [:sotaro]]

Attachment: patch - Replace nsBaseHashtable::EnumerateRead() calls in image/ with iterators

Remove unnecessary functions.

Comment 3

[Nicholas Nethercote [inactive]]

Comment on attachment 8685326 [details] [diff] [review]
patch - Replace nsBaseHashtable::EnumerateRead() calls in image/ with iterators

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

r=me with the following comments addressed.

::: image/SurfaceCache.cpp
@@ -285,5 @@
>      }
>  
>      // There's no perfect match, so find the best match we can.
>      MatchContext matchContext(aSurfaceKey);
> -    ForEach(TryToImproveMatch, &matchContext);

You can remove MatchContext too, now -- just use local variables for its fields.

@@ +714,5 @@
> +    for (auto iter = cache->ConstIter(); !iter.Done(); iter.Next()) {
> +      CachedSurface* surface = iter.UserData();
> +      if (surface->IsPlaceholder() || !surface->IsLocked()) {
> +        continue;
> +      }

This loop is large enough that duplicating it is a shame. I'd prefer it if you factored it out into its own function, e.g. UnlockSurfaces().

@@ +757,5 @@
>      // small, performance should be good, but if usage patterns change we should
>      // change the data structure used for mCosts.
> +    for (auto iter = cache->ConstIter(); !iter.Done(); iter.Next()) {
> +      CachedSurface* surface = iter.UserData();
> +      StopTracking(surface);

I would avoid the local variable and just do this: |StopTracking(iter.UserData());|

@@ +865,5 @@
>      CachedSurface::SurfaceMemoryReport report(aCounters, aMallocSizeOf);
> +    for (auto iter = cache->ConstIter(); !iter.Done(); iter.Next()) {
> +      CachedSurface* surface = iter.UserData();
> +      report.Add(surface);
> +    }

Same thing here: avoid the the local variable.

::: image/imgLoader.cpp
@@ +80,5 @@
> +        imgCacheEntry* entry = iter.UserData();
> +        RefPtr<imgRequest> req = entry->GetRequest();
> +        RecordCounterForRequest(req,
> +                                &chrome,
> +                                !entry->HasNoProxies());

Put this function call on a single line.

@@ +83,5 @@
> +                                &chrome,
> +                                !entry->HasNoProxies());
> +      }
> +      for (auto iter = mKnownLoaders[i]->mCache.Iter(); !iter.Done(); iter.Next()) {
> +       imgCacheEntry* entry = iter.UserData();

Indent this line one more char.

@@ +87,5 @@
> +       imgCacheEntry* entry = iter.UserData();
> +        RefPtr<imgRequest> req = entry->GetRequest();
> +        RecordCounterForRequest(req,
> +                                &content,
> +                                !entry->HasNoProxies());

Put this function call on a single line.

Comment 4

[Sotaro Ikeda [:sotaro]]

Attachment: patch - Replace nsBaseHashtable::EnumerateRead() calls in image/ with iterators

Apply the comments. Carry "r=njn".

Comment 5

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/411f18fdffeb

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/411f18fdffeb