Changeset 161980 in webkit for trunk/Source/WebCore/css/CSSImageSetValue.cpp

Timestamp:

Jan 14, 2014, 10:16:42 AM (11 years ago)

Author:

[email protected]

Message:

[CSS Shapes] Shape images are now <image> types, not just URIs
​https://bugs.webkit.org/show_bug.cgi?id=125224

Reviewed by Andreas Kling.

Source/WebCore:

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

Tests: fast/shapes/shape-inside/shape-inside-image-set.html

fast/shapes/shape-outside-floats/shape-outside-image-set.html

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::cachedImageSet):

• css/CSSImageSetValue.h:
• css/CSSParser.cpp:

(WebCore::CSSParser::parseShapeProperty):

• css/DeprecatedStyleBuilder.cpp:

(WebCore::ApplyPropertyShape::applyValue):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::loadPendingImage):
(WebCore::StyleResolver::loadPendingShapeImage):

• css/StyleResolver.h:
• rendering/shapes/Shape.cpp:

(WebCore::Shape::createShape):

LayoutTests:

• fast/shapes/shape-inside/shape-inside-image-set-expected.html: Added.
• fast/shapes/shape-inside/shape-inside-image-set.html: Added.
• fast/shapes/shape-outside-floats/shape-outside-image-set-expected.html: Added.
• fast/shapes/shape-outside-floats/shape-outside-image-set.html: Added.

File:

• trunk/Source/WebCore/css/CSSImageSetValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -35 +35 @@
 #include "CachedResourceRequest.h"
 #include "CachedResourceRequestInitiators.h"
+#include "CrossOriginAccessControl.h"
 #include "Document.h"
 #include "Page.h"
@@ -101 +102 @@
 }
 
-StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader)
+StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader, const ResourceLoaderOptions& options)
 {
     ASSERT(loader);
@@ -119 +120 @@
         // and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
         ImageWithScale image = bestImageForScaleFactor();
-        CachedResourceRequest request(ResourceRequest(document->completeURL(image.imageURL)));
+        CachedResourceRequest request(ResourceRequest(document->completeURL(image.imageURL)), options);
         request.setInitiator(cachedResourceRequestInitiators().css);
+        if (options.requestOriginPolicy == PotentiallyCrossOriginEnabled)
+            updateRequestForAccessControl(request.mutableResourceRequest(), document->securityOrigin(), options.allowCredentials);
         if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
             detachPendingImage();
@@ -129 +132 @@
 
     return (m_imageSet && m_imageSet->isCachedImageSet()) ? static_cast<StyleCachedImageSet*>(m_imageSet.get()) : 0;
+}
+
+StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader)
+{
+    return cachedImageSet(loader, CachedResourceLoader::defaultCachedResourceOptions());
 }