Changeset 143475 in webkit

Timestamp:

Feb 20, 2013 10:27:03 AM (11 years ago)

Author:

robert@webkit.org

Message:

input element with placeholder text and width set to 100% on focus causes overflow even after losing focus
​https://bugs.webkit.org/show_bug.cgi?id=109020

Reviewed by David Hyatt.

Source/WebCore:

Tests: fast/forms/input-placeholder-layout-view.html

fast/forms/textarea-placeholder-layout-view.html

Placeholder elements don't affect layout so shouldn't contribute overflow either.

• rendering/RenderTextControlSingleLine.cpp:

(WebCore::RenderTextControlSingleLine::layout):

LayoutTests:

• fast/forms/input-placeholder-layout-view-expected.html: Added.
• fast/forms/input-placeholder-layout-view.html: Added.
• fast/forms/textarea-placeholder-layout-view-expected.html: Added.
• fast/forms/textarea-placeholder-layout-view.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-placeholder-layout-view-expected.html (added)
• LayoutTests/fast/forms/input-placeholder-layout-view.html (added)
• LayoutTests/fast/forms/textarea-placeholder-layout-view-expected.html (added)
• LayoutTests/fast/forms/textarea-placeholder-layout-view.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-20  Robert Hogan  <robert@webkit.org>
+
+        input element with placeholder text and width set to 100% on focus causes overflow even after losing focus
+        https://bugs.webkit.org/show_bug.cgi?id=109020
+
+        Reviewed by David Hyatt.
+
+        * fast/forms/input-placeholder-layout-view-expected.html: Added.
+        * fast/forms/input-placeholder-layout-view.html: Added.
+        * fast/forms/textarea-placeholder-layout-view-expected.html: Added.
+        * fast/forms/textarea-placeholder-layout-view.html: Added.
+
 2013-02-20  Rouslan Solomakhin  <rouslan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  Robert Hogan  <robert@webkit.org>
+
+        input element with placeholder text and width set to 100% on focus causes overflow even after losing focus
+        https://bugs.webkit.org/show_bug.cgi?id=109020
+
+        Reviewed by David Hyatt.
+
+        Tests: fast/forms/input-placeholder-layout-view.html
+               fast/forms/textarea-placeholder-layout-view.html
+
+        Placeholder elements don't affect layout so shouldn't contribute overflow either.
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::layout):
+
 2013-02-20  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -178 +178 @@
         placeholderBox->style()->setWidth(Length(innerTextRenderer->width() - placeholderBox->borderAndPaddingWidth(), Fixed));
         placeholderBox->style()->setHeight(Length(innerTextRenderer->height() - placeholderBox->borderAndPaddingHeight(), Fixed));
+        bool neededLayout = placeholderBox->needsLayout();
         bool placeholderBoxHadLayout = placeholderBox->everHadLayout();
         placeholderBox->layoutIfNeeded();
@@ -191 +192 @@
             // logic should be shared with RenderBlock::layoutBlockChild.
             placeholderBox->repaint();
+        }
+        // The placeholder gets layout last, after the parent text control and its other children,
+        // so in order to get the correct overflow from the placeholder we need to recompute it now.
+        if (neededLayout) {
+            m_overflow.clear();
+            computeOverflow(clientLogicalBottom());
         }
     }