Diff
Modified: trunk/LayoutTests/ChangeLog (169779 => 169780)
--- trunk/LayoutTests/ChangeLog 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/LayoutTests/ChangeLog 2014-06-10 23:23:46 UTC (rev 169780)
@@ -1,3 +1,19 @@
+2014-06-10 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Japanese text in Google search is rendered too low and clipped
+ https://bugs.webkit.org/show_bug.cgi?id=133595
+
+ Reviewed by Simon Fraser.
+
+ This is a revert of r155324.
+
+ * fast/dom/HTMLInputElement/input-line-height-expected.txt: Removed.
+ * fast/dom/HTMLInputElement/input-line-height.html: Removed.
+ * fast/forms/placeholder-position-expected.txt:
+ * platform/mac/fast/forms/placeholder-position-expected.png:
+ * platform/mac/fast/forms/placeholder-position-expected.txt:
+ * platform/mac-mountainlion/fast/forms/placeholder-position-expected.txt:
+
2014-06-10 Zalan Bujtas <za...@apple.com>
REGRESSION (r167937): Do not use effective zoom factor while resolving media query's min-, max-(device)width/height values.
Deleted: trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height-expected.txt (169779 => 169780)
--- trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height-expected.txt 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height-expected.txt 2014-06-10 23:23:46 UTC (rev 169780)
@@ -1,61 +0,0 @@
-Tests that line-height is not applied for input element
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS window.getComputedStyle(document.getElementById('tagButton'),null).getPropertyValue('line-height') is document.getElementById('tagButton').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputButton'),null).getPropertyValue('line-height') is not document.getElementById('inputButton').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputText'),null).getPropertyValue('line-height') is not document.getElementById('inputText').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputSubmit'),null).getPropertyValue('line-height') is not document.getElementById('inputSubmit').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputReset'),null).getPropertyValue('line-height') is not document.getElementById('inputReset').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputPassword'),null).getPropertyValue('line-height') is not document.getElementById('inputPassword').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputSearch'),null).getPropertyValue('line-height') is not document.getElementById('inputSearch').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputHidden'),null).getPropertyValue('line-height') is not document.getElementById('inputHidden').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputDate'),null).getPropertyValue('line-height') is not document.getElementById('inputDate').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputDateTime'),null).getPropertyValue('line-height') is not document.getElementById('inputDateTime').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputDateTimeLocal'),null).getPropertyValue('line-height') is not document.getElementById('inputDateTimeLocal').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputMonth'),null).getPropertyValue('line-height') is not document.getElementById('inputMonth').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputTime'),null).getPropertyValue('line-height') is not document.getElementById('inputTime').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputWeek'),null).getPropertyValue('line-height') is not document.getElementById('inputWeek').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputImage'),null).getPropertyValue('line-height') is not document.getElementById('inputImage').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputFile'),null).getPropertyValue('line-height') is not document.getElementById('inputFile').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputRadio'),null).getPropertyValue('line-height') is not document.getElementById('inputRadio').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputCheckbox'),null).getPropertyValue('line-height') is not document.getElementById('inputCheckbox').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputRange'),null).getPropertyValue('line-height') is not document.getElementById('inputRange').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputColor'),null).getPropertyValue('line-height') is not document.getElementById('inputColor').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputEmail'),null).getPropertyValue('line-height') is not document.getElementById('inputEmail').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputUrl'),null).getPropertyValue('line-height') is not document.getElementById('inputUrl').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputTel'),null).getPropertyValue('line-height') is not document.getElementById('inputTel').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('inputNumber'),null).getPropertyValue('line-height') is not document.getElementById('inputNumber').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('tagSelect'),null).getPropertyValue('line-height') is not document.getElementById('tagSelect').style.lineHeight
-PASS window.getComputedStyle(document.getElementById('tagTextarea'),null).getPropertyValue('line-height') is document.getElementById('tagTextarea').style.lineHeight
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Button
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Deleted: trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height.html (169779 => 169780)
--- trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height.html 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height.html 2014-06-10 23:23:46 UTC (rev 169780)
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <script src=""
- <script>
- function runTest() {
- description('Tests that line-height is not applied for input element');
-
- shouldBe("window.getComputedStyle(document.getElementById('tagButton'),null).getPropertyValue('line-height')","document.getElementById('tagButton').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputButton'),null).getPropertyValue('line-height')","document.getElementById('inputButton').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputText'),null).getPropertyValue('line-height')","document.getElementById('inputText').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputSubmit'),null).getPropertyValue('line-height')","document.getElementById('inputSubmit').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputReset'),null).getPropertyValue('line-height')","document.getElementById('inputReset').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputPassword'),null).getPropertyValue('line-height')","document.getElementById('inputPassword').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputSearch'),null).getPropertyValue('line-height')","document.getElementById('inputSearch').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputHidden'),null).getPropertyValue('line-height')","document.getElementById('inputHidden').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputDate'),null).getPropertyValue('line-height')","document.getElementById('inputDate').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputDateTime'),null).getPropertyValue('line-height')","document.getElementById('inputDateTime').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputDateTimeLocal'),null).getPropertyValue('line-height')","document.getElementById('inputDateTimeLocal').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputMonth'),null).getPropertyValue('line-height')","document.getElementById('inputMonth').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputTime'),null).getPropertyValue('line-height')","document.getElementById('inputTime').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputWeek'),null).getPropertyValue('line-height')","document.getElementById('inputWeek').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputImage'),null).getPropertyValue('line-height')","document.getElementById('inputImage').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputFile'),null).getPropertyValue('line-height')","document.getElementById('inputFile').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputRadio'),null).getPropertyValue('line-height')","document.getElementById('inputRadio').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputCheckbox'),null).getPropertyValue('line-height')","document.getElementById('inputCheckbox').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputRange'),null).getPropertyValue('line-height')","document.getElementById('inputRange').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputColor'),null).getPropertyValue('line-height')","document.getElementById('inputColor').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputEmail'),null).getPropertyValue('line-height')","document.getElementById('inputEmail').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputUrl'),null).getPropertyValue('line-height')","document.getElementById('inputUrl').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputTel'),null).getPropertyValue('line-height')","document.getElementById('inputTel').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('inputNumber'),null).getPropertyValue('line-height')","document.getElementById('inputNumber').style.lineHeight");
- shouldNotBe("window.getComputedStyle(document.getElementById('tagSelect'),null).getPropertyValue('line-height')","document.getElementById('tagSelect').style.lineHeight");
- shouldBe("window.getComputedStyle(document.getElementById('tagTextarea'),null).getPropertyValue('line-height')","document.getElementById('tagTextarea').style.lineHeight");
- isSuccessfullyParsed();
- }
- </script>
- </head>
- <body _onload_="runTest()">
- <form>
- <button id="tagButton" style="line-height: 50px">Button</button><br>
- <input id="inputButton" style="line-height: 50px" type="button" value="Button"/><br>
- <input id="inputText" style="line-height: 50px" type="text"/><br>
- <input id="inputSubmit" style="line-height: 50px" type="submit" value="Submit"/><br>
- <input id="inputReset" style="line-height: 50px" type="reset" value="Reset"/><br>
- <input id="inputPassword" style="line-height: 50px" type="password"/><br>
- <input id="inputSearch" style="line-height: 50px" type="search"/><br>
- <input id="inputHidden" style="line-height: 50px" type="hidden"/><br>
- <input id="inputDate" style="line-height: 50px" type="date"/><br>
- <input id="inputDateTime" style="line-height: 50px" type="datetime"/><br>
- <input id="inputDateTimeLocal" style="line-height: 50px" type="datetime-local"/><br>
- <input id="inputMonth" style="line-height: 50px" type="month"/><br>
- <input id="inputTime" style="line-height: 50px" type="time"/><br>
- <input id="inputWeek" style="line-height: 50px" type="week"/><br>
- <input id="inputImage" style="line-height: 50px" type="image"/><br>
- <input id="inputFile" style="line-height: 50px" type="file"/><br>
- <input id="inputRadio" style="line-height: 50px" type="radio"/><br>
- <input id="inputCheckbox" style="line-height: 50px" type="checkbox"/><br>
- <input id="inputRange" style="line-height: 50px" type="range"/><br>
- <input id="inputColor" style="line-height: 50px" type="color"/><br>
- <input id="inputEmail" style="line-height: 50px" type="email"/><br>
- <input id="inputUrl" style="line-height: 50px" type="url"/><br>
- <input id="inputTel" style="line-height: 50px" type="tel"/><br>
- <input id="inputNumber" style="line-height: 50px" type="number"/><br>
- <select id="tagSelect" style="line-height: 50px">
- <option>A select</option>
- <option>An option</option>
- </select><br>
- <textarea id="tagTextarea" style="line-height: 50px"></textarea><br>
- </form>
- </body>
-</html>
\ No newline at end of file
Modified: trunk/LayoutTests/fast/forms/placeholder-position-expected.txt (169779 => 169780)
--- trunk/LayoutTests/fast/forms/placeholder-position-expected.txt 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/LayoutTests/fast/forms/placeholder-position-expected.txt 2014-06-10 23:23:46 UTC (rev 169780)
@@ -29,24 +29,24 @@
RenderBR {BR} at (165,214) size 0x0
RenderTextControl {INPUT} at (5,219) size 174x30 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
RenderBR {BR} at (184,240) size 0x0
- RenderTextControl {INPUT} at (2,256) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (127,256) size 4x18
- text run at (127,256) width 4: " "
- RenderTextControl {INPUT} at (133,256) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (258,256) size 4x18
- text run at (258,256) width 4: " "
- RenderBR {BR} at (262,270) size 0x0
- RenderTextControl {INPUT} at (2,279) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (127,279) size 4x18
- text run at (127,279) width 4: " "
- RenderTextControl {INPUT} at (133,279) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (258,279) size 4x18
- text run at (258,279) width 4: " "
- RenderTextControl {INPUT} at (264,279) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (389,279) size 4x18
- text run at (389,279) width 4: " "
- RenderBR {BR} at (393,293) size 0x0
- RenderBR {BR} at (127,330) size 0x0
+ RenderTextControl {INPUT} at (2,256) size 123x31 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (127,262) size 4x18
+ text run at (127,262) width 4: " "
+ RenderTextControl {INPUT} at (133,256) size 123x31 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (258,262) size 4x18
+ text run at (258,262) width 4: " "
+ RenderBR {BR} at (262,276) size 0x0
+ RenderTextControl {INPUT} at (2,291) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (127,291) size 4x18
+ text run at (127,291) width 4: " "
+ RenderTextControl {INPUT} at (133,291) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (258,291) size 4x18
+ text run at (258,291) width 4: " "
+ RenderTextControl {INPUT} at (264,291) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (389,291) size 4x18
+ text run at (389,291) width 4: " "
+ RenderBR {BR} at (393,305) size 0x0
+ RenderBR {BR} at (127,342) size 0x0
layer at (21,13) size 117x13
RenderBlock {DIV} at (11,3) size 117x13 [color=#A9A9A9]
RenderText {#text} at (0,0) size 63x13
@@ -95,37 +95,37 @@
text run at (0,0) width 85: "placeholder"
layer at (19,233) size 162x18
RenderBlock {DIV} at (6,6) size 162x18
-layer at (13,267) size 117x13
+layer at (13,267) size 117x25
+ RenderBlock {DIV} at (3,3) size 117x25
+ RenderText {#text} at (0,6) size 30x13
+ text run at (0,6) width 30: "Value"
+layer at (144,267) size 117x25
+ RenderBlock {DIV} at (3,3) size 117x25 [color=#A9A9A9]
+ RenderText {#text} at (0,6) size 63x13
+ text run at (0,6) width 63: "placeholder"
+layer at (144,267) size 117x25
+ RenderBlock {DIV} at (3,3) size 117x25
+layer at (13,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13
- RenderText {#text} at (0,0) size 30x13
- text run at (0,0) width 30: "Value"
-layer at (144,267) size 117x13
- RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
- RenderText {#text} at (0,0) size 63x13
- text run at (0,0) width 63: "placeholder"
-layer at (144,267) size 117x13
- RenderBlock {DIV} at (3,3) size 117x13
-layer at (13,290) size 117x13
- RenderBlock {DIV} at (3,3) size 117x13
RenderText {#text} at (43,0) size 31x13
text run at (43,0) width 31: "Value"
-layer at (144,290) size 117x13
+layer at (144,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
RenderText {#text} at (27,0) size 63x13
text run at (27,0) width 63: "placeholder"
-layer at (144,290) size 117x13
+layer at (144,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13
-layer at (275,290) size 117x13
+layer at (275,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
RenderText {#text} at (27,0) size 63x13
text run at (27,0) width 63: "placeholder"
-layer at (275,290) size 117x13
+layer at (275,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13
-layer at (10,310) size 123x33
- RenderTextControl {INPUT} at (2,302) size 123x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (13,327) size 117x13
+layer at (10,322) size 123x33
+ RenderTextControl {INPUT} at (2,314) size 123x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+layer at (13,339) size 117x13
RenderBlock {DIV} at (3,17) size 117x13 [color=#A9A9A9]
RenderText {#text} at (0,0) size 63x13
text run at (0,0) width 63: "placeholder"
-layer at (13,327) size 117x13
+layer at (13,339) size 117x13
RenderBlock {DIV} at (3,17) size 117x13
Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt (169779 => 169780)
--- trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2014-06-10 23:23:46 UTC (rev 169780)
@@ -29,24 +29,24 @@
RenderBR {BR} at (165,214) size 0x0
RenderTextControl {INPUT} at (5,219) size 202x30 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
RenderBR {BR} at (211,240) size 1x0
- RenderTextControl {INPUT} at (2,256) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (149,256) size 5x18
- text run at (149,256) width 5: " "
- RenderTextControl {INPUT} at (155,256) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (302,256) size 5x18
- text run at (302,256) width 5: " "
- RenderBR {BR} at (306,270) size 1x0
- RenderTextControl {INPUT} at (2,279) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (149,279) size 5x18
- text run at (149,279) width 5: " "
- RenderTextControl {INPUT} at (155,279) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (302,279) size 5x18
- text run at (302,279) width 5: " "
- RenderTextControl {INPUT} at (308,279) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (455,279) size 5x18
- text run at (455,279) width 5: " "
- RenderBR {BR} at (459,293) size 1x0
- RenderBR {BR} at (149,330) size 1x0
+ RenderTextControl {INPUT} at (2,256) size 146x31 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (149,262) size 5x18
+ text run at (149,262) width 5: " "
+ RenderTextControl {INPUT} at (155,256) size 146x31 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (302,262) size 5x18
+ text run at (302,262) width 5: " "
+ RenderBR {BR} at (306,276) size 1x0
+ RenderTextControl {INPUT} at (2,291) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (149,291) size 5x18
+ text run at (149,291) width 5: " "
+ RenderTextControl {INPUT} at (155,291) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (302,291) size 5x18
+ text run at (302,291) width 5: " "
+ RenderTextControl {INPUT} at (308,291) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (455,291) size 5x18
+ text run at (455,291) width 5: " "
+ RenderBR {BR} at (459,305) size 1x0
+ RenderBR {BR} at (149,342) size 1x0
layer at (21,13) size 139x13
RenderBlock {DIV} at (11,3) size 140x13 [color=#A9A9A9]
RenderText {#text} at (0,0) size 63x13
@@ -95,37 +95,37 @@
text run at (0,0) width 85: "placeholder"
layer at (19,233) size 190x18
RenderBlock {DIV} at (6,6) size 190x18
-layer at (13,267) size 139x13
+layer at (13,267) size 139x25
+ RenderBlock {DIV} at (3,3) size 140x25
+ RenderText {#text} at (0,6) size 30x13
+ text run at (0,6) width 30: "Value"
+layer at (166,267) size 139x25
+ RenderBlock {DIV} at (3,3) size 140x25 [color=#A9A9A9]
+ RenderText {#text} at (0,6) size 63x13
+ text run at (0,6) width 63: "placeholder"
+layer at (166,267) size 139x25
+ RenderBlock {DIV} at (3,3) size 140x25
+layer at (13,302) size 139x13
RenderBlock {DIV} at (3,3) size 140x13
- RenderText {#text} at (0,0) size 30x13
- text run at (0,0) width 30: "Value"
-layer at (166,267) size 139x13
- RenderBlock {DIV} at (3,3) size 140x13 [color=#A9A9A9]
- RenderText {#text} at (0,0) size 63x13
- text run at (0,0) width 63: "placeholder"
-layer at (166,267) size 139x13
- RenderBlock {DIV} at (3,3) size 140x13
-layer at (13,290) size 139x13
- RenderBlock {DIV} at (3,3) size 140x13
RenderText {#text} at (54,0) size 31x13
text run at (54,0) width 31: "Value"
-layer at (166,290) size 139x13
+layer at (166,302) size 139x13
RenderBlock {DIV} at (3,3) size 140x13 [color=#A9A9A9]
RenderText {#text} at (38,0) size 63x13
text run at (38,0) width 63: "placeholder"
-layer at (166,290) size 139x13
+layer at (166,302) size 139x13
RenderBlock {DIV} at (3,3) size 140x13
-layer at (319,290) size 139x13
+layer at (319,302) size 139x13
RenderBlock {DIV} at (3,3) size 140x13 [color=#A9A9A9]
RenderText {#text} at (38,0) size 63x13
text run at (38,0) width 63: "placeholder"
-layer at (319,290) size 139x13
+layer at (319,302) size 139x13
RenderBlock {DIV} at (3,3) size 140x13
-layer at (10,310) size 145x33
- RenderTextControl {INPUT} at (2,302) size 146x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (13,327) size 139x13
+layer at (10,322) size 145x33
+ RenderTextControl {INPUT} at (2,314) size 146x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+layer at (13,339) size 139x13
RenderBlock {DIV} at (3,17) size 140x13 [color=#A9A9A9]
RenderText {#text} at (0,0) size 63x13
text run at (0,0) width 63: "placeholder"
-layer at (13,327) size 139x13
+layer at (13,339) size 139x13
RenderBlock {DIV} at (3,17) size 140x13
Modified: trunk/LayoutTests/platform/mac-mountainlion/fast/forms/placeholder-position-expected.txt (169779 => 169780)
--- trunk/LayoutTests/platform/mac-mountainlion/fast/forms/placeholder-position-expected.txt 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/LayoutTests/platform/mac-mountainlion/fast/forms/placeholder-position-expected.txt 2014-06-10 23:23:46 UTC (rev 169780)
@@ -29,24 +29,24 @@
RenderBR {BR} at (165,214) size 0x0
RenderTextControl {INPUT} at (5,219) size 174x30 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
RenderBR {BR} at (184,240) size 0x0
- RenderTextControl {INPUT} at (2,256) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (127,256) size 4x18
- text run at (127,256) width 4: " "
- RenderTextControl {INPUT} at (133,256) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (258,256) size 4x18
- text run at (258,256) width 4: " "
- RenderBR {BR} at (262,270) size 0x0
- RenderTextControl {INPUT} at (2,279) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (127,279) size 4x18
- text run at (127,279) width 4: " "
- RenderTextControl {INPUT} at (133,279) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (258,279) size 4x18
- text run at (258,279) width 4: " "
- RenderTextControl {INPUT} at (264,279) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (389,279) size 4x18
- text run at (389,279) width 4: " "
- RenderBR {BR} at (393,293) size 0x0
- RenderBR {BR} at (127,330) size 0x0
+ RenderTextControl {INPUT} at (2,256) size 123x31 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (127,262) size 4x18
+ text run at (127,262) width 4: " "
+ RenderTextControl {INPUT} at (133,256) size 123x31 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (258,262) size 4x18
+ text run at (258,262) width 4: " "
+ RenderBR {BR} at (262,276) size 0x0
+ RenderTextControl {INPUT} at (2,291) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (127,291) size 4x18
+ text run at (127,291) width 4: " "
+ RenderTextControl {INPUT} at (133,291) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (258,291) size 4x18
+ text run at (258,291) width 4: " "
+ RenderTextControl {INPUT} at (264,291) size 123x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (389,291) size 4x18
+ text run at (389,291) width 4: " "
+ RenderBR {BR} at (393,305) size 0x0
+ RenderBR {BR} at (127,342) size 0x0
layer at (21,13) size 117x13
RenderBlock {DIV} at (11,3) size 117x13 [color=#A9A9A9]
RenderText {#text} at (0,0) size 63x13
@@ -95,37 +95,37 @@
text run at (0,0) width 85: "placeholder"
layer at (19,233) size 162x18
RenderBlock {DIV} at (6,6) size 162x18
-layer at (13,267) size 117x13
+layer at (13,267) size 117x25
+ RenderBlock {DIV} at (3,3) size 117x25
+ RenderText {#text} at (0,6) size 30x13
+ text run at (0,6) width 30: "Value"
+layer at (144,267) size 117x25
+ RenderBlock {DIV} at (3,3) size 117x25 [color=#A9A9A9]
+ RenderText {#text} at (0,6) size 63x13
+ text run at (0,6) width 63: "placeholder"
+layer at (144,267) size 117x25
+ RenderBlock {DIV} at (3,3) size 117x25
+layer at (13,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13
- RenderText {#text} at (0,0) size 30x13
- text run at (0,0) width 30: "Value"
-layer at (144,267) size 117x13
- RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
- RenderText {#text} at (0,0) size 63x13
- text run at (0,0) width 63: "placeholder"
-layer at (144,267) size 117x13
- RenderBlock {DIV} at (3,3) size 117x13
-layer at (13,290) size 117x13
- RenderBlock {DIV} at (3,3) size 117x13
RenderText {#text} at (43,0) size 31x13
text run at (43,0) width 31: "Value"
-layer at (144,290) size 117x13
+layer at (144,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
RenderText {#text} at (27,0) size 63x13
text run at (27,0) width 63: "placeholder"
-layer at (144,290) size 117x13
+layer at (144,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13
-layer at (275,290) size 117x13
+layer at (275,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
RenderText {#text} at (27,0) size 63x13
text run at (27,0) width 63: "placeholder"
-layer at (275,290) size 117x13
+layer at (275,302) size 117x13
RenderBlock {DIV} at (3,3) size 117x13
-layer at (10,310) size 123x33
- RenderTextControl {INPUT} at (2,302) size 123x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (13,327) size 117x13
+layer at (10,322) size 123x33
+ RenderTextControl {INPUT} at (2,314) size 123x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+layer at (13,339) size 117x13
RenderBlock {DIV} at (3,17) size 117x13 [color=#A9A9A9]
RenderText {#text} at (0,0) size 63x13
text run at (0,0) width 63: "placeholder"
-layer at (13,327) size 117x13
+layer at (13,339) size 117x13
RenderBlock {DIV} at (3,17) size 117x13
Modified: trunk/Source/WebCore/ChangeLog (169779 => 169780)
--- trunk/Source/WebCore/ChangeLog 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 23:23:46 UTC (rev 169780)
@@ -1,3 +1,24 @@
+2014-06-10 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Japanese text in Google search is rendered too low and clipped
+ https://bugs.webkit.org/show_bug.cgi?id=133595
+
+ Reviewed by Simon Fraser.
+
+ This is a revert of r155324.
+
+ By forcing line-height to be normal, r155324 was forcing WebKit to inspect font metrics
+ to determine the height of a line. This means that if a fallback font was required to
+ draw a line of text, and the fallback font had a higher ascent than the primary font,
+ the entire line of text would be pushed down. If we don't force line-height to be normal,
+ then we use the line-height value instead, which short circuits this mechanism, thereby
+ not pushing text down.
+
+ No new tests (because this is simply a revert)
+
+ * css/html.css:
+ (input): Deleted.
+
2014-06-10 Zalan Bujtas <za...@apple.com>
REGRESSION (r167937): Do not use effective zoom factor while resolving media query's min-, max-(device)width/height values.
Modified: trunk/Source/WebCore/css/html.css (169779 => 169780)
--- trunk/Source/WebCore/css/html.css 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/Source/WebCore/css/html.css 2014-06-10 23:23:46 UTC (rev 169780)
@@ -407,10 +407,6 @@
text-align: start;
}
-input {
- line-height: normal !important;
-}
-
input[type="hidden"] {
display: none
}
