Changeset 148920 in webkit

Timestamp:

Apr 22, 2013 3:39:17 PM (11 years ago)

Author:

betravis@adobe.com

Message:

Do not reuse ExclusionShapeInsideInfo in a recursive region layout
​https://bugs.webkit.org/show_bug.cgi?id=114467

Reviewed by David Hyatt.

Source/WebCore:

Elements that respect shape-inside that have inline children should not reuse an
ExclusionShapeInsideInfo for their children's layout. This patch adds the test
for regions. See the details for non-region layout in bug 104582.
​https://bugs.webkit.org/show_bug.cgi?id=104582

Test: fast/regions/shape-inside/shape-inside-recursive-layout.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::layoutExclusionShapeInsideInfo): Do not look up a region's
ExclusionShapeInsideInfo if a block is already respecting shape-inside.

LayoutTests:

Test that for various types of inline containers do not reuse
ExclusionShapeInsideInfo when laying out their children.

• fast/regions/shape-inside/shape-inside-recursive-layout-expected.html: Added.
• fast/regions/shape-inside/shape-inside-recursive-layout.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout-expected.html (added)
• LayoutTests/fast/regions/shape-inside/shape-inside-recursive-layout.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-22  Bear Travis  <betravis@adobe.com>
+
+        Do not reuse ExclusionShapeInsideInfo in a recursive region layout
+        https://bugs.webkit.org/show_bug.cgi?id=114467
+
+        Reviewed by David Hyatt.
+
+        Test that for various types of inline containers do not reuse
+        ExclusionShapeInsideInfo when laying out their children.
+
+        * fast/regions/shape-inside/shape-inside-recursive-layout-expected.html: Added.
+        * fast/regions/shape-inside/shape-inside-recursive-layout.html: Added.
+
 2013-04-22  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-22  Bear Travis  <betravis@adobe.com>
+
+        Do not reuse ExclusionShapeInsideInfo in a recursive region layout
+        https://bugs.webkit.org/show_bug.cgi?id=114467
+
+        Reviewed by David Hyatt.
+
+        Elements that respect shape-inside that have inline children should not reuse an
+        ExclusionShapeInsideInfo for their children's layout. This patch adds the test
+        for regions. See the details for non-region layout in bug 104582.
+        https://bugs.webkit.org/show_bug.cgi?id=104582
+
+        Test: fast/regions/shape-inside/shape-inside-recursive-layout.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutExclusionShapeInsideInfo): Do not look up a region's
+        ExclusionShapeInsideInfo if a block is already respecting shape-inside.
+
 2013-04-22  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -85 +85 @@
         shapeInsideInfo = 0;
 
-    if (!shapeInsideInfo && flowThreadContainingBlock()) {
+    if (!shapeInsideInfo && flowThreadContainingBlock() && allowsExclusionShapeInsideInfoSharing()) {
         LayoutUnit offset = logicalHeight() + logicalHeightForLine(this, false);
         RenderRegion* region = regionAtBlockOffset(offset);