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

Timestamp:

Sep 4, 2016, 6:42:42 AM (9 years ago)

Author:

Antti Koivisto

Message:

Reverse ownership relation of StyleCachedImage and CSSImageValue
​https://bugs.webkit.org/show_bug.cgi?id=161447

Reviewed by Andreas Kling.

Currently StyleCachedImage (which represents an image in RenderStyle) has a weak ref to the
underlying CSSImageValue/CSSImageSetValue which actually owns it. This is awkwards especially since
StyleGeneratedImage, the other StyleImage subclass has reversed relationship where it refs
the underlying CSSImageGeneratorValue.

This patch makes StyleCachedImage similar to StyleGeneratedImage. StyleCachedImage now refs the
underlying CSSImageValue/CSSImageSetValue. CSSImageValues no longer need to know about StyleCachedImage.
Instead they reference CachedImages (memory cache objects) directly. StyleCachedImage instances are now
conceptually unique to RenderStyle instances. Actual resources are shared as before by sharing CachedImages.

• css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::loadImage):
(WebCore::CSSCursorImageValue::cachedImage):
(WebCore::CSSCursorImageValue::styleImage): Deleted.

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

(WebCore::CSSImageGeneratorValue::cachedImageForCSSValue):

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::~CSSImageSetValue):
(WebCore::CSSImageSetValue::loadBestFitImage):
(WebCore::CSSImageSetValue::traverseSubresources):
(WebCore::CSSImageSetValue::styleImage): Deleted.

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

(WebCore::CSSImageValue::CSSImageValue):
(WebCore::CSSImageValue::~CSSImageValue):
(WebCore::CSSImageValue::isPending):
(WebCore::CSSImageValue::loadImage):
(WebCore::CSSImageValue::traverseSubresources):
(WebCore::CSSImageValue::knownToBeOpaque):
(WebCore::CSSImageValue::styleImage): Deleted.

• css/CSSImageValue.h:
• css/StyleBuilderCustom.h:

(WebCore::StyleBuilderCustom::applyValueContent):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::styleImage):
(WebCore::StyleResolver::styleCachedImageFromValue):
(WebCore::StyleResolver::styleGeneratedImageFromValue):
(WebCore::StyleResolver::cachedOrPendingFromValue): Deleted.
(WebCore::StyleResolver::generatedOrPendingFromValue): Deleted.
(WebCore::StyleResolver::setOrPendingFromValue): Deleted.
(WebCore::StyleResolver::cursorOrPendingFromValue): Deleted.

• css/StyleResolver.h:
• editing/TextIterator.cpp:

(WebCore::fullyClipsContents):

• page/PageSerializer.cpp:

(WebCore::PageSerializer::retrieveResourcesForProperties):

• rendering/style/FillLayer.cpp:

(WebCore::FillLayer::imagesIdentical):

Compare data equality instead of pointer equality for StyleImages (since StyleImages are no longer shared).

(WebCore::layerImagesIdentical): Deleted.

• rendering/style/StyleCachedImage.cpp:

(WebCore::StyleCachedImage::StyleCachedImage):
(WebCore::StyleCachedImage::~StyleCachedImage):
(WebCore::StyleCachedImage::cachedImage):
(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):
(WebCore::StyleCachedImage::setCachedImage): Deleted.

• rendering/style/StyleCachedImage.h:

File:

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

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -36 +36 @@
 #include "Document.h"
 #include "Page.h"
-#include "StyleCachedImage.h"
 #include <wtf/text/StringBuilder.h>
 
@@ -43 +42 @@
 CSSImageSetValue::CSSImageSetValue()
     : CSSValueList(ImageSetClass, CommaSeparator)
-    , m_accessedBestFitImage(false)
-    , m_scaleFactor(1)
 {
 }
@@ -50 +47 @@
 CSSImageSetValue::~CSSImageSetValue()
 {
-    if (m_image)
-        m_image->detachFromCSSValue();
 }
 
@@ -80 +75 @@
 CSSImageSetValue::ImageWithScale CSSImageSetValue::bestImageForScaleFactor()
 {
+    if (!m_imagesInSet.size())
+        fillImageSet();
+
     ImageWithScale image;
     size_t numberOfImages = m_imagesInSet.size();
     for (size_t i = 0; i < numberOfImages; ++i) {
         image = m_imagesInSet.at(i);
-        if (image.scaleFactor >= m_scaleFactor)
+        if (image.scaleFactor >= m_deviceScaleFactor)
             return image;
     }
@@ -90 +88 @@
 }
 
-void CSSImageSetValue::loadBestFitImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
+std::pair<CachedImage*, float> CSSImageSetValue::loadBestFitImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
 {
     Document* document = loader.document();
-    if (Page* page = document->page())
-        m_scaleFactor = page->deviceScaleFactor();
-    else
-        m_scaleFactor = 1;
+    updateDeviceScaleFactor(*document);
+    
+    if (!m_accessedBestFitImage) {
+        m_accessedBestFitImage = true;
 
-    if (!m_imagesInSet.size())
-        fillImageSet();
-
-    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);
+        // 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);
+        }
+        m_cachedImage = loader.requestImage(request);
+        m_bestFitImageScaleFactor = image.scaleFactor;
     }
-    if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
-        styleImage(*document).setCachedImage(*cachedImage, image.scaleFactor);
-        m_accessedBestFitImage = true;
-    }
+    return { m_cachedImage.get(), m_bestFitImageScaleFactor };
 }
 
-StyleCachedImage& CSSImageSetValue::styleImage(const Document& document)
+void CSSImageSetValue::updateDeviceScaleFactor(const Document& document)
 {
-    if (!m_image)
-        m_image = StyleCachedImage::create(*this);
-    else if (!m_image->isPending()) {
-        float deviceScaleFactor = 1;
-        if (Page* page = document.page())
-            deviceScaleFactor = page->deviceScaleFactor();
-
-        // If the deviceScaleFactor has changed, we may not have the best image loaded, so we have to re-assess.
-        if (deviceScaleFactor != m_scaleFactor) {
-            m_accessedBestFitImage = false;
-            m_image->detachFromCSSValue();
-            m_image = StyleCachedImage::create(*this);
-        }
-    }
-
-    return *m_image;
+    float deviceScaleFactor = document.page() ? document.page()->deviceScaleFactor() : 1;
+    if (deviceScaleFactor == m_deviceScaleFactor)
+        return;
+    m_deviceScaleFactor = deviceScaleFactor;
+    m_accessedBestFitImage = false;
+    m_cachedImage = nullptr;
 }
 
@@ -171 +154 @@
 bool CSSImageSetValue::traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const
 {
-    if (!m_image)
+    if (!m_cachedImage)
         return false;
-    CachedImage* cachedResource = m_image->cachedImage();
-    if (!cachedResource)
-        return false;
-    return handler(*cachedResource);
+    return handler(*m_cachedImage);
 }
 
 CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom)
     : CSSValueList(cloneFrom)
-    , m_accessedBestFitImage(false)
-    , m_scaleFactor(1)
 {
     // Non-CSSValueList data is not accessible through CSS OM, no need to clone.