Changeset 148943 in webkit

Timestamp:

Apr 22, 2013 9:52:56 PM (11 years ago)

Author:

mihnea@adobe.com

Message:

[CSS Regions] Region's float parent doesn't size according to region size but to content node size
​https://bugs.webkit.org/show_bug.cgi?id=111332

Reviewed by David Hyatt.

Source/WebCore:

Tests: fast/regions/intrinsic-sized-regions.html

fast/regions/region-with-float-parent.html

The patch ensures that the computation of region's preferred widths
takes into account the region width/min-width if these values are specified.
Also implemented the computation of intrinsic widths for a region,
based on the min/max preferred widths of the associated flow thread.

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::computeIntrinsicLogicalWidths):
(WebCore):
(WebCore::RenderRegion::computePreferredLogicalWidths):

• rendering/RenderRegion.h:

(RenderRegion):

LayoutTests:

Added tests for intrinsic and preferred width computation for region.

• fast/regions/intrinsic-sized-regions-expected.txt: Added.
• fast/regions/intrinsic-sized-regions.html: Added.
• fast/regions/region-with-float-parent-expected.txt: Added.
• fast/regions/region-with-float-parent.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/intrinsic-sized-regions-expected.txt (added)
• LayoutTests/fast/regions/intrinsic-sized-regions.html (added)
• LayoutTests/fast/regions/region-with-float-parent-expected.txt (added)
• LayoutTests/fast/regions/region-with-float-parent.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderRegion.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-22  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSS Regions] Region's float parent doesn't size according to region size but to content node size
+        https://bugs.webkit.org/show_bug.cgi?id=111332
+
+        Reviewed by David Hyatt.
+
+        Added tests for intrinsic and preferred width computation for region.
+
+        * fast/regions/intrinsic-sized-regions-expected.txt: Added.
+        * fast/regions/intrinsic-sized-regions.html: Added.
+        * fast/regions/region-with-float-parent-expected.txt: Added.
+        * fast/regions/region-with-float-parent.html: Added.
+
 2013-04-22  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-22  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSS Regions] Region's float parent doesn't size according to region size but to content node size
+        https://bugs.webkit.org/show_bug.cgi?id=111332
+
+        Reviewed by David Hyatt.
+
+        Tests: fast/regions/intrinsic-sized-regions.html
+               fast/regions/region-with-float-parent.html
+
+        The patch ensures that the computation of region's preferred widths
+        takes into account the region width/min-width if these values are specified.
+        Also implemented the computation of intrinsic widths for a region,
+        based on the min/max preferred widths of the associated flow thread.
+
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::computeIntrinsicLogicalWidths):
+        (WebCore):
+        (WebCore::RenderRegion::computePreferredLogicalWidths):
+        * rendering/RenderRegion.h:
+        (RenderRegion):
+
 2013-04-22  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -598 +598 @@
 }
 
+void RenderRegion::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
+{
+    if (!isValid()) {
+        RenderBlock::computeIntrinsicLogicalWidths(minLogicalWidth, maxLogicalWidth);
+        return;
+    }
+
+    minLogicalWidth = m_flowThread->minPreferredLogicalWidth();
+    maxLogicalWidth = m_flowThread->maxPreferredLogicalWidth();
+}
+
 void RenderRegion::computePreferredLogicalWidths()
 {
@@ -609 +620 @@
     // FIXME: Currently, the code handles only the <length> case for min-width/max-width.
     // It should also support other values, like percentage, calc or viewport relative.
-    m_minPreferredLogicalWidth = m_flowThread->minPreferredLogicalWidth();
-    m_maxPreferredLogicalWidth = m_flowThread->maxPreferredLogicalWidth();
+    m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = 0;
 
     RenderStyle* styleToUse = style();
+    if (styleToUse->logicalWidth().isFixed() && styleToUse->logicalWidth().value() > 0)
+        m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalWidth().value());
+    else
+        computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
+
+    if (styleToUse->logicalMinWidth().isFixed() && styleToUse->logicalMinWidth().value() > 0) {
+        m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
+        m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMinWidth().value()));
+    }
+
     if (styleToUse->logicalMaxWidth().isFixed()) {
+        m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
         m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
-        m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->logicalMaxWidth().value()));
     }
 

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -100 +100 @@
     LayoutUnit maxPageLogicalHeight() const;
 
-    virtual void computePreferredLogicalWidths() OVERRIDE;
-    
     LayoutUnit logicalTopOfFlowThreadContentRect(const LayoutRect&) const;
     LayoutUnit logicalBottomOfFlowThreadContentRect(const LayoutRect&) const;
@@ -135 +133 @@
     void setRegionObjectsRegionStyle();
     void restoreRegionObjectsOriginalStyle();
+
+    virtual void computePreferredLogicalWidths() OVERRIDE;
+    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
 
     LayoutRect overflowRectForFlowThreadPortion(LayoutRect flowThreadPortionRect, bool isFirstPortion, bool isLastPortion) const;