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

Timestamp:

Jan 21, 2020, 10:28:17 AM (5 years ago)

Author:

[email protected]

Message:

-webkit-image-set should support all the image functions WebKit supports, not just url()
​https://bugs.webkit.org/show_bug.cgi?id=81941

Patch by Noam Rosenthal <Noam Rosenthal> on 2020-01-21
Reviewed by Darin Adler.

Source/WebCore:

Separate StyleCachedImage to 4 classes:

• StyleCachedImage: for single images only
• StyleMultiImage: for values that can contain multiple images: like cursor/image-set
• StyleImageSet
• StyleCursorImage

The new classes only deal with their own value type. Before, ImageSet and cursor were resolved
as a StyleCachedImage, which is no longer a valid assumption if image-set can contain generated images.
Though cursors still can only contain cached images, it was cleaner to refactor it out as well.

Refactored best-fit image selection from loading. Now StyleCachedImage is in charge of loading
the actual image, and StyleImageSet/StyleCursorImage perform the source selection.

Also, added the necessary logic in the CSS parser to consume generated images inside image-sets, excluding
when the image-set is a cursor value.

Tests: fast/css/image-set-parsing-generated.html

fast/hidpi/image-set-cross-fade.html
fast/hidpi/image-set-gradient-multi.html
fast/hidpi/image-set-gradient-single.html
fast/hidpi/image-set-gradient.html

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:

Added new files

• css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::selectBestFitImage):
(WebCore::CSSCursorImageValue::loadImage): Deleted.

• css/CSSCursorImageValue.h:

Instead of cursor loading the image, it selects an image CSS value

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::CSSImageSetValue):
(WebCore::CSSImageSetValue::fillImageSet):
(WebCore::CSSImageSetValue::cachedImage const):
(WebCore::CSSImageSetValue::selectBestFitImage):
(WebCore::CSSImageSetValue::updateDeviceScaleFactor):
(WebCore::CSSImageSetValue::imageSetWithStylesResolved):
(WebCore::CSSImageSetValue::traverseSubresources const):
(WebCore::CSSImageSetValue::loadBestFitImage): Deleted.

• css/CSSImageSetValue.h:

Refactor CSSImageSetValue to include non-cachedImage images

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeCursor):

• css/parser/CSSPropertyParserHelpers.cpp:

(WebCore::CSSPropertyParserHelpers::consumeImageSet):
(WebCore::CSSPropertyParserHelpers::consumeImage):
(WebCore::CSSPropertyParserHelpers::consumeUrlOrStringAsStringView): Deleted.

• css/parser/CSSPropertyParserHelpers.h:

• page/animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

When blending two images, get the selected images in case it is an image-set

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintFillLayerExtended):

• rendering/RenderImageResourceStyleImage.cpp:

(WebCore::RenderImageResourceStyleImage::initialize):

• rendering/RenderLayerBacking.cpp:

(WebCore::canDirectlyCompositeBackgroundBackgroundImage):

• rendering/style/ShapeValue.cpp:

(WebCore::ShapeValue::isImageValid const):

Use hasCachedImage() instead of isCachedImage() as a StyleImageSet is no longer an isCachedImage()

• rendering/style/StyleCachedImage.cpp:

(WebCore::StyleCachedImage::StyleCachedImage):
(WebCore::StyleCachedImage::imageURL):
(WebCore::StyleCachedImage::load):

• rendering/style/StyleCachedImage.h:
• rendering/style/StyleCursorImage.h:
• rendering/style/StyleCursorImage.cpp:
• rendering/style/StyleMultiImage.h:
• rendering/style/StyleMultiImage.cpp:
• rendering/style/StyleImageSet.h:
• rendering/style/StyleImageSet.cpp:
• rendering/style/StyleImage.h:

(WebCore::StyleImage::selectedImage):
(WebCore::StyleImage::selectedImage const):
(WebCore::StyleImage::isCursorImage const):
(WebCore::StyleImage::isImageSet const):
(WebCore::StyleImage::hasCachedImage const):
(WebCore::StyleImage::StyleImage):

Separate cursor/image-set related stuff away from StyleCachedImage.

• style/StyleBuilderCustom.h:

(WebCore::Style::BuilderCustom::applyValueContent):

• style/StyleBuilderState.cpp:

(WebCore::Style::BuilderState::resolveImageStyles):
(WebCore::Style::BuilderState::createStyleImage):

• style/StyleBuilderState.h:

Match the CSS values with the correct Style class. Also, ensure image-sets resolve their
images' styles as they may contain gradients and other context-aware values.

LayoutTests:

• fast/css/cursor-parsing-expected.txt:
• fast/css/cursor-parsing.html:

Added parsing test to ensure arrow image-sets disable generated images

• fast/css/image-set-parsing-generated-expected.txt: Added.
• fast/css/image-set-parsing-generated.html: Added.
• fast/css/image-set-parsing-invalid-expected.txt:
• fast/css/image-set-parsing-invalid.html:

Added parsing tests for new generated-inside-image-set use cases
Test that image-set inside image-set is not supported

• fast/hidpi/image-set-cross-fade-expected.html: Added.
• fast/hidpi/image-set-cross-fade.html: Added.
• fast/hidpi/image-set-gradient-expected.html: Added.
• fast/hidpi/image-set-gradient-multi-expected.html: Added.
• fast/hidpi/image-set-gradient-multi.html: Added.
• fast/hidpi/image-set-gradient-single-expected.html: Added.
• fast/hidpi/image-set-gradient-single.html: Added.
• fast/hidpi/image-set-gradient.html: Added.

