Changeset 165720 in webkit

Timestamp:

Mar 16, 2014 11:35:27 PM (10 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions]Do not compute region range for a box unless the parent has one
​https://bugs.webkit.org/show_bug.cgi?id=130249

Reviewed by Andrei Bucur.

Source/WebCore:

If the containing block does not have a region range computed, do not attempt to compute
a region range for a child. In such cases, the range computation for a child can lead to
a result that is wrong, possibly leading to an incorrect clipping.

Test: fast/regions/inline-block-flowed-in-regions.html

• rendering/RenderBlock.cpp:

(WebCore::canComputeRegionRangeForBox):
(WebCore::RenderBlock::computeRegionRangeForBoxChild):
(WebCore::RenderBlock::estimateRegionRangeForBoxChild):
(WebCore::RenderBlock::updateRegionRangeForBoxChild):

• rendering/RenderFlowThread.h:

LayoutTests:

• fast/regions/inline-block-flowed-in-regions-expected.html: Added.
• fast/regions/inline-block-flowed-in-regions.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/inline-block-flowed-in-regions-expected.html (added)
• LayoutTests/fast/regions/inline-block-flowed-in-regions.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-16  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Do not compute region range for a box unless the parent has one
+        https://bugs.webkit.org/show_bug.cgi?id=130249
+
+        Reviewed by Andrei Bucur.
+
+        * fast/regions/inline-block-flowed-in-regions-expected.html: Added.
+        * fast/regions/inline-block-flowed-in-regions.html: Added.
+
 2014-03-16  Frédéric Wang  <fred.wang@free.fr>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-16  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Do not compute region range for a box unless the parent has one
+        https://bugs.webkit.org/show_bug.cgi?id=130249
+
+        Reviewed by Andrei Bucur.
+
+        If the containing block does not have a region range computed, do not attempt to compute
+        a region range for a child. In such cases, the range computation for a child can lead to
+        a result that is wrong, possibly leading to an incorrect clipping.
+
+        Test: fast/regions/inline-block-flowed-in-regions.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::canComputeRegionRangeForBox):
+        (WebCore::RenderBlock::computeRegionRangeForBoxChild):
+        (WebCore::RenderBlock::estimateRegionRangeForBoxChild):
+        (WebCore::RenderBlock::updateRegionRangeForBoxChild):
+        * rendering/RenderFlowThread.h:
+
 2014-03-16  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5038 +5038 @@
 }
 
+static bool canComputeRegionRangeForBox(const RenderBlock* parentBlock, const RenderBox& childBox, const RenderFlowThread* flowThreadContainingBlock)
+{
+    ASSERT(parentBlock);
+    ASSERT(!childBox.isRenderFlowThread());
+
+    if (!flowThreadContainingBlock)
+        return false;
+
+    if (!flowThreadContainingBlock->hasRegions())
+        return false;
+
+    if (!childBox.canHaveOutsideRegionRange())
+        return false;
+
+    return flowThreadContainingBlock->hasRegionRangeForBox(parentBlock);
+}
+
 void RenderBlock::computeRegionRangeForBoxChild(const RenderBox& box) const
 {
     RenderFlowThread* flowThread = flowThreadContainingBlock();
-    if (!flowThread || !flowThread->hasRegions())
-        return;
+    ASSERT(canComputeRegionRangeForBox(this, box, flowThread));
 
     RenderRegion* startRegion;
@@ -5060 +5076 @@
 {
     RenderFlowThread* flowThread = flowThreadContainingBlock();
-    if (!flowThread || !flowThread->hasRegions() || !box.canHaveOutsideRegionRange())
+    if (!canComputeRegionRangeForBox(this, box, flowThread))
         return;
 
@@ -5081 +5097 @@
 {
     RenderFlowThread* flowThread = flowThreadContainingBlock();
-    if (!flowThread || !flowThread->hasRegions() || !box.canHaveOutsideRegionRange())
+    if (!canComputeRegionRangeForBox(this, box, flowThread))
         return false;
 

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -125 +125 @@
     void setRegionRangeForBox(const RenderBox*, RenderRegion*, RenderRegion*);
     void getRegionRangeForBox(const RenderBox*, RenderRegion*& startRegion, RenderRegion*& endRegion) const;
+    bool hasRegionRangeForBox(const RenderBox* box) const { ASSERT(box); return m_regionRangeMap.contains(box); }
 
     // Check if the object is in region and the region is part of this flow thread.