Changeset 157414 in webkit for trunk/Source/WebCore/rendering/RenderElement.cpp

Timestamp:

Oct 14, 2013, 12:35:32 PM (12 years ago)

Author:

[email protected]

Message:

[CSS Shapes] Image valued shape-outside shapes should update the layout after the image has been loaded
​https://bugs.webkit.org/show_bug.cgi?id=122340

Reviewed by Simon Fraser.

Source/WebCore:

Ensure that the an image-valued shape-outside layout is updated after the image has
been loaded.

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

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::imageChanged): Added code for the shape-outside case.
(WebCore::RenderBlock::updateShapeInsideInfoAfterStyleChange): Ditto.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::~RenderElement): Ditto.
(WebCore::RenderElement::setStyle): Ditto.

LayoutTests:

Verify that an image-valued shape-outside layout is updated after the image has been loaded.

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

File:

• trunk/Source/WebCore/rendering/RenderElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -105 +105 @@
 #if ENABLE(CSS_SHAPES)
         if (auto shapeValue = m_style->shapeInside()) {
+            if (auto shapeImage = shapeValue->image())
+                shapeImage->removeClient(this);
+        }
+        if (auto shapeValue = m_style->shapeOutside()) {
             if (auto shapeImage = shapeValue->image())
                 shapeImage->removeClient(this);
@@ -382 +386 @@
 #if ENABLE(CSS_SHAPES)
     updateShapeImage(oldStyle ? oldStyle->shapeInside() : 0, m_style ? m_style->shapeInside() : 0);
+    updateShapeImage(oldStyle ? oldStyle->shapeOutside() : 0, m_style ? m_style->shapeOutside() : 0);
 #endif