Bug 125224 – [CSS Shapes] Shape images are now <image> types, not just URIs

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

[Hans Muller]

The Shapes specification now defines shape-inside and shape-outside image values as <image> types, instead of just URIs.  See:

http://dev.w3.org/csswg/css-shapes/#shapes-from-image
http://dev.w3.org/csswg/css-images-3/#image-types

[Hans Muller]

Created attachment 218532 [details]
Patch

Added support for image-set valued shapes. Added an optional ResourceLoaderOptions parameter to CSSImageSetValue::cachedImageSet() to enable CORS-enabled fetch of images. This change is based on a similar patch for ordinary shape image values: https://bugs.webkit.org/show_bug.cgi?id=123114.

[Andreas Kling]

I'm not really sure who's the best person to review this patch. CC'ing a couple of candidates.

[Hans Muller]

Created attachment 220566 [details]
Patch

Resync'd with trunk.

[Andreas Kling]

Comment on attachment 220566 [details]
Patch

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

r=me

> LayoutTests/fast/shapes/shape-outside-floats/shape-outside-image-set.html:7
> +        /* The shape-outisde image's width is smaller than the float's width (120 < 150) to make it

Typo, shape-outside.

> Source/WebCore/rendering/shapes/Shape.cpp:256
> -    ASSERT(styleImage && styleImage->isCachedImage() && styleImage->cachedImage() && styleImage->cachedImage()->image());
> +    ASSERT(styleImage && styleImage->cachedImage() && styleImage->cachedImage()->hasImage());

These should be broken into separate assertions so you can immediately tell what went wrong.
It'd also be nicer if 'styleImage' were a reference, since we don't support it being null.

[Hans Muller]

Created attachment 221171 [details]
Patch

Made the suggested changes.

[WebKit Commit Bot]

Comment on attachment 221171 [details]
Patch

Clearing flags on attachment: 221171

Committed r161980: <http://trac.webkit.org/changeset/161980>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.