Diff
Modified: trunk/LayoutTests/ChangeLog (176524 => 176525)
--- trunk/LayoutTests/ChangeLog 2014-11-24 22:12:53 UTC (rev 176524)
+++ trunk/LayoutTests/ChangeLog 2014-11-24 23:56:37 UTC (rev 176525)
@@ -1,3 +1,13 @@
+2014-11-24 Zalan Bujtas <[email protected]>
+
+ Simple line layout: fast/text/simple-lines-multiple-renderers test has the wrong content.
+ https://bugs.webkit.org/show_bug.cgi?id=139036
+
+ Swap simple-lines-multiple-renderers.html and simple-lines-multiple-renderers-expected.html
+
+ * fast/text/simple-lines-multiple-renderers-expected.html:
+ * fast/text/simple-lines-multiple-renderers.html:
+
2014-11-24 Joanmarie Diggs <[email protected]>
AX: [ATK] Unskip the skipped ATK tests in roles-exposed.html
Modified: trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html (176524 => 176525)
--- trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html 2014-11-24 22:12:53 UTC (rev 176524)
+++ trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html 2014-11-24 23:56:37 UTC (rev 176525)
@@ -8,19 +8,16 @@
</script>
</head>
<body>
-<div id=container>
+<div>
+ Quo usque tandem abutere, Catilina, patientia nostra? quam diu etiam
+ furor iste tuus nos eludet? quem ad finem sese effrenata iactabit
+ audacia? Nihilne te nocturnum praesidium Palati, nihil urbis vigiliae,
+ nihil timor populi, nihil concursus bonorum omnium, nihil hic munitissimus
+ habendi senatus locus, nihil horum ora voltusque moverunt? Patere tua
+ consilia non sentis, constrictam iam horum omnium scientia teneri
+ coniurationem tuam non vides? Quid proxima, quid superiore nocte egeris,
+ ubi fueris, quos convocaveris, quid consilii ceperis, quem nostrum
+ ignorare arbitraris? O tempora, o mores!
</div>
-<script>
- var container = document.getElementById("container");
- container.appendChild(document.createTextNode("Quo usque tandem abutere, Catilina, patientia nostra? quam diu etiam\n"));
- container.appendChild(document.createTextNode("furor iste tuus nos eludet? quem ad finem sese effrenata iactabit\n"));
- container.appendChild(document.createTextNode("audacia? Nihilne te nocturnum praesidium Palati, nihil urbis vigiliae,\n"));
- container.appendChild(document.createTextNode("nihil timor populi, nihil concursus bonorum omnium, nihil hic munitissimus\n"));
- container.appendChild(document.createTextNode("habendi senatus locus, nihil horum ora voltusque moverunt? Patere tua\n"));
- container.appendChild(document.createTextNode("consilia non sentis, constrictam iam horum omnium scientia teneri\n"));
- container.appendChild(document.createTextNode("coniurationem tuam non vides? Quid proxima, quid superiore nocte egeris,\n"));
- container.appendChild(document.createTextNode("ubi fueris, quos convocaveris, quid consilii ceperis, quem nostrum\n"));
- container.appendChild(document.createTextNode("ignorare arbitraris? O tempora, o mores!\n"));
-</script>
</body>
</html>
Modified: trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html (176524 => 176525)
--- trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html 2014-11-24 22:12:53 UTC (rev 176524)
+++ trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html 2014-11-24 23:56:37 UTC (rev 176525)
@@ -8,16 +8,19 @@
</script>
</head>
<body>
-<div>
- Quo usque tandem abutere, Catilina, patientia nostra? quam diu etiam
- furor iste tuus nos eludet? quem ad finem sese effrenata iactabit
- audacia? Nihilne te nocturnum praesidium Palati, nihil urbis vigiliae,
- nihil timor populi, nihil concursus bonorum omnium, nihil hic munitissimus
- habendi senatus locus, nihil horum ora voltusque moverunt? Patere tua
- consilia non sentis, constrictam iam horum omnium scientia teneri
- coniurationem tuam non vides? Quid proxima, quid superiore nocte egeris,
- ubi fueris, quos convocaveris, quid consilii ceperis, quem nostrum
- ignorare arbitraris? O tempora, o mores!
+<div id=container>
</div>
+<script>
+ var container = document.getElementById("container");
+ container.appendChild(document.createTextNode("Quo usque tandem abutere, Catilina, patientia nostra? quam diu etiam\n"));
+ container.appendChild(document.createTextNode("furor iste tuus nos eludet? quem ad finem sese effrenata iactabit\n"));
+ container.appendChild(document.createTextNode("audacia? Nihilne te nocturnum praesidium Palati, nihil urbis vigiliae,\n"));
+ container.appendChild(document.createTextNode("nihil timor populi, nihil concursus bonorum omnium, nihil hic munitissimus\n"));
+ container.appendChild(document.createTextNode("habendi senatus locus, nihil horum ora voltusque moverunt? Patere tua\n"));
+ container.appendChild(document.createTextNode("consilia non sentis, constrictam iam horum omnium scientia teneri\n"));
+ container.appendChild(document.createTextNode("coniurationem tuam non vides? Quid proxima, quid superiore nocte egeris,\n"));
+ container.appendChild(document.createTextNode("ubi fueris, quos convocaveris, quid consilii ceperis, quem nostrum\n"));
+ container.appendChild(document.createTextNode("ignorare arbitraris? O tempora, o mores!\n"));
+</script>
</body>
</html>