Bug 156659 – CSSCursorImageValue shouldn't mutate element during style resolution

• Status: RESOLVED
• Resolution: FIXED
• Component: CSS

[Antti Koivisto]

CSSCursorImageValue::updateIfSVGCursorIsUsed may mutate the argument element.

[Antti Koivisto]

Created attachment 276553 [details]
patch

[Antti Koivisto]

Created attachment 276558 [details]
patch

[Darin Adler]

Comment on attachment 276558 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=276558&action=review

I would probably refer to these as "cursor elements" rather than "SVG cursor elements" even more consistently in the code. Names like m_cursorElements and updateCursorElement would be nicer than m_svgCursorElements and updateSVGCursorElement. Type would still make it clear it’s specific to SVG.

> Source/WebCore/css/CSSCursorImageValue.cpp:91
> +    auto* svgCursorElement = downcast<SVGCursorElement>(element);

I would use a reference:

    auto& svgCursorElement = downcast<SVGCursorElement>(*element);

> Source/WebCore/css/CSSCursorImageValue.cpp:110
> +    SVGLengthContext lengthContext(0);

Should be nullptr rather than 0.

> Source/WebCore/css/CSSCursorImageValue.cpp:112
> +    float x = roundf(cursorElement.x().value(lengthContext));

I suggest using std::round instead of roundf. Also not sure if rounding is correct. Also wondering if we should clamp to the size of the image.

> Source/WebCore/css/CSSCursorImageValue.cpp:115
> +    float y = roundf(cursorElement.y().value(lengthContext));

Ditto.

> Source/WebCore/css/CSSCursorImageValue.h:-78
> +    HashSet<SVGCursorElement*> m_svgCursorElements;
>  
> -    HashSet<SVGElement*> m_referencedElements;

There’s a stray blank line here. I suggest removing it.

[Antti Koivisto]

http://trac.webkit.org