Title: [91759] trunk
- Revision
- 91759
- Author
- [email protected]
- Date
- 2011-07-26 10:08:59 -0700 (Tue, 26 Jul 2011)
Log Message
Source/WebCore: Filename text in file upload controls is not aligned with button text on
chromium-linux, chromium-win, and gtk.
https://bugs.webkit.org/show_bug.cgi?id=64692
The fix is to not include the margin, border, and padding in the calculation,
because those are already accounted for by RenderBlock::baselinePosition().
Patch by Patrick Dubroy <[email protected]> on 2011-07-26
Reviewed by Dimitri Glazkov.
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::paintObject):
LayoutTests: In file upload controls, filename text was misaligned with button text.
Update chromium-linux with the new baseline images, and add temporary
exceptions for chromium-win and gtk until they can be rebaselined.
https://bugs.webkit.org/show_bug.cgi?id=64692
Patch by Patrick Dubroy <[email protected]> on 2011-07-26
Reviewed by Dimitri Glazkov.
* platform/chromium-linux/fast/forms/box-shadow-override-expected.png:
* platform/chromium-linux/fast/forms/file-input-direction-expected.png:
* platform/chromium-linux/fast/forms/file-input-disabled-expected.png:
* platform/chromium-linux/fast/forms/form-element-geometry-expected.png:
* platform/chromium-linux/fast/forms/input-appearance-height-expected.png:
* platform/chromium-linux/fast/forms/input-file-re-render-expected.png:
* platform/chromium-linux/fast/forms/input-value-expected.png:
* platform/chromium/test_expectations.txt:
* platform/gtk/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (91758 => 91759)
--- trunk/LayoutTests/ChangeLog 2011-07-26 16:56:28 UTC (rev 91758)
+++ trunk/LayoutTests/ChangeLog 2011-07-26 17:08:59 UTC (rev 91759)
@@ -1,3 +1,23 @@
+2011-07-26 Patrick Dubroy <[email protected]>
+
+ In file upload controls, filename text was misaligned with button text.
+ Update chromium-linux with the new baseline images, and add temporary
+ exceptions for chromium-win and gtk until they can be rebaselined.
+
+ https://bugs.webkit.org/show_bug.cgi?id=64692
+
+ Reviewed by Dimitri Glazkov.
+
+ * platform/chromium-linux/fast/forms/box-shadow-override-expected.png:
+ * platform/chromium-linux/fast/forms/file-input-direction-expected.png:
+ * platform/chromium-linux/fast/forms/file-input-disabled-expected.png:
+ * platform/chromium-linux/fast/forms/form-element-geometry-expected.png:
+ * platform/chromium-linux/fast/forms/input-appearance-height-expected.png:
+ * platform/chromium-linux/fast/forms/input-file-re-render-expected.png:
+ * platform/chromium-linux/fast/forms/input-value-expected.png:
+ * platform/chromium/test_expectations.txt:
+ * platform/gtk/test_expectations.txt:
+
2011-07-26 Pavel Feldman <[email protected]>
Not reviewed: inspector test rebaselines.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (91758 => 91759)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-26 16:56:28 UTC (rev 91758)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-26 17:08:59 UTC (rev 91759)
@@ -3915,3 +3915,12 @@
BUGWK65152 : fast/js/cyclic-prototypes.html = CRASH PASS
BUGWK65155 : fast/selectors/001.html = CRASH PASS
+
+// Needs new baseline -- visual appearance of file upload control has changed.
+BUGWK64692 WIN : fast/forms/input-file-re-render.html = IMAGE
+BUGWK64692 WIN : fast/forms/form-element-geometry.html = IMAGE
+BUGWK64692 WIN : fast/forms/file-input-direction.html = IMAGE
+BUGWK64692 WIN : fast/forms/input-appearance-height.html = IMAGE
+BUGWK64692 WIN : fast/forms/input-value.html = IMAGE
+BUGWK64692 WIN : fast/forms/box-shadow-override.html = IMAGE
+BUGWK64692 WIN : fast/forms/file-input-disabled.html = IMAGE
Modified: trunk/LayoutTests/platform/chromium-linux/fast/forms/box-shadow-override-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/fast/forms/file-input-direction-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/fast/forms/file-input-disabled-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/fast/forms/form-element-geometry-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/fast/forms/input-appearance-height-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/fast/forms/input-file-re-render-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/fast/forms/input-value-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/gtk/test_expectations.txt (91758 => 91759)
--- trunk/LayoutTests/platform/gtk/test_expectations.txt 2011-07-26 16:56:28 UTC (rev 91758)
+++ trunk/LayoutTests/platform/gtk/test_expectations.txt 2011-07-26 17:08:59 UTC (rev 91759)
@@ -20,3 +20,12 @@
// New test. Need platform-dependent baseline files.
BUGWK59703 : fast/forms/input-appearance-number-rtl.html = FAIL
+
+// Needs new baseline -- visual appearance of file upload control has changed.d
+BUGWK64692 : fast/forms/input-file-re-render.html = IMAGE
+BUGWK64692 : fast/forms/form-element-geometry.html = IMAGE
+BUGWK64692 : fast/forms/file-input-direction.html = IMAGE
+BUGWK64692 : fast/forms/input-appearance-height.html = IMAGE
+BUGWK64692 : fast/forms/input-value.html = IMAGE
+BUGWK64692 : fast/forms/box-shadow-override.html = IMAGE
+BUGWK64692 : fast/forms/file-input-disabled.html = IMAGE
Modified: trunk/Source/WebCore/ChangeLog (91758 => 91759)
--- trunk/Source/WebCore/ChangeLog 2011-07-26 16:56:28 UTC (rev 91758)
+++ trunk/Source/WebCore/ChangeLog 2011-07-26 17:08:59 UTC (rev 91759)
@@ -1,3 +1,18 @@
+2011-07-26 Patrick Dubroy <[email protected]>
+
+ Filename text in file upload controls is not aligned with button text on
+ chromium-linux, chromium-win, and gtk.
+
+ https://bugs.webkit.org/show_bug.cgi?id=64692
+
+ The fix is to not include the margin, border, and padding in the calculation,
+ because those are already accounted for by RenderBlock::baselinePosition().
+
+ Reviewed by Dimitri Glazkov.
+
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::RenderFileUploadControl::paintObject):
+
2011-07-26 Sheriff Bot <[email protected]>
Unreviewed, rolling out r91746.
Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (91758 => 91759)
--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2011-07-26 16:56:28 UTC (rev 91758)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2011-07-26 17:08:59 UTC (rev 91759)
@@ -126,7 +126,6 @@
// We want to match the button's baseline
RenderButton* buttonRenderer = toRenderButton(button->renderer());
LayoutUnit textY = buttonRenderer->absoluteBoundingBoxRect().y()
- + buttonRenderer->marginTop() + buttonRenderer->borderTop() + buttonRenderer->paddingTop()
+ buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
paintInfo.context->setFillColor(style()->visitedDependentColor(CSSPropertyColor), style()->colorSpace());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
