Changeset 44938 in webkit

Timestamp:

Jun 22, 2009 9:42:00 AM (15 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Simon Fraser.

• fix ​https://bugs.webkit.org/show_bug.cgi?id=23606 <rdar://problem/6537777> CSS gradient not repainted when image load completes

Test: fast/repaint/background-generated.html

• rendering/RenderObject.cpp: (WebCore::mustRepaintFillLayers): Return true if the layer does not specify a size and the image uses the container size.

LayoutTests:

Reviewed by Simon Fraser.

• test for ​https://bugs.webkit.org/show_bug.cgi?id=23606 <rdar://problem/6537777> CSS gradient not repainted when image load completes

• fast/repaint/background-generated.html: Added.
• platform/mac/fast/repaint/background-generated-expected.checksum: Added.
• platform/mac/fast/repaint/background-generated-expected.png: Added.
• platform/mac/fast/repaint/background-generated-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/background-generated.html (added)
• LayoutTests/platform/mac/fast/repaint/background-generated-expected.checksum (added)
• LayoutTests/platform/mac/fast/repaint/background-generated-expected.png (added)
• LayoutTests/platform/mac/fast/repaint/background-generated-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-06-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        - test for https://bugs.webkit.org/show_bug.cgi?id=23606
+          <rdar://problem/6537777> CSS gradient not repainted when image load
+          completes
+
+        * fast/repaint/background-generated.html: Added.
+        * platform/mac/fast/repaint/background-generated-expected.checksum: Added.
+        * platform/mac/fast/repaint/background-generated-expected.png: Added.
+        * platform/mac/fast/repaint/background-generated-expected.txt: Added.
+
 2009-06-22  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        - fix https://bugs.webkit.org/show_bug.cgi?id=23606
+          <rdar://problem/6537777> CSS gradient not repainted when image load
+          completes
+
+        Test: fast/repaint/background-generated.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::mustRepaintFillLayers): Return true if the layer does not
+        specify a size and the image uses the container size.
+
 2009-06-22  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -644 +644 @@
     // Make sure we have a valid image.
     StyleImage* img = layer->image();
-    bool shouldPaintBackgroundImage = img && img->canRender(renderer->style()->effectiveZoom());
-
-    // These are always percents or auto.
-    if (shouldPaintBackgroundImage &&
-        (!layer->xPosition().isZero() || !layer->yPosition().isZero() ||
-         layer->size().width().isPercent() || layer->size().height().isPercent()))
-        // The image will shift unpredictably if the size changes.
+    if (!img || !img->canRender(renderer->style()->effectiveZoom()))
+        return false;
+
+    if (!layer->xPosition().isZero() || !layer->yPosition().isZero())
+        return true;
+
+    if (layer->isSizeSet()) {
+        if (layer->size().width().isPercent() || layer->size().height().isPercent())
+            return true;
+    } else if (img->usesImageContainerSize())
         return true;