Title: [143453] trunk
Revision
143453
Author
commit-qu...@webkit.org
Date
2013-02-20 04:45:58 -0800 (Wed, 20 Feb 2013)

Log Message

Unreviewed, rolling out r143434.
http://trac.webkit.org/changeset/143434
https://bugs.webkit.org/show_bug.cgi?id=110326

added reftest fails on chromium mac 10.6 (Requested by
toyoshim on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2013-02-20

Source/WebCore:

* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::paintObject):

LayoutTests:

* fast/forms/file/file-vertical-padding-border-expected.html: Removed.
* fast/forms/file/file-vertical-padding-border.html: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (143452 => 143453)


--- trunk/LayoutTests/ChangeLog	2013-02-20 12:36:45 UTC (rev 143452)
+++ trunk/LayoutTests/ChangeLog	2013-02-20 12:45:58 UTC (rev 143453)
@@ -1,3 +1,15 @@
+2013-02-20  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r143434.
+        http://trac.webkit.org/changeset/143434
+        https://bugs.webkit.org/show_bug.cgi?id=110326
+
+        added reftest fails on chromium mac 10.6 (Requested by
+        toyoshim on #webkit).
+
+        * fast/forms/file/file-vertical-padding-border-expected.html: Removed.
+        * fast/forms/file/file-vertical-padding-border.html: Removed.
+
 2013-02-19  Vsevolod Vlasov  <vse...@chromium.org>
 
         Web Inspector: Make UISourceCode.path() an array of path segments.

Deleted: trunk/LayoutTests/fast/forms/file/file-vertical-padding-border-expected.html (143452 => 143453)


--- trunk/LayoutTests/fast/forms/file/file-vertical-padding-border-expected.html	2013-02-20 12:36:45 UTC (rev 143452)
+++ trunk/LayoutTests/fast/forms/file/file-vertical-padding-border-expected.html	2013-02-20 12:45:58 UTC (rev 143453)
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>File input alignment with CSS padding and border</title>
-<style type="text/css">
-    span, input {
-        display: inline-block;
-        vertical-align: top;
-        margin: 0px;
-    }
-    .pad-all { padding: 10px; }
-    .pad-top { padding-top: 10px; }
-    .bor-all { border: 10px solid DarkGray; }
-    .bor-top { border-top: 10px solid DarkGray; }
-</style>
-</head>
-<body>
-<p>Bug <a href="" File upload control doesn't apply CSS vertical padding or border to file name</p>
-<p>For this test to pass, the file name (or "No file chosen") should line up with the button text below, with CSS padding and borders overall or on the top, and in combinations thereof.</p>
-<span class="pad-all"><input type="file"/></span>
-<span class="pad-top"><input type="file"/></span>
-<br/>
-<span class="bor-all"><input type="file"/></span>
-<span class="bor-top"><input type="file"/></span>
-<br/>
-<span class="pad-all bor-all"><input type="file"/></span>
-<span class="pad-all bor-top"><input type="file"/></span>
-<br/>
-<span class="pad-top bor-all"><input type="file"/></span>
-<span class="pad-top bor-top"><input type="file"/></span>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/forms/file/file-vertical-padding-border.html (143452 => 143453)


--- trunk/LayoutTests/fast/forms/file/file-vertical-padding-border.html	2013-02-20 12:36:45 UTC (rev 143452)
+++ trunk/LayoutTests/fast/forms/file/file-vertical-padding-border.html	2013-02-20 12:45:58 UTC (rev 143453)
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>File input alignment with CSS padding and border</title>
-<style type="text/css">
-    span, input {
-        display: inline-block;
-        vertical-align: top;
-        margin: 0px;
-    }
-    .pad-all { padding: 10px; }
-    .pad-top { padding-top: 10px; }
-    .bor-all { border: 10px solid DarkGray; }
-    .bor-top { border-top: 10px solid DarkGray; }
-</style>
-</head>
-<body>
-<p>Bug <a href="" File upload control doesn't apply CSS vertical padding or border to file name</p>
-<p>For this test to pass, the file name (or "No file chosen") should line up with the button text below, with CSS padding and borders overall or on the top, and in combinations thereof.</p>
-<span><input type="file" class="pad-all"/></span>
-<span><input type="file" class="pad-top"/></span>
-<br/>
-<span><input type="file" class="bor-all"/></span>
-<span><input type="file" class="bor-top"/></span>
-<br/>
-<span><input type="file" class="pad-all bor-all"/></span>
-<span><input type="file" class="pad-all bor-top"/></span>
-<br/>
-<span><input type="file" class="pad-top bor-all"/></span>
-<span><input type="file" class="pad-top bor-top"/></span>
-</body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (143452 => 143453)


--- trunk/Source/WebCore/ChangeLog	2013-02-20 12:36:45 UTC (rev 143452)
+++ trunk/Source/WebCore/ChangeLog	2013-02-20 12:45:58 UTC (rev 143453)
@@ -1,3 +1,15 @@
+2013-02-20  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r143434.
+        http://trac.webkit.org/changeset/143434
+        https://bugs.webkit.org/show_bug.cgi?id=110326
+
+        added reftest fails on chromium mac 10.6 (Requested by
+        toyoshim on #webkit).
+
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::paintObject):
+
 2013-02-19  Vsevolod Vlasov  <vse...@chromium.org>
 
         Web Inspector: Make UISourceCode.path() an array of path segments.

Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (143452 => 143453)


--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp	2013-02-20 12:36:45 UTC (rev 143452)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp	2013-02-20 12:45:58 UTC (rev 143453)
@@ -141,7 +141,7 @@
         // We want to match the button's baseline
         // FIXME: Make this work with transforms.
         if (RenderButton* buttonRenderer = toRenderButton(button->renderer()))
-            textY = paintOffset.y() + borderTop() + paddingTop() + buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
+            textY = paintOffset.y() + buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
         else
             textY = baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to