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

Timestamp:

Apr 6, 2012, 1:20:19 PM (13 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=81939
-webkit-image-set should update dynamically when the device scale factor
changes
-and corresponding-
<rdar://problem/11101108>

Reviewed by Darin Adler.

Source/WebCore:

New member variable to keep track of the scale factor.

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::CSSImageSetValue):
(WebCore::CSSImageSetValue::bestImageForScaleFactor):

Merge the two cachedImageSet functions. There was no need for two functions here.

(WebCore::CSSImageSetValue::cachedImageSet):

cachedOrPendingImageSet() now takes a Document as a parameter so that it can
access the deviceScaleFactor. If there is a cached image already and the
Document's deviceScaleFactor doesn't match m_scaleFactor, then m_imageSet is set
to a pending image so that the best fit image will be reassessed and then
loaded.
(WebCore::CSSImageSetValue::cachedOrPendingImageSet):

• css/CSSImageSetValue.h:

(WebCore):
(CSSImageSetValue):

cachedOrPendingImageSet() now takes a Document.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::collectMatchingRulesForList):

StyleCachedImageSet should inherit from CachedImageClient just like
StyleCachedImage. It should add and remove itself as a client upon creation
and destruction, respectively.

• rendering/style/StyleCachedImageSet.cpp:

(WebCore::StyleCachedImageSet::StyleCachedImageSet):
(WebCore):
(WebCore::StyleCachedImageSet::~StyleCachedImageSet):

• rendering/style/StyleCachedImageSet.h:

(StyleCachedImageSet):

LayoutTests:

• fast/hidpi/image-set-background-dynamic.html: Added.
• fast/hidpi/image-set-border-image-dynamic.html: Added.
• fast/hidpi/image-set-in-content-dynamic.html: Added.
• platform/mac/fast/hidpi/image-set-background-dynamic-expected.png: Added.
• platform/mac/fast/hidpi/image-set-background-dynamic-expected.txt: Added.
• platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.png: Added.
• platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt: Added.
• platform/mac/fast/hidpi/image-set-in-content-dynamic-expected.png: Added.
• platform/mac/fast/hidpi/image-set-in-content-dynamic-expected.txt: Added.

File:

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

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -42 +42 @@
     : CSSValueList(ImageSetClass, CommaSeparator)
     , m_accessedBestFitImage(false)
+    , m_scaleFactor(1)
 {
 }
@@ -75 +76 @@
 }
 
-CSSImageSetValue::ImageWithScale CSSImageSetValue::bestImageForScaleFactor(float scaleFactor)
+CSSImageSetValue::ImageWithScale CSSImageSetValue::bestImageForScaleFactor()
 {
     ImageWithScale image;
@@ -81 +82 @@
     for (size_t i = 0; i < numberOfImages; ++i) {
         image = m_imagesInSet.at(i);
-        if (image.scaleFactor >= scaleFactor)
+        if (image.scaleFactor >= m_scaleFactor)
             return image;
     }
@@ -89 +90 @@
 StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader)
 {
+    ASSERT(loader);
+
     Document* document = loader->document();
-    float deviceScaleFactor = 1;
     if (Page* page = document->page())
-        deviceScaleFactor = page->deviceScaleFactor();
+        m_scaleFactor = page->deviceScaleFactor();
+    else
+        m_scaleFactor = 1;
 
     if (!m_imagesInSet.size())
         fillImageSet();
 
-    // 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
-    return cachedImageSet(loader, bestImageForScaleFactor(deviceScaleFactor));
-}
-
-StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader, ImageWithScale image)
-{
-    ASSERT(loader);
-
     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();
         ResourceRequest request(loader->document()->completeURL(image.imageURL));
         if (CachedImage* cachedImage = loader->requestImage(request)) {
@@ -118 +116 @@
 }
 
-StyleImage* CSSImageSetValue::cachedOrPendingImageSet()
+StyleImage* CSSImageSetValue::cachedOrPendingImageSet(Document* document)
 {
     if (!m_imageSet)
         m_imageSet = StylePendingImage::create(this);
+    else if (document && !m_imageSet->isPendingImage()) {
+        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_imageSet = StylePendingImage::create(this);
+        }
+    }
 
     return m_imageSet.get();