1382593 - Cleanup a bit nsImageMap.

Status: RESOLVED FIXED

(Core :: Layout: Images, Video, and HTML Frames, defect)

Description

[Emilio Cobos Álvarez [:emilio]]

I did a this as I tried to get bug 135040 fixed, and I think it's worth landing.

Comment 1

[Emilio Cobos Álvarez [:emilio]]

Attachment: Bug 1382593: Clean a bit nsImageMap.

Review commit: https://reviewboard.mozilla.org/r/159200/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/159200/

Comment 2

[Emilio Cobos Álvarez [:emilio]]

Comment on attachment 8888249 [details]
Bug 1382593: Clean a bit nsImageMap.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/159200/diff/1-2/

Comment 3

[Cameron McCormack (:heycam)]

Comment on attachment 8888249 [details]
Bug 1382593: Clean a bit nsImageMap.

https://reviewboard.mozilla.org/r/159200/#review165078

::: layout/generic/nsImageMap.cpp:716
(Diff revision 2)
>  }
>  
>  void
>  nsImageMap::FreeAreas()
>  {
> -  uint32_t i, n = mAreas.Length();
> +  for (const auto* area : mAreas) {

Leave off the "const"?  I don't think it adds anything really.

::: layout/generic/nsImageMap.cpp
(Diff revision 2)
> -  if (!area)
> -    return NS_ERROR_OUT_OF_MEMORY;

Maybe upgrade the NS_NOTREACHED above to MOZ_ASSERT_UNREACHABLE?

::: layout/generic/nsImageMap.cpp:862
(Diff revision 2)
>  
>  nsIContent*
>  nsImageMap::GetArea(nscoord aX, nscoord aY) const
>  {
>    NS_ASSERTION(mMap, "Not initialized");
> -  uint32_t i, n = mAreas.Length();
> +  for (const auto* area : mAreas) {

Wouldn't bother with const here either.

Comment 4

[Emilio Cobos Álvarez [:emilio]]

Comment on attachment 8888249 [details]
Bug 1382593: Clean a bit nsImageMap.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/159200/diff/2-3/

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/5a67359d51b4
Clean a bit nsImageMap. r=heycam

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/5a67359d51b4