1186793 - Replace nsBaseHashtable::EnumerateRead() calls in gfx/ with iterators

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Nicholas Nethercote [inactive]]

Because iterators are so much nicer than enumerate functions.

There are seven 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 gfx/ with iterators

Comment 2

[Nicholas Nethercote [inactive]]

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

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

Thank you for doing this conversion. r=me with the minor comments below addressed.

::: gfx/ipc/GfxMessageUtils.h
@@ +918,5 @@
>  struct MessageAndAttributeMap
>  {
>    Message* msg;
>    const mozilla::gfx::AttributeMap& map;
>  };

Can you remove this type now?

@@ +955,5 @@
> +        HANDLE_TYPE(Matrix5x4)
> +        HANDLE_TYPE(Point3D)
> +        HANDLE_TYPE(Color)
> +        HANDLE_TYPE(AttributeMap)
> +        HANDLE_TYPE(Floats)

Nit: don't change the indentation here; the old indentation was correct.

It might also be worth renaming the macro from HANDLE_TYPE to CASE_TYPE, to make it a little clearer that it's part of the switch.

::: gfx/src/FilterSupport.cpp
@@ +2080,5 @@
> +    const uint32_t& attributeName = iter.Key();
> +    Attribute* attribute = iter.UserData();
> +    Attribute* matchingAttribute = mMap.Get(attributeName);
> +    if (!matchingAttribute ||
> +        *matchingAttribute != *attribute) {

Nit: no need for a line break in the middle of this expression.

@@ +2082,5 @@
> +    Attribute* matchingAttribute = mMap.Get(attributeName);
> +    if (!matchingAttribute ||
> +        *matchingAttribute != *attribute) {
> +      matches = false;
> +      break;

Just |return false;| here and |return true;| after the loop, and then you can remove |matches|.

Comment 3

[Sotaro Ikeda [:sotaro]]

Thanks for the review. I am going update them in a next patch.

Comment 4

[Sotaro Ikeda [:sotaro]]

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

Apply comments.

Comment 5

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c37d9abf2af6

Comment 6

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

https://hg.mozilla.org/mozilla-central/rev/c37d9abf2af6