Added ref-tests for several generated-inside-image-set use-cases

File:

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

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -29 +29 @@
 #include "CSSImageValue.h"
 #include "CSSPrimitiveValue.h"
-#include "CachedImage.h"
-#include "CachedResourceLoader.h"
-#include "CachedResourceRequest.h"
-#include "CachedResourceRequestInitiators.h"
 #include "Document.h"
 #include "Page.h"
+#include "StyleBuilderState.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
 
-CSSImageSetValue::CSSImageSetValue(LoadedFromOpaqueSource loadedFromOpaqueSource)
+Ref<CSSImageSetValue> CSSImageSetValue::create()
+{
+    return adoptRef(*new CSSImageSetValue);
+}
+
+CSSImageSetValue::CSSImageSetValue()
     : CSSValueList(ImageSetClass, CommaSeparator)
-    , m_loadedFromOpaqueSource(loadedFromOpaqueSource)
 {
 }
@@ -53 +54 @@
     while (i < length) {
         CSSValue* imageValue = item(i);
-        URL imageURL = downcast<CSSImageValue>(*imageValue).url();
-
+        ASSERT(is<CSSImageValue>(imageValue) || is<CSSImageGeneratorValue>(imageValue));
         ++i;
         ASSERT_WITH_SECURITY_IMPLICATION(i < length);
@@ -61 +61 @@
 
         ImageWithScale image;
-        image.imageURL = imageURL;
+        image.value = imageValue;
         image.scaleFactor = scaleFactor;
         m_imagesInSet.append(image);
@@ -71 +71 @@
 }
 
-CSSImageSetValue::ImageWithScale CSSImageSetValue::bestImageForScaleFactor()
+ImageWithScale CSSImageSetValue::bestImageForScaleFactor()
 {
     if (!m_imagesInSet.size())
@@ -86 +86 @@
 }
 
-std::pair<CachedImage*, float> CSSImageSetValue::loadBestFitImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
+CachedImage* CSSImageSetValue::cachedImage() const
 {
-    Document* document = loader.document();
-    ASSERT(document);
+    if (is<CSSImageValue>(m_selectedImageValue))
+        return downcast<CSSImageValue>(*m_selectedImageValue).cachedImage();
+    return nullptr;
+}
 
-    updateDeviceScaleFactor(*document);
+ImageWithScale CSSImageSetValue::selectBestFitImage(const Document& document)
+{
+    updateDeviceScaleFactor(document);
 
     if (!m_accessedBestFitImage) {
         m_accessedBestFitImage = true;
+        m_bestFitImage = bestImageForScaleFactor();
+    }
 
-        // FIXME: In the future, we want to take much more than deviceScaleFactor into acount here.
-        // All forms of scale should be included: Page::pageScaleFactor(), Frame::pageZoomFactor(),
-        // and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
-        ImageWithScale image = bestImageForScaleFactor();
-
-        ResourceLoaderOptions loadOptions = options;
-        loadOptions.loadedFromOpaqueSource = m_loadedFromOpaqueSource;
-        CachedResourceRequest request(ResourceRequest(document->completeURL(image.imageURL)), loadOptions);
-        request.setInitiator(cachedResourceRequestInitiators().css);
-        if (options.mode == FetchOptions::Mode::Cors)
-            request.updateForAccessControl(*document);
-
-        m_cachedImage = loader.requestImage(WTFMove(request)).value_or(nullptr);
-        m_bestFitImageScaleFactor = image.scaleFactor;
-    }
-    return { m_cachedImage.get(), m_bestFitImageScaleFactor };
+    return m_bestFitImage;
 }
 
 void CSSImageSetValue::updateDeviceScaleFactor(const Document& document)
 {
+
+    // FIXME: In the future, we want to take much more than deviceScaleFactor into acount here.
+    // All forms of scale should be included: Page::pageScaleFactor(), Frame::pageZoomFactor(),
+    // and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
     float deviceScaleFactor = document.page() ? document.page()->deviceScaleFactor() : 1;
     if (deviceScaleFactor == m_deviceScaleFactor)
@@ -121 +116 @@
     m_deviceScaleFactor = deviceScaleFactor;
     m_accessedBestFitImage = false;
-    m_cachedImage = nullptr;
+    m_selectedImageValue = nullptr;
+}
+
+Ref<CSSImageSetValue> CSSImageSetValue::imageSetWithStylesResolved(Style::BuilderState& builderState)
+{
+    Ref<CSSImageSetValue> result = CSSImageSetValue::create();
+    size_t length = this->length();
+    for (size_t i = 0; i + 1 < length; i += 2) {
+        result->append(builderState.resolveImageStyles(*itemWithoutBoundsCheck(i)));
+        result->append(*itemWithoutBoundsCheck(i + 1));
+    }
+
+    return result;
 }
 
@@ -156 +163 @@
 bool CSSImageSetValue::traverseSubresources(const WTF::Function<bool (const CachedResource&)>& handler) const
 {
-    if (!m_cachedImage)
-        return false;
-    return handler(*m_cachedImage);
+    return m_selectedImageValue && m_selectedImageValue->traverseSubresources(handler);
 }