Unreviewed, rolling out r143434.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Feb 2013 12:45:58 +0000 (12:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Feb 2013 12:45:58 +0000 (12:45 +0000)
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.bot@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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143453 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/forms/file/file-vertical-padding-border-expected.html [deleted file]
LayoutTests/fast/forms/file/file-vertical-padding-border.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderFileUploadControl.cpp

index c312fe0bb1f16ee1cd2e84dee48bf26a6931f0a7..703e1c67f3dcb3c2e6ed0452d317ba4e585b41a6 100644 (file)
@@ -1,3 +1,15 @@
+2013-02-20  Sheriff Bot  <webkit.review.bot@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  <vsevik@chromium.org>
 
         Web Inspector: Make UISourceCode.path() an array of path segments.
diff --git a/LayoutTests/fast/forms/file/file-vertical-padding-border-expected.html b/LayoutTests/fast/forms/file/file-vertical-padding-border-expected.html
deleted file mode 100644 (file)
index 7f50ab5..0000000
+++ /dev/null
@@ -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="http://webkit.org/b/109011">109011</a>: 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>
diff --git a/LayoutTests/fast/forms/file/file-vertical-padding-border.html b/LayoutTests/fast/forms/file/file-vertical-padding-border.html
deleted file mode 100644 (file)
index d51cff9..0000000
+++ /dev/null
@@ -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="http://webkit.org/b/109011">109011</a>: 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>
index de0c034dbe894727ac6932775e1f7d35235d0af4..a01d23cac3a270905564e236248ba4f40adaa56d 100644 (file)
@@ -1,3 +1,15 @@
+2013-02-20  Sheriff Bot  <webkit.review.bot@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  <vsevik@chromium.org>
 
         Web Inspector: Make UISourceCode.path() an array of path segments.
index 437ced3d7d14b6ff4883bb7175a4fa0b7c732a42..eb4542f4dd13871a2542547a4ab2ea8696a66315 100644 (file)
@@ -141,7 +141,7 @@ void RenderFileUploadControl::paintObject(PaintInfo& paintInfo, const LayoutPoin
         // 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);