698232 - [ImageMap] s/IsInside/GetArea to simplify the code

Status: RESOLVED FIXED

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

Description

[Olli Pettay [:smaug][[e-mail]]]

Attachment: patch

Comment 1

[Olli Pettay [:smaug][[e-mail]]]

https://tbpl.mozilla.org/?tree=Try&rev=2bdc56372afb

Comment 2

[Mats Palmgren (inactive)]

Comment on attachment 570506 [details] [diff] [review]
patch

In layout/generic/nsImageFrame.cpp:
> nsImageFrame::GetCursor(const nsPoint& aPoint,
> ...
>     nsCOMPtr<nsIContent> area;
>-    if (map->IsInside(p.x, p.y, getter_AddRefs(area))) {
>+    if ((area = map->GetArea(p.x, p.y))) {

I'd prefer:
      nsCOMPtr<nsIContent> area = map->GetArea(p.x, p.y);
      if (area) {


In layout/generic/nsImageMap.h:
>+   * See if the given aX,aY pixel coordinates are in the image
>+   * map. If they are then pointer to the relevant area element is returned.
>+   * If the coordinates are not in the map then nsnull
>    * is returned.

Let's try to improve this doc comment while we're here.  How about:

"Return the first area element (in content order) for the given aX,aY pixel
coordinate or nsnull if the coordinate is outside all areas."

Comment 3

[Olli Pettay [:smaug][[e-mail]]]

Attachment: patch

Comment 4

[Olli Pettay [:smaug][[e-mail]]]

https://hg.mozilla.org/mozilla-central/rev/100b46734dd2