Changeset 167150 in webkit

Timestamp:

Apr 11, 2014 2:27:10 PM (10 years ago)

Author:

hmuller@adobe.com

Message:

[CSS Shapes] shape-outside from image doesn't load properly
​https://bugs.webkit.org/show_bug.cgi?id=131491

Reviewed by Bem Jones-Bey.

Source/WebCore:

Make RenderImage::imageChanged() call super if there's a shape-outside
image because the shape-outside imageChanged() logic is in RenderBox.

Test: http/tests/css/shape-image-file.html

• rendering/RenderElement.h:

(WebCore::RenderElement::hasShapeOutside):

• rendering/RenderImage.cpp:

(WebCore::RenderImage::imageChanged):

LayoutTests:

• http/tests/css/shape-image-file-expected.html: Added.
• http/tests/css/shape-image-file.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/css/shape-image-file-expected.html (added)
• LayoutTests/http/tests/css/shape-image-file.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderElement.h (modified) (1 diff)
• Source/WebCore/rendering/RenderImage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-11  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] shape-outside from image doesn't load properly
+        https://bugs.webkit.org/show_bug.cgi?id=131491
+
+        Reviewed by Bem Jones-Bey.
+
+        * http/tests/css/shape-image-file-expected.html: Added.
+        * http/tests/css/shape-image-file.html: Added.
+
 2014-04-11  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-11  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Shapes] shape-outside from image doesn't load properly
+        https://bugs.webkit.org/show_bug.cgi?id=131491
+
+        Reviewed by Bem Jones-Bey.
+
+        Make RenderImage::imageChanged() call super if there's a shape-outside
+        image because the shape-outside imageChanged() logic is in RenderBox.
+
+        Test: http/tests/css/shape-image-file.html
+
+        * rendering/RenderElement.h:
+        (WebCore::RenderElement::hasShapeOutside):
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::imageChanged):
+
 2014-04-11  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.h

@@ -144 +144 @@
 #endif
 
+#if ENABLE(CSS_SHAPES)
+    bool hasShapeOutside() const { return style().shapeOutside(); }
+#else
+    bool hasShapeOutside() const { return false; }
+#endif
+
     bool repaintForPausedImageAnimationsIfNeeded(const IntRect& visibleRect);
     bool hasPausedImageAnimations() const { return m_hasPausedImageAnimations; }

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -237 +237 @@
         return;
 
-    if (hasBoxDecorations() || hasMask())
+    if (hasBoxDecorations() || hasMask() || hasShapeOutside())
         RenderReplaced::imageChanged(newImage, rect);