WebCore:
Reviewed by Darin Adler.
- fix <rdar://problem/6913221> REGRESSION (Safari 3-4): Search field on
apple.com cuts entered text
Test: fast/forms/search-vertical-alignment.html
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::layout): Vertically center the
the search field's inner block.
LayoutTests:
Reviewed by Darin Adler.
- test and updated result for <rdar://problem/6913221>
REGRESSION (Safari 3-4): Search field on apple.com cuts entered text
* fast/forms/search-vertical-alignment.html: Added.
* platform/mac/fast/forms/search-vertical-alignment-expected.checksum: Added.
* platform/mac/fast/forms/search-vertical-alignment-expected.png: Added.
* platform/mac/fast/forms/search-vertical-alignment-expected.txt: Added.
* platform/mac/fast/forms/search-zoomed-expected.checksum:
* platform/mac/fast/forms/search-zoomed-expected.png:
* platform/mac/fast/forms/search-zoomed-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44806 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/RenderTextControlSingleLine.cpp b/WebCore/rendering/RenderTextControlSingleLine.cpp
index b75ace9..a5db44e 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.cpp
+++ b/WebCore/rendering/RenderTextControlSingleLine.cpp
@@ -223,17 +223,12 @@
int desiredHeight = textBlockHeight();
int currentHeight = innerTextRenderer->height();
- if (m_innerBlock || currentHeight > height()) {
+ if (currentHeight > height()) {
if (desiredHeight != currentHeight)
relayoutChildren = true;
innerTextRenderer->style()->setHeight(Length(desiredHeight, Fixed));
- }
-
- if (m_innerBlock) {
- ASSERT(innerBlockRenderer);
- if (desiredHeight != innerBlockRenderer->height())
- relayoutChildren = true;
- innerBlockRenderer->style()->setHeight(Length(desiredHeight, Fixed));
+ if (m_innerBlock)
+ innerBlockRenderer->style()->setHeight(Length(desiredHeight, Fixed));
}
// Set the text block width
@@ -251,13 +246,11 @@
RenderBlock::layoutBlock(relayoutChildren);
- // For text fields, center the inner text vertically
- // Don't do this for search fields, since we don't honor height for them
- if (!m_innerBlock) {
- currentHeight = innerTextRenderer->height();
- if (currentHeight < height())
- innerTextRenderer->setLocation(innerTextRenderer->x(), (height() - currentHeight) / 2);
- }
+ // Center the child block vertically
+ RenderBox* childBlock = innerBlockRenderer ? innerBlockRenderer : innerTextRenderer;
+ currentHeight = childBlock->height();
+ if (currentHeight < height())
+ childBlock->setLocation(childBlock->x(), (height() - currentHeight) / 2);
}
bool RenderTextControlSingleLine::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int xPos, int yPos, int tx, int ty, HitTestAction hitTestAction)
