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

Timestamp:

Aug 30, 2016, 8:06:19 AM (9 years ago)

Author:

Antti Koivisto

Message:

Remove StylePendingImage
​https://bugs.webkit.org/show_bug.cgi?id=161245

Reviewed by Andreas Kling.

Instances of this confusing type are used as placeholders during style resolution.
We can get rid of it and make "pending" a state of StyleImage. This simplies the code and
will allow further improvements.

• WebCore.xcodeproj/project.pbxproj:
• css/CSSCrossfadeValue.cpp:

(WebCore::CSSCrossfadeValue::isPending):
(WebCore::CSSCrossfadeValue::blend):

• css/CSSCrossfadeValue.h:
• css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::CSSCursorImageValue):
(WebCore::CSSCursorImageValue::~CSSCursorImageValue):

Save the original URL since the underlying CSSImageValue may change.

(WebCore::CSSCursorImageValue::updateCursorElement):
(WebCore::CSSCursorImageValue::cursorElementRemoved):
(WebCore::CSSCursorImageValue::cursorElementChanged):
(WebCore::CSSCursorImageValue::loadImage):
(WebCore::CSSCursorImageValue::styleImage):
(WebCore::CSSCursorImageValue::isSVGCursor):
(WebCore::CSSCursorImageValue::cachedImageURL):
(WebCore::CSSCursorImageValue::updateCachedImage):
(WebCore::CSSCursorImageValue::detachPendingImage): Deleted.
(WebCore::CSSCursorImageValue::cachedImage): Deleted.
(WebCore::CSSCursorImageValue::cachedOrPendingImage): Deleted.
(WebCore::CSSCursorImageValue::clearCachedImage): Deleted.

• css/CSSCursorImageValue.h:
• css/CSSFilterImageValue.cpp:

(WebCore::CSSFilterImageValue::isPending):

• css/CSSFilterImageValue.h:
• css/CSSImageGeneratorValue.cpp:

(WebCore::CSSImageGeneratorValue::isPending):
(WebCore::CSSImageGeneratorValue::subimageIsPending):
(WebCore::CSSImageGeneratorValue::cachedImageForCSSValue):

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

(WebCore::CSSImageSetValue::~CSSImageSetValue):
(WebCore::CSSImageSetValue::loadBestFitImage):
(WebCore::CSSImageSetValue::styleImage):
(WebCore::CSSImageSetValue::traverseSubresources):
(WebCore::CSSImageSetValue::detachPendingImage): Deleted.
(WebCore::CSSImageSetValue::bestFitImage): Deleted.
(WebCore::CSSImageSetValue::cachedOrPendingImageSet): Deleted.

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

(WebCore::CSSImageValue::CSSImageValue):
(WebCore::CSSImageValue::~CSSImageValue):
(WebCore::CSSImageValue::isPending):
(WebCore::CSSImageValue::styleImage):
(WebCore::CSSImageValue::loadImage):
(WebCore::CSSImageValue::traverseSubresources):
(WebCore::CSSImageValue::detachPendingImage): Deleted.
(WebCore::CSSImageValue::cachedOrPendingImage): Deleted.
(WebCore::CSSImageValue::cachedImage): Deleted.

• css/CSSImageValue.h:

(WebCore::CSSImageValue::create):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::cachedOrPendingFromValue):
(WebCore::StyleResolver::generatedOrPendingFromValue):
(WebCore::StyleResolver::setOrPendingFromValue):
(WebCore::StyleResolver::cursorOrPendingFromValue):

• page/PageSerializer.cpp:

(WebCore::PageSerializer::retrieveResourcesForProperties):

• page/animation/CSSPropertyAnimation.cpp:

(WebCore::blendFilter):
(WebCore::crossfadeBlend):

• rendering/RenderImageResourceStyleImage.cpp:

(WebCore::RenderImageResourceStyleImage::image):

• rendering/shapes/ShapeOutsideInfo.cpp:

(WebCore::ShapeOutsideInfo::createShapeForImage):

• rendering/style/StyleCachedImage.cpp:

(WebCore::StyleCachedImage::StyleCachedImage):
(WebCore::StyleCachedImage::~StyleCachedImage):
(WebCore::StyleCachedImage::setCachedImage):
(WebCore::StyleCachedImage::cssValue):
(WebCore::StyleCachedImage::canRender):
(WebCore::StyleCachedImage::isPending):
(WebCore::StyleCachedImage::isLoaded):
(WebCore::StyleCachedImage::errorOccurred):
(WebCore::StyleCachedImage::imageSize):
(WebCore::StyleCachedImage::imageHasRelativeWidth):
(WebCore::StyleCachedImage::imageHasRelativeHeight):
(WebCore::StyleCachedImage::computeIntrinsicDimensions):
(WebCore::StyleCachedImage::usesImageContainerSize):
(WebCore::StyleCachedImage::setContainerSizeForRenderer):
(WebCore::StyleCachedImage::addClient):
(WebCore::StyleCachedImage::removeClient):
(WebCore::StyleCachedImage::image):
(WebCore::StyleCachedImage::knownToBeOpaque):

