Changeset 128786 in webkit

Timestamp:

Sep 17, 2012 11:44:51 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Exclusions] Enable shape-inside for percentage lengths based on logical height
​https://bugs.webkit.org/show_bug.cgi?id=93547

Patch by Bear Travis <​betravis@adobe.com> on 2012-09-17
Reviewed by Levi Weintraub.

Source/WebCore:

Shape-inside needs to be passed the logical size to use when computing percentage
based coordinates. The CSS Regions-specific method computeInitialRegionRangeForBlock
has been generalized to updateRegionsAndExclusionsLogicalSize. This method takes
the pre-child-layout logical width and height, and uses them to compute the logical
width and height that regions and exclusions should use for layout. Regions use a
block's maximum possible logical height to compute a region's maximum extent.
Exclusions use a block's fixed logical width and height, or 0 if one does not exist,
to resolve percentage-based shape lengths. The default logical size used for resolving
percentage based coordinates is tested in shape-inside-percentage-auto.html.

Test: fast/exclusions/shape-inside/shape-inside-percentage.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::updateRegionsAndExclusionsLogicalSize): Calculates the logical
height regions and exclusions should use, and updates their layout sizes through
computeExclusionShapeSize and computeRegionRangeForBlock.
(WebCore):
(WebCore::RenderBlock::computeExclusionShapeSize): Pass the appropriate logical size
to exclusion shapes so they can resolve percentage based coordinates.
(WebCore::RenderBlock::layoutBlock): Call the new updateRegionsAndExclusionsLogicalSize
method.

• rendering/RenderBlock.h:

(RenderBlock):

• rendering/RenderBox.cpp:

(WebCore::percentageLogicalHeightIsResolvable): Determine if percentage lengths
based on logical height can be resolved.
(WebCore):
(WebCore::RenderBox::percentageLogicalHeightIsResolvableFromBlock): Added declaration.

• rendering/RenderBox.h:

(RenderBox):

• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::layoutBlock): Calling
updateRegionsAndExclusionsLogicalSize rather than computeInitialRegionRangeForBlock.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock): Ditto.

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::layoutBlock): Ditto.

LayoutTests:

Test that shape percentage-based measurements resolve correctly. Some testing is
already covered by shape-inside-percentage-auto.html.

• fast/exclusions/shape-inside/shape-inside-percentage-expected.html: Added.
• fast/exclusions/shape-inside/shape-inside-percentage.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage-expected.html (added)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-percentage.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBlock.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)
• Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-17  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions] Enable shape-inside for percentage lengths based on logical height
+        https://bugs.webkit.org/show_bug.cgi?id=93547
+
+        Reviewed by Levi Weintraub.
+
+        Test that shape percentage-based measurements resolve correctly. Some testing is
+        already covered by shape-inside-percentage-auto.html.
+
+        * fast/exclusions/shape-inside/shape-inside-percentage-expected.html: Added.
+        * fast/exclusions/shape-inside/shape-inside-percentage.html: Added.
+
 2012-09-17  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-17  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions] Enable shape-inside for percentage lengths based on logical height
+        https://bugs.webkit.org/show_bug.cgi?id=93547
+
+        Reviewed by Levi Weintraub.
+
+        Shape-inside needs to be passed the logical size to use when computing percentage
+        based coordinates. The CSS Regions-specific method computeInitialRegionRangeForBlock
+        has been generalized to updateRegionsAndExclusionsLogicalSize. This method takes
+        the pre-child-layout logical width and height, and uses them to compute the logical
+        width and height that regions and exclusions should use for layout. Regions use a
+        block's maximum possible logical height to compute a region's maximum extent.
+        Exclusions use a block's fixed logical width and height, or 0 if one does not exist,
+        to resolve percentage-based shape lengths. The default logical size used for resolving
+        percentage based coordinates is tested in shape-inside-percentage-auto.html.
+
+        Test: fast/exclusions/shape-inside/shape-inside-percentage.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::updateRegionsAndExclusionsLogicalSize): Calculates the logical
+        height regions and exclusions should use, and updates their layout sizes through
+        computeExclusionShapeSize and computeRegionRangeForBlock.
+        (WebCore):
+        (WebCore::RenderBlock::computeExclusionShapeSize): Pass the appropriate logical size
+        to exclusion shapes so they can resolve percentage based coordinates.
+        (WebCore::RenderBlock::layoutBlock): Call the new updateRegionsAndExclusionsLogicalSize
+        method.
+        * rendering/RenderBlock.h:
+        (RenderBlock):
+        * rendering/RenderBox.cpp:
+        (WebCore::percentageLogicalHeightIsResolvable): Determine if percentage lengths
+        based on logical height can be resolved.
+        (WebCore):
+        (WebCore::RenderBox::percentageLogicalHeightIsResolvableFromBlock): Added declaration.
+        * rendering/RenderBox.h:
+        (RenderBox):
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::RenderDeprecatedFlexibleBox::layoutBlock): Calling
+        updateRegionsAndExclusionsLogicalSize rather than computeInitialRegionRangeForBlock.
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Ditto.
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::layoutBlock): Ditto.
+
 2012-09-17  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1395 +1395 @@
 #endif
 
-void RenderBlock::computeInitialRegionRangeForBlock()
-{
-    if (inRenderFlowThread()) {
-        // Set our start and end regions. No regions above or below us will be considered by our children. They are
-        // effectively clamped to our region range.
-        LayoutUnit oldHeight =  logicalHeight();
-        LayoutUnit oldLogicalTop = logicalTop();
-        setLogicalHeight(MAX_LAYOUT_UNIT / 2);
-        updateLogicalHeight();
-        enclosingRenderFlowThread()->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage());
-        setLogicalHeight(oldHeight);
-        setLogicalTop(oldLogicalTop);
-    }
-}
+void RenderBlock::updateRegionsAndExclusionsLogicalSize()
+{
+#if ENABLE(CSS_EXCLUSIONS)
+    if (!inRenderFlowThread() && !wrapShapeInfo())
+#else
+    if (!inRenderFlowThread())
+#endif
+        return;
+
+    LayoutUnit oldHeight = logicalHeight();
+    LayoutUnit oldTop = logicalTop();
+
+    // Compute the maximum logical height content may cause this block to expand to
+    // FIXME: These should eventually use the const computeLogicalHeight rather than updateLogicalHeight
+    setLogicalHeight(MAX_LAYOUT_UNIT / 2);
+    updateLogicalHeight();
+
+#if ENABLE(CSS_EXCLUSIONS)
+    computeExclusionShapeSize();
+#endif
+
+    // Set our start and end regions. No regions above or below us will be considered by our children. They are
+    // effectively clamped to our region range.
+    computeRegionRangeForBlock();
+
+    setLogicalHeight(oldHeight);
+    setLogicalTop(oldTop);
+}
+
+#if ENABLE(CSS_EXCLUSIONS)
+void RenderBlock::computeExclusionShapeSize()
+{
+    WrapShapeInfo* wrapShapeInfo = this->wrapShapeInfo();
+    if (wrapShapeInfo) {
+        bool percentageLogicalHeightResolvable = percentageLogicalHeightIsResolvableFromBlock(this, false);
+        wrapShapeInfo->computeShapeSize(logicalWidth(), percentageLogicalHeightResolvable ? logicalHeight() : ZERO_LAYOUT_UNIT);
+    }
+}
+#endif
 
 void RenderBlock::computeRegionRangeForBlock()
@@ -1492 +1517 @@
             relayoutChildren = true;
     }
-    computeInitialRegionRangeForBlock();
-#if ENABLE(CSS_EXCLUSIONS)
-    // FIXME: Bug 93547: Resolve logical height for percentage based vertical lengths
-    if (WrapShapeInfo* wrapShapeInfo = this->wrapShapeInfo())
-        wrapShapeInfo->computeShapeSize(logicalWidth(), 0);
-#endif
+    updateRegionsAndExclusionsLogicalSize();
 
     // We use four values, maxTopPos, maxTopNeg, maxBottomPos, and maxBottomNeg, to track

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -492 +492 @@
 #endif
 
-    void computeInitialRegionRangeForBlock();
+    void updateRegionsAndExclusionsLogicalSize();
     void computeRegionRangeForBlock();
 
@@ -499 +499 @@
 private:
 #if ENABLE(CSS_EXCLUSIONS)
+    void computeExclusionShapeSize();
     void updateWrapShapeInfoAfterStyleChange(const BasicShape*, const BasicShape* oldWrapShape);
 #endif

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3727 +3727 @@
 }
 
-static bool percentageLogicalHeightIsResolvable(const RenderBox* box)
+inline static bool percentageLogicalHeightIsResolvable(const RenderBox* box)
+{
+    return RenderBox::percentageLogicalHeightIsResolvableFromBlock(box->containingBlock(), box->isOutOfFlowPositioned());
+}
+
+bool RenderBox::percentageLogicalHeightIsResolvableFromBlock(const RenderBlock* containingBlock, bool isOutOfFlowPositioned)
 {
     // In quirks mode, blocks with auto height are skipped, and we keep looking for an enclosing
@@ -3734 +3739 @@
     // block has an auto height. We still skip anonymous containing blocks in both modes, though, and look
     // only at explicit containers.
-    const RenderBlock* cb = box->containingBlock();
+    const RenderBlock* cb = containingBlock;
+    bool inQuirksMode = cb->document()->inQuirksMode();
     while (!cb->isRenderView() && !cb->isBody() && !cb->isTableCell() && !cb->isOutOfFlowPositioned() && cb->style()->logicalHeight().isAuto()) {
-        if (!box->document()->inQuirksMode() && !cb->isAnonymousBlock())
+        if (!inQuirksMode && !cb->isAnonymousBlock())
             break;
         cb = cb->containingBlock();
@@ -3758 +3764 @@
         return true;
     if (cb->style()->logicalHeight().isPercent() && !isOutOfFlowPositionedWithSpecifiedHeight)
-        return percentageLogicalHeightIsResolvable(cb);
-    if (cb->isRenderView() || (cb->isBody() && box->document()->inQuirksMode()) || isOutOfFlowPositionedWithSpecifiedHeight)
+        return percentageLogicalHeightIsResolvableFromBlock(cb->containingBlock(), cb->isOutOfFlowPositioned());
+    if (cb->isRenderView() || inQuirksMode || isOutOfFlowPositionedWithSpecifiedHeight)
         return true;
-    if (cb->isRoot() && box->isOutOfFlowPositioned()) {
+    if (cb->isRoot() && isOutOfFlowPositioned) {
         // Match the positioned objects behavior, which is that positioned objects will fill their viewport
         // always.  Note we could only hit this case by recurring into computePercentageLogicalHeight on a positioned containing block.

trunk/Source/WebCore/rendering/RenderBox.h

@@ -400 +400 @@
     virtual LayoutUnit computeReplacedLogicalHeight() const;
 
+    static bool percentageLogicalHeightIsResolvableFromBlock(const RenderBlock* containingBlock, bool outOfFlowPositioned);
     LayoutUnit computePercentageLogicalHeight(const Length& height) const;
 

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -244 +244 @@
             relayoutChildren = true;
     }
-    computeInitialRegionRangeForBlock();
+    updateRegionsAndExclusionsLogicalSize();
 
     LayoutSize previousSize = size();

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -250 +250 @@
             relayoutChildren = true;
     }
-    computeInitialRegionRangeForBlock();
+    updateRegionsAndExclusionsLogicalSize();
 
     LayoutSize previousSize = size();

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -72 +72 @@
             relayoutChildren = true;
     }
-    computeInitialRegionRangeForBlock();
+    updateRegionsAndExclusionsLogicalSize();
 
     LayoutSize previousSize = size();