Changeset 138998 in webkit

Timestamp:

Jan 7, 2013, 3:18:27 PM (13 years ago)

Author:

Lucas Forschler

Message:

Merged r125813.

Location:

branches/safari-536.28-branch/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/overflow/line-clamp-and-columns-expected.html (deleted)
• fast/overflow/line-clamp-and-columns-expected.txt (copied) (copied from trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt )
• fast/overflow/line-clamp-and-columns.html (modified) (1 diff)

branches/safari-536.28-branch/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-12  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r125813
+
+    2012-08-16  Ojan Vafai  <ojan@chromium.org>
+
+            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:
+
 2013-01-02  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns.html

@@ -5 +5 @@
 <script>
 document.body.offsetTop;
+// If the page doesn't crash under AddressSanitizer, then the test passes.
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
 </script>
 <style>