• rendering/style/StyleCachedImage.h:
• rendering/style/StyleGeneratedImage.cpp:

(WebCore::StyleGeneratedImage::isPending):

• rendering/style/StyleGeneratedImage.h:
• rendering/style/StyleImage.h:

(WebCore::StyleImage::isCachedImage):
(WebCore::StyleImage::StyleImage):
(WebCore::StyleImage::canRender): Deleted.
(WebCore::StyleImage::isPendingImage): Deleted.

• rendering/style/StylePendingImage.h: Removed.
• style/StylePendingResources.cpp:

(WebCore::Style::loadPendingImage):
(WebCore::Style::loadPendingImages):

File:

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

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -37 +37 @@
 #include "Page.h"
 #include "StyleCachedImage.h"
-#include "StylePendingImage.h"
 #include <wtf/text/StringBuilder.h>
 
@@ -49 +48 @@
 }
 
-inline void CSSImageSetValue::detachPendingImage()
-{
-    if (is<StylePendingImage>(m_image.get()))
-        downcast<StylePendingImage>(*m_image).detachFromCSSValue();
-}
-
 CSSImageSetValue::~CSSImageSetValue()
 {
-    detachPendingImage();
-
-    if (is<StyleCachedImage>(m_image.get()))
-        downcast<StyleCachedImage>(*m_image).detachFromCSSValue();
+    if (m_image)
+        m_image->detachFromCSSValue();
 }
 
@@ -99 +90 @@
 }
 
-StyleCachedImage* CSSImageSetValue::bestFitImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
+void CSSImageSetValue::loadBestFitImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
 {
     Document* document = loader.document();
@@ -110 +101 @@
         fillImageSet();
 
-    if (!m_accessedBestFitImage) {
-        // 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();
-        CachedResourceRequest request(ResourceRequest(document->completeURL(image.imageURL)), options);
-        request.setInitiator(cachedResourceRequestInitiators().css);
-        if (options.mode == FetchOptions::Mode::Cors) {
-            ASSERT(document->securityOrigin());
-            updateRequestForAccessControl(request.mutableResourceRequest(), *document->securityOrigin(), options.allowCredentials);
-        }
-        if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
-            detachPendingImage();
-            m_image = StyleCachedImage::createForImageSet(cachedImage.get(), image.scaleFactor, *this);
-            m_accessedBestFitImage = true;
-        }
+    if (m_accessedBestFitImage)
+        return;
+    // 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();
+    CachedResourceRequest request(ResourceRequest(document->completeURL(image.imageURL)), options);
+    request.setInitiator(cachedResourceRequestInitiators().css);
+    if (options.mode == FetchOptions::Mode::Cors) {
+        ASSERT(document->securityOrigin());
+        updateRequestForAccessControl(request.mutableResourceRequest(), *document->securityOrigin(), options.allowCredentials);
     }
-
-    return is<StyleCachedImage>(m_image.get()) ? downcast<StyleCachedImage>(m_image.get()) : nullptr;
+    if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
+        styleImage(*document).setCachedImage(*cachedImage, image.scaleFactor);
+        m_accessedBestFitImage = true;
+    }
 }
 
-StyleImage* CSSImageSetValue::cachedOrPendingImageSet(const Document& document)
+StyleCachedImage& CSSImageSetValue::styleImage(const Document& document)
 {
     if (!m_image)
-        m_image = StylePendingImage::create(this);
-    else if (!m_image->isPendingImage()) {
+        m_image = StyleCachedImage::create(*this);
+    else if (!m_image->isPending()) {
         float deviceScaleFactor = 1;
         if (Page* page = document.page())
@@ -143 +131 @@
         if (deviceScaleFactor != m_scaleFactor) {
             m_accessedBestFitImage = false;
-            m_image = StylePendingImage::create(this);
+            m_image->detachFromCSSValue();
+            m_image = StyleCachedImage::create(*this);
         }
     }
 
-    return m_image.get();
+    return *m_image;
 }
 
@@ -182 +171 @@
 bool CSSImageSetValue::traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const
 {
-    if (!is<StyleCachedImage>(m_image.get()))
+    if (!m_image)
         return false;
-    CachedImage* cachedResource = downcast<StyleCachedImage>(*m_image).cachedImage();
-    ASSERT(cachedResource);
+    CachedImage* cachedResource = m_image->cachedImage();
+    if (!cachedResource)
+        return false;
     return handler(*cachedResource);
 }