Changeset 165615 in webkit

Timestamp:

Mar 14, 2014 5:49:15 AM (10 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions] Inline-block child of content node incorrectly clipped
​https://bugs.webkit.org/show_bug.cgi?id=130229

Reviewed by Andrei Bucur.

Source/WebCore:

Constrain the target box rect to the region box rect only if we are able
to determine the region range for box. If we cannot do that, getRegionRangeForBox
returns null values for start and end region and we should not perform the clamping.

Test: fast/regions/inlineblock-child-inlineblock-contentnode-in-region.html

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::rectFlowPortionForBox):

LayoutTests:

• fast/regions/inlineblock-child-inlineblock-contentnode-in-region-expected.html: Added.
• fast/regions/inlineblock-child-inlineblock-contentnode-in-region.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/inlineblock-child-inlineblock-contentnode-in-region-expected.html (added)
• LayoutTests/fast/regions/inlineblock-child-inlineblock-contentnode-in-region.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-14  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Inline-block child of content node incorrectly clipped
+        https://bugs.webkit.org/show_bug.cgi?id=130229
+
+        Reviewed by Andrei Bucur.
+
+        * fast/regions/inlineblock-child-inlineblock-contentnode-in-region-expected.html: Added.
+        * fast/regions/inlineblock-child-inlineblock-contentnode-in-region.html: Added.
+
 2014-03-14  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-14  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Inline-block child of content node incorrectly clipped
+        https://bugs.webkit.org/show_bug.cgi?id=130229
+
+        Reviewed by Andrei Bucur.
+
+        Constrain the target box rect to the region box rect only if we are able
+        to determine the region range for box. If we cannot do that, getRegionRangeForBox
+        returns null values for start and end region and we should not perform the clamping.
+
+        Test: fast/regions/inlineblock-child-inlineblock-contentnode-in-region.html
+
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::rectFlowPortionForBox):
+
 2014-03-14  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -472 +472 @@
 LayoutRect RenderRegion::rectFlowPortionForBox(const RenderBox* box, const LayoutRect& rect) const
 {
+    LayoutRect mappedRect = m_flowThread->mapFromLocalToFlowThread(box, rect);
+
     RenderRegion* startRegion = 0;
     RenderRegion* endRegion = 0;
     m_flowThread->getRegionRangeForBox(box, startRegion, endRegion);
 
-    LayoutRect mappedRect = m_flowThread->mapFromLocalToFlowThread(box, rect);
-    if (flowThread()->isHorizontalWritingMode()) {
-        if (this != startRegion)
-            mappedRect.shiftYEdgeTo(std::max<LayoutUnit>(logicalTopForFlowThreadContent(), mappedRect.y()));
-
-        if (this != endRegion)
-            mappedRect.setHeight(std::max<LayoutUnit>(0, std::min<LayoutUnit>(logicalBottomForFlowThreadContent() - mappedRect.y(), mappedRect.height())));
-    } else {
-        if (this != startRegion)
-            mappedRect.shiftXEdgeTo(std::max<LayoutUnit>(logicalTopForFlowThreadContent(), mappedRect.x()));
-            
-        if (this != endRegion)
-            mappedRect.setWidth(std::max<LayoutUnit>(0, std::min<LayoutUnit>(logicalBottomForFlowThreadContent() - mappedRect.x(), mappedRect.width())));
+    if (startRegion && endRegion) {
+        if (flowThread()->isHorizontalWritingMode()) {
+            if (this != startRegion)
+                mappedRect.shiftYEdgeTo(std::max<LayoutUnit>(logicalTopForFlowThreadContent(), mappedRect.y()));
+            if (this != endRegion)
+                mappedRect.setHeight(std::max<LayoutUnit>(0, std::min<LayoutUnit>(logicalBottomForFlowThreadContent() - mappedRect.y(), mappedRect.height())));
+        } else {
+            if (this != startRegion)
+                mappedRect.shiftXEdgeTo(std::max<LayoutUnit>(logicalTopForFlowThreadContent(), mappedRect.x()));
+            if (this != endRegion)
+                mappedRect.setWidth(std::max<LayoutUnit>(0, std::min<LayoutUnit>(logicalBottomForFlowThreadContent() - mappedRect.x(), mappedRect.width())));
+        }
     }