Title: [125813] trunk/LayoutTests
Revision
125813
Author
[email protected]
Date
2012-08-16 15:01:24 -0700 (Thu, 16 Aug 2012)

Log Message

Fix test added in r125635. The test failed on non-chromium ports due
to the column sizing 1px differently. I'm not really sure what was going on,
but this was a fix for a crash anyways. Just marking the test dumpAsText.

* fast/overflow/line-clamp-and-columns-expected.html: Removed.
* fast/overflow/line-clamp-and-columns-expected.txt: Added.
* fast/overflow/line-clamp-and-columns.html:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (125812 => 125813)


--- trunk/LayoutTests/ChangeLog	2012-08-16 21:45:12 UTC (rev 125812)
+++ trunk/LayoutTests/ChangeLog	2012-08-16 22:01:24 UTC (rev 125813)
@@ -1,3 +1,13 @@
+2012-08-16  Ojan Vafai  <[email protected]>
+
+        Fix test added in r125635. The test failed on non-chromium ports due
+        to the column sizing 1px differently. I'm not really sure what was going on,
+        but this was a fix for a crash anyways. Just marking the test dumpAsText.
+
+        * fast/overflow/line-clamp-and-columns-expected.html: Removed.
+        * fast/overflow/line-clamp-and-columns-expected.txt: Added.
+        * fast/overflow/line-clamp-and-columns.html:
+
 2012-08-16  Abhishek Arya  <[email protected]>
 
         Regression(r118248): Replaced element not layout

Deleted: trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.html (125812 => 125813)


--- trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.html	2012-08-16 21:45:12 UTC (rev 125812)
+++ trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.html	2012-08-16 22:01:24 UTC (rev 125813)
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<body style="width: 51px">
-<div id=flexbox style="-webkit-box-orient: vertical; -webkit-line-clamp: 1; display: -webkit-box; background-color: salmon; overflow:hidden">
-    <span>AAA </span><a href=""
-</div>
-</body>

Added: trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt (0 => 125813)


--- trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt	2012-08-16 22:01:24 UTC (rev 125813)
@@ -0,0 +1 @@
+AAA X
Property changes on: trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt
___________________________________________________________________

Added: svn:eol-style

Modified: trunk/LayoutTests/fast/overflow/line-clamp-and-columns.html (125812 => 125813)


--- trunk/LayoutTests/fast/overflow/line-clamp-and-columns.html	2012-08-16 21:45:12 UTC (rev 125812)
+++ trunk/LayoutTests/fast/overflow/line-clamp-and-columns.html	2012-08-16 22:01:24 UTC (rev 125813)
@@ -4,6 +4,9 @@
 </div>
 <script>
 document.body.offsetTop;
+// If the page doesn't crash under AddressSanitizer, then the test passes.
+if (window.testRunner)
+    testRunner.dumpAsText();
 </script>
 <style>
 body {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to