Title: [117876] branches/chromium/1132
- Revision
- 117876
- Author
- [email protected]
- Date
- 2012-05-21 19:33:32 -0700 (Mon, 21 May 2012)
Log Message
Merge 117309
BUG=120912
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1132/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash-expected.txt (from rev 117309, trunk/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash-expected.txt) (0 => 117876)
--- branches/chromium/1132/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash-expected.txt (rev 0)
+++ branches/chromium/1132/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash-expected.txt 2012-05-22 02:33:32 UTC (rev 117876)
@@ -0,0 +1 @@
+PASS, if no crash or assert in debug build.
Copied: branches/chromium/1132/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash.html (from rev 117309, trunk/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash.html) (0 => 117876)
--- branches/chromium/1132/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash.html (rev 0)
+++ branches/chromium/1132/LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash.html 2012-05-22 02:33:32 UTC (rev 117876)
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<style>
+#test0 {
+ -webkit-column-count:2;
+ display: table-cell;
+}
+#test0::first-letter {
+ background-size: auto;
+}
+#test1 {
+ float: right;
+}
+</style>
+<script>
+ _onload_ = function() {
+ test0=document.createElement('div');
+ test0.setAttribute('id', 'test0');
+ document.body.appendChild(test0);
+ test1=document.createElement('div');
+ test1.setAttribute('id', 'test1');
+ test0.appendChild(test1);
+ test0.appendChild(document.createTextNode(unescape('%u3200A')));
+ document.designMode = 'on';
+ window.getSelection().setBaseAndExtent(test1, 0, test1, 0);
+ document.execCommand('InsertLineBreak');
+ document.execCommand('selectall');
+ document.execCommand('strikethrough');
+ document.execCommand('FormatBlock', false, '<'+'pre>');
+
+ document.body.offsetTop;
+ document.body.innerHTML = "PASS, if no crash or assert in debug build."
+
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ }
+</script>
+<body>
+</body>
+</html>
Modified: branches/chromium/1132/Source/WebCore/rendering/RenderTableCell.cpp (117875 => 117876)
--- branches/chromium/1132/Source/WebCore/rendering/RenderTableCell.cpp 2012-05-22 02:32:14 UTC (rev 117875)
+++ branches/chromium/1132/Source/WebCore/rendering/RenderTableCell.cpp 2012-05-22 02:33:32 UTC (rev 117876)
@@ -186,6 +186,7 @@
void RenderTableCell::layout()
{
+ updateFirstLetter();
layoutBlock(cellWidthChanged());
setCellWidthChanged(false);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
