Changeset 139536 in webkit

Timestamp:

Jan 11, 2013, 6:29:31 PM (12 years ago)

Author:

ojan@chromium.org

Message:

Fixed width overrides intrinsic min-width/max-width for text inputs and listboxes
​https://bugs.webkit.org/show_bug.cgi?id=106675

Reviewed by Emil A Eklund.

Source/WebCore:

Implement computeIntrinsicLogicalWidths so that RenderBox::computeLogicalWidthInRegionUsing
can get the correct intrinsic sizes instead of the preferred sizes.

Test: fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width.html

• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::computeIntrinsicLogicalWidths):
(WebCore):
(WebCore::RenderListBox::computePreferredLogicalWidths):

• rendering/RenderListBox.h:

(RenderListBox):

• rendering/RenderTextControl.cpp:

(WebCore::RenderTextControl::computeIntrinsicLogicalWidths):
(WebCore):
(WebCore::RenderTextControl::computePreferredLogicalWidths):

• rendering/RenderTextControl.h:

(RenderTextControl):

LayoutTests:

• fast/forms/file/intrinsic-min-width-overrides-width-expected.html:
• fast/forms/file/intrinsic-min-width-overrides-width.html:
• fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width-expected.html: Added.
• fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/file/intrinsic-min-width-overrides-width-expected.html (modified) (1 diff)
• LayoutTests/fast/forms/file/intrinsic-min-width-overrides-width.html (modified) (1 diff)
• LayoutTests/fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width-expected.html (added)
• LayoutTests/fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderListBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderListBox.h (modified) (1 diff)
• Source/WebCore/rendering/RenderTextControl.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderTextControl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-11  Ojan Vafai  <ojan@chromium.org>
+
+        Fixed width overrides intrinsic min-width/max-width for text inputs and listboxes
+        https://bugs.webkit.org/show_bug.cgi?id=106675
+
+        Reviewed by Emil A Eklund.
+
+        * fast/forms/file/intrinsic-min-width-overrides-width-expected.html:
+        * fast/forms/file/intrinsic-min-width-overrides-width.html:
+        * fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width-expected.html: Added.
+        * fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width.html: Added.
+
 2013-01-10  Ojan Vafai  <ojan@chromium.org>
 

trunk/LayoutTests/fast/forms/file/intrinsic-min-width-overrides-width-expected.html

@@ -7 +7 @@
 </style>
 
+<input>
+<input>
+
+<br>
+
 <input type="file">
 <input type="file">

trunk/LayoutTests/fast/forms/file/intrinsic-min-width-overrides-width.html

@@ -20 +20 @@
 </style>
 
+<input class="min">
+<input class="max">
+
+<br>
+
 <input class="min" type="file">
 <input class="max" type="file">

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-11  Ojan Vafai  <ojan@chromium.org>
+
+        Fixed width overrides intrinsic min-width/max-width for text inputs and listboxes
+        https://bugs.webkit.org/show_bug.cgi?id=106675
+
+        Reviewed by Emil A Eklund.
+
+        Implement computeIntrinsicLogicalWidths so that RenderBox::computeLogicalWidthInRegionUsing
+        can get the correct intrinsic sizes instead of the preferred sizes.
+
+        Test: fast/forms/select/listbox-intrinsic-min-width-applies-with-fixed-width.html
+
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::computeIntrinsicLogicalWidths):
+        (WebCore):
+        (WebCore::RenderListBox::computePreferredLogicalWidths):
+        * rendering/RenderListBox.h:
+        (RenderListBox):
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::computeIntrinsicLogicalWidths):
+        (WebCore):
+        (WebCore::RenderTextControl::computePreferredLogicalWidths):
+        * rendering/RenderTextControl.h:
+        (RenderTextControl):
+
 2013-01-10  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -204 +204 @@
 }
 
+void RenderListBox::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
+{
+    maxLogicalWidth = m_optionsWidth + 2 * optionsSpacingHorizontal;
+    if (m_vBar)
+        maxLogicalWidth += m_vBar->width();
+    if (!style()->width().isPercent())
+        minLogicalWidth = maxLogicalWidth;
+}
+
 void RenderListBox::computePreferredLogicalWidths()
 {
@@ -213 +222 @@
     if (style()->width().isFixed() && style()->width().value() > 0)
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style()->width().value());
-    else {
-        m_maxPreferredLogicalWidth = m_optionsWidth + 2 * optionsSpacingHorizontal;
-        if (m_vBar)
-            m_maxPreferredLogicalWidth += m_vBar->width();
-
-        if (!style()->width().isPercent())
-            m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth;
-    }
+    else
+        computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
 
     if (style()->minWidth().isFixed() && style()->minWidth().value() > 0) {

trunk/Source/WebCore/rendering/RenderListBox.h

@@ -76 +76 @@
     virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0);
 
-    virtual void computePreferredLogicalWidths();
+    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
+    virtual void computePreferredLogicalWidths() OVERRIDE;
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;

trunk/Source/WebCore/rendering/RenderTextControl.cpp

@@ -255 +255 @@
 }
 
+void RenderTextControl::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
+{
+    // Use average character width. Matches IE.
+    AtomicString family = style()->font().family().family();
+    maxLogicalWidth = preferredContentWidth(const_cast<RenderTextControl*>(this)->getAvgCharWidth(family));
+    if (RenderBox* innerTextRenderBox = innerTextElement()->renderBox())
+        maxLogicalWidth += innerTextRenderBox->paddingLeft() + innerTextRenderBox->paddingRight();
+    if (!style()->width().isPercent())
+        minLogicalWidth = maxLogicalWidth;
+}
+
 void RenderTextControl::computePreferredLogicalWidths()
 {
@@ -264 +275 @@
     if (style()->width().isFixed() && style()->width().value() >= 0)
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(style()->width().value());
-    else {
-        // Use average character width. Matches IE.
-        AtomicString family = style()->font().family().family();
-        m_maxPreferredLogicalWidth = preferredContentWidth(getAvgCharWidth(family));
-        if (RenderBox* innerTextRenderBox = innerTextElement()->renderBox())
-            m_maxPreferredLogicalWidth += innerTextRenderBox->paddingLeft() + innerTextRenderBox->paddingRight();
-
-        if (!style()->width().isPercent())
-            m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth;
-    }
+    else
+        computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
 
     if (style()->minWidth().isFixed() && style()->minWidth().value() > 0) {

trunk/Source/WebCore/rendering/RenderTextControl.h

@@ -69 +69 @@
     virtual const char* renderName() const { return "RenderTextControl"; }
     virtual bool isTextControl() const { return true; }
-    virtual void computePreferredLogicalWidths();
+    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
+    virtual void computePreferredLogicalWidths() OVERRIDE;
     virtual void removeLeftoverAnonymousBlock(RenderBlock*) { }
     virtual bool avoidsFloats() const { return true; }