Title: [138998] branches/safari-536.28-branch/LayoutTests
- Revision
- 138998
- Author
- lforsch...@apple.com
- Date
- 2013-01-07 15:18:27 -0800 (Mon, 07 Jan 2013)
Log Message
Merged r125813.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: branches/safari-536.28-branch/LayoutTests/ChangeLog (138997 => 138998)
--- branches/safari-536.28-branch/LayoutTests/ChangeLog 2013-01-07 23:17:36 UTC (rev 138997)
+++ branches/safari-536.28-branch/LayoutTests/ChangeLog 2013-01-07 23:18:27 UTC (rev 138998)
@@ -1,3 +1,17 @@
+2012-12-12 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r125813
+
+ 2012-08-16 Ojan Vafai <o...@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 <lforsch...@apple.com>
Rebaseline Chopin SVG results.
Deleted: branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns-expected.html (138997 => 138998)
--- branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns-expected.html 2013-01-07 23:17:36 UTC (rev 138997)
+++ branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns-expected.html 2013-01-07 23:18:27 UTC (rev 138998)
@@ -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>
Copied: branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt (from rev 125813, trunk/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt) (0 => 138998)
--- branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt (rev 0)
+++ branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns-expected.txt 2013-01-07 23:18:27 UTC (rev 138998)
@@ -0,0 +1 @@
+AAA X
Modified: branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns.html (138997 => 138998)
--- branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns.html 2013-01-07 23:17:36 UTC (rev 138997)
+++ branches/safari-536.28-branch/LayoutTests/fast/overflow/line-clamp-and-columns.html 2013-01-07 23:18:27 UTC (rev 138998)
@@ -4,6 +4,9 @@
</div>
<script>
document.body.offsetTop;
+// If the page doesn't crash under AddressSanitizer, then the test passes.
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
</script>
<style>
body {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
