Title: [141659] trunk/LayoutTests
Revision
141659
Author
o...@chromium.org
Date
2013-02-01 16:14:17 -0800 (Fri, 01 Feb 2013)

Log Message

Make svg-fonts-in-text-controls.html have the same results across platforms
https://bugs.webkit.org/show_bug.cgi?id=108676

Reviewed by Dirk Pranke.

Mac uses a different default font-size for form controls and Windows
uses different padding for textareas/inputs. Override these so
this test doesn't need platform specific expectations.

* platform/chromium/TestExpectations:
* platform/gtk/svg/custom/svg-fonts-in-text-controls-expected.txt: Removed.
* platform/qt/svg/custom/svg-fonts-in-text-controls-expected.png: Removed.
* platform/qt/svg/custom/svg-fonts-in-text-controls-expected.txt: Removed.
* svg/custom/script-tests/svg-fonts-in-text-controls.js:
* svg/custom/svg-fonts-in-text-controls-expected.txt:
* svg/custom/svg-fonts-in-text-controls.html:
These dummy elements aren't needed anymore. js-test-pre.js inserts them.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (141658 => 141659)


--- trunk/LayoutTests/ChangeLog	2013-02-02 00:10:09 UTC (rev 141658)
+++ trunk/LayoutTests/ChangeLog	2013-02-02 00:14:17 UTC (rev 141659)
@@ -1,3 +1,23 @@
+2013-02-01  Ojan Vafai  <o...@chromium.org>
+
+        Make svg-fonts-in-text-controls.html have the same results across platforms
+        https://bugs.webkit.org/show_bug.cgi?id=108676
+
+        Reviewed by Dirk Pranke.
+
+        Mac uses a different default font-size for form controls and Windows
+        uses different padding for textareas/inputs. Override these so
+        this test doesn't need platform specific expectations.
+
+        * platform/chromium/TestExpectations:
+        * platform/gtk/svg/custom/svg-fonts-in-text-controls-expected.txt: Removed.
+        * platform/qt/svg/custom/svg-fonts-in-text-controls-expected.png: Removed.
+        * platform/qt/svg/custom/svg-fonts-in-text-controls-expected.txt: Removed.
+        * svg/custom/script-tests/svg-fonts-in-text-controls.js:
+        * svg/custom/svg-fonts-in-text-controls-expected.txt:
+        * svg/custom/svg-fonts-in-text-controls.html:
+        These dummy elements aren't needed anymore. js-test-pre.js inserts them.
+
 2013-02-01  Rouslan Solomakhin  <rous...@chromium.org>
 
         [Chromium] Expect spellcheck to ignore punctuation

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (141658 => 141659)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2013-02-02 00:10:09 UTC (rev 141658)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2013-02-02 00:14:17 UTC (rev 141659)
@@ -1922,9 +1922,6 @@
 # so the test timeouts.
 crbug.com/11001 http/tests/history/back-to-post.php [ Timeout ]
 
-# Regressions from WebKit Merge 42932:42994 due to text metric changes.
-crbug.com/11251 [ Android Linux Win ] svg/custom/svg-fonts-in-text-controls.html [ Failure ]
-
 # WebKit 45086:45111
 crbug.com/15270 fast/js/excessive-comma-usage.html [ Failure ]
 

Deleted: trunk/LayoutTests/platform/gtk/svg/custom/svg-fonts-in-text-controls-expected.txt (141658 => 141659)


--- trunk/LayoutTests/platform/gtk/svg/custom/svg-fonts-in-text-controls-expected.txt	2013-02-02 00:10:09 UTC (rev 141658)
+++ trunk/LayoutTests/platform/gtk/svg/custom/svg-fonts-in-text-controls-expected.txt	2013-02-02 00:14:17 UTC (rev 141659)
@@ -1,11 +0,0 @@
-This tests that the width of textareas and inputs is correctly calculated based on the metrics of the SVG font.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Textarea offsetWidth: 161
-Input offsetWidth: 146
-

Deleted: trunk/LayoutTests/platform/qt/svg/custom/svg-fonts-in-text-controls-expected.png


(Binary files differ)

Deleted: trunk/LayoutTests/platform/qt/svg/custom/svg-fonts-in-text-controls-expected.txt (141658 => 141659)


--- trunk/LayoutTests/platform/qt/svg/custom/svg-fonts-in-text-controls-expected.txt	2013-02-02 00:10:09 UTC (rev 141658)
+++ trunk/LayoutTests/platform/qt/svg/custom/svg-fonts-in-text-controls-expected.txt	2013-02-02 00:14:17 UTC (rev 141659)
@@ -1,11 +0,0 @@
-This tests that the width of textareas and inputs is correctly calculated based on the metrics of the SVG font.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Textarea offsetWidth: 159
-Input offsetWidth: 144
-

Modified: trunk/LayoutTests/svg/custom/script-tests/svg-fonts-in-text-controls.js (141658 => 141659)


--- trunk/LayoutTests/svg/custom/script-tests/svg-fonts-in-text-controls.js	2013-02-02 00:10:09 UTC (rev 141658)
+++ trunk/LayoutTests/svg/custom/script-tests/svg-fonts-in-text-controls.js	2013-02-02 00:14:17 UTC (rev 141659)
@@ -7,11 +7,15 @@
 
 var textarea = document.createElement('textarea');
 textarea.style.fontFamily = 'SVGraffiti';
+textarea.style.fontSize = '11px';
+textarea.style.padding = 0;
 textarea.cols = 20;
 document.body.appendChild(textarea);
 
 var input = document.createElement('input');
 input.style.fontFamily = 'SVGraffiti';
+input.style.fontSize = '11px';
+input.style.padding = 0;
 input.size = 20;
 document.body.appendChild(input);
 

Modified: trunk/LayoutTests/svg/custom/svg-fonts-in-text-controls-expected.txt (141658 => 141659)


--- trunk/LayoutTests/svg/custom/svg-fonts-in-text-controls-expected.txt	2013-02-02 00:10:09 UTC (rev 141658)
+++ trunk/LayoutTests/svg/custom/svg-fonts-in-text-controls-expected.txt	2013-02-02 00:14:17 UTC (rev 141659)
@@ -6,6 +6,6 @@
 PASS successfullyParsed is true
 
 TEST COMPLETE
-Textarea offsetWidth: 121
-Input offsetWidth: 106
+Textarea offsetWidth: 117
+Input offsetWidth: 104
 

Modified: trunk/LayoutTests/svg/custom/svg-fonts-in-text-controls.html (141658 => 141659)


--- trunk/LayoutTests/svg/custom/svg-fonts-in-text-controls.html	2013-02-02 00:10:09 UTC (rev 141658)
+++ trunk/LayoutTests/svg/custom/svg-fonts-in-text-controls.html	2013-02-02 00:14:17 UTC (rev 141659)
@@ -4,8 +4,6 @@
 <script src=""
 </head>
 <body>
-<p id="description"></p>
-<div id="console"></div>
 <script src=""
 <script src=""
 </body>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to