<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169780] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169780">169780</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 16:23:46 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.webkit.org/projects/webkit/changeset/155324">r155324</a>.
Source/WebCore:
By forcing line-height to be normal, <a href="http://trac.webkit.org/projects/webkit/changeset/155324">r155324</a> 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.
LayoutTests:
* 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastformsplaceholderpositionexpectedtxt">trunk/LayoutTests/fast/forms/placeholder-position-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformsplaceholderpositionexpectedpng">trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformsplaceholderpositionexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmountainlionfastformsplaceholderpositionexpectedtxt">trunk/LayoutTests/platform/mac-mountainlion/fast/forms/placeholder-position-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLInputElementinputlineheightexpectedtxt">trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLInputElementinputlineheighthtml">trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-10 23:13:20 UTC (rev 169779)
+++ trunk/LayoutTests/ChangeLog 2014-06-10 23:23:46 UTC (rev 169780)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-06-10 Myles C. Maxfield <mmaxfield@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:
+
</ins><span class="cx"> 2014-06-10 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r167937): Do not use effective zoom factor while resolving media query's min-, max-(device)width/height values.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLInputElementinputlineheightexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height-expected.txt (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLInputElementinputlineheighthtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLInputElement/input-line-height.html (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
- <head>
- <script src="../../../resources/js-test-pre.js"></script>
- <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>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsplaceholderpositionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/placeholder-position-expected.txt (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,24 +29,24 @@
</span><span class="cx"> RenderBR {BR} at (165,214) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (5,219) size 174x30 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
</span><span class="cx"> RenderBR {BR} at (184,240) size 0x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> layer at (21,13) size 117x13
</span><span class="cx"> RenderBlock {DIV} at (11,3) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (0,0) size 63x13
</span><span class="lines">@@ -95,37 +95,37 @@
</span><span class="cx"> text run at (0,0) width 85: "placeholder"
</span><span class="cx"> layer at (19,233) size 162x18
</span><span class="cx"> RenderBlock {DIV} at (6,6) size 162x18
</span><del>-layer at (13,267) size 117x13
</del><ins>+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
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13
</span><del>- 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
</del><span class="cx"> RenderText {#text} at (43,0) size 31x13
</span><span class="cx"> text run at (43,0) width 31: "Value"
</span><del>-layer at (144,290) size 117x13
</del><ins>+layer at (144,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (27,0) size 63x13
</span><span class="cx"> text run at (27,0) width 63: "placeholder"
</span><del>-layer at (144,290) size 117x13
</del><ins>+layer at (144,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13
</span><del>-layer at (275,290) size 117x13
</del><ins>+layer at (275,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (27,0) size 63x13
</span><span class="cx"> text run at (27,0) width 63: "placeholder"
</span><del>-layer at (275,290) size 117x13
</del><ins>+layer at (275,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13
</span><del>-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
</del><ins>+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
</ins><span class="cx"> RenderBlock {DIV} at (3,17) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (0,0) size 63x13
</span><span class="cx"> text run at (0,0) width 63: "placeholder"
</span><del>-layer at (13,327) size 117x13
</del><ins>+layer at (13,339) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,17) size 117x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsplaceholderpositionexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsplaceholderpositionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,24 +29,24 @@
</span><span class="cx"> RenderBR {BR} at (165,214) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (5,219) size 202x30 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
</span><span class="cx"> RenderBR {BR} at (211,240) size 1x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> layer at (21,13) size 139x13
</span><span class="cx"> RenderBlock {DIV} at (11,3) size 140x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (0,0) size 63x13
</span><span class="lines">@@ -95,37 +95,37 @@
</span><span class="cx"> text run at (0,0) width 85: "placeholder"
</span><span class="cx"> layer at (19,233) size 190x18
</span><span class="cx"> RenderBlock {DIV} at (6,6) size 190x18
</span><del>-layer at (13,267) size 139x13
</del><ins>+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
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 140x13
</span><del>- 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
</del><span class="cx"> RenderText {#text} at (54,0) size 31x13
</span><span class="cx"> text run at (54,0) width 31: "Value"
</span><del>-layer at (166,290) size 139x13
</del><ins>+layer at (166,302) size 139x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 140x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (38,0) size 63x13
</span><span class="cx"> text run at (38,0) width 63: "placeholder"
</span><del>-layer at (166,290) size 139x13
</del><ins>+layer at (166,302) size 139x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 140x13
</span><del>-layer at (319,290) size 139x13
</del><ins>+layer at (319,302) size 139x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 140x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (38,0) size 63x13
</span><span class="cx"> text run at (38,0) width 63: "placeholder"
</span><del>-layer at (319,290) size 139x13
</del><ins>+layer at (319,302) size 139x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 140x13
</span><del>-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
</del><ins>+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
</ins><span class="cx"> RenderBlock {DIV} at (3,17) size 140x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (0,0) size 63x13
</span><span class="cx"> text run at (0,0) width 63: "placeholder"
</span><del>-layer at (13,327) size 139x13
</del><ins>+layer at (13,339) size 139x13
</ins><span class="cx"> RenderBlock {DIV} at (3,17) size 140x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmountainlionfastformsplaceholderpositionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mountainlion/fast/forms/placeholder-position-expected.txt (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,24 +29,24 @@
</span><span class="cx"> RenderBR {BR} at (165,214) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (5,219) size 174x30 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
</span><span class="cx"> RenderBR {BR} at (184,240) size 0x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> layer at (21,13) size 117x13
</span><span class="cx"> RenderBlock {DIV} at (11,3) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (0,0) size 63x13
</span><span class="lines">@@ -95,37 +95,37 @@
</span><span class="cx"> text run at (0,0) width 85: "placeholder"
</span><span class="cx"> layer at (19,233) size 162x18
</span><span class="cx"> RenderBlock {DIV} at (6,6) size 162x18
</span><del>-layer at (13,267) size 117x13
</del><ins>+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
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13
</span><del>- 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
</del><span class="cx"> RenderText {#text} at (43,0) size 31x13
</span><span class="cx"> text run at (43,0) width 31: "Value"
</span><del>-layer at (144,290) size 117x13
</del><ins>+layer at (144,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (27,0) size 63x13
</span><span class="cx"> text run at (27,0) width 63: "placeholder"
</span><del>-layer at (144,290) size 117x13
</del><ins>+layer at (144,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13
</span><del>-layer at (275,290) size 117x13
</del><ins>+layer at (275,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (27,0) size 63x13
</span><span class="cx"> text run at (27,0) width 63: "placeholder"
</span><del>-layer at (275,290) size 117x13
</del><ins>+layer at (275,302) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 117x13
</span><del>-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
</del><ins>+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
</ins><span class="cx"> RenderBlock {DIV} at (3,17) size 117x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (0,0) size 63x13
</span><span class="cx"> text run at (0,0) width 63: "placeholder"
</span><del>-layer at (13,327) size 117x13
</del><ins>+layer at (13,339) size 117x13
</ins><span class="cx"> RenderBlock {DIV} at (3,17) size 117x13
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-06-10 Myles C. Maxfield <mmaxfield@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.
+
</ins><span class="cx"> 2014-06-10 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r167937): Do not use effective zoom factor while resolving media query's min-, max-(device)width/height values.
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (169779 => 169780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -407,10 +407,6 @@
</span><span class="cx"> text-align: start;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-input {
- line-height: normal !important;
-}
-
</del><span class="cx"> input[type="hidden"] {
</span><span class="cx"> display: none
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>