Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104100 => 104101)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 01:04:36 UTC (rev 104100)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 01:11:53 UTC (rev 104101)
@@ -1,5 +1,29 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 97180
+
+ 2011-10-05 Abhishek Arya <[email protected]>
+
+ Style for updated due to inability to locate
+ :before content in presence of listmarkers and runins.
+ https://bugs.webkit.org/show_bug.cgi?id=68624
+
+ Reviewed by Eric Seidel.
+
+ * fast/lists/inline-before-content-after-list-marker-expected.png: Added.
+ * fast/lists/inline-before-content-after-list-marker-expected.txt: Added.
+ * fast/lists/inline-before-content-after-list-marker.html: Added.
+ * fast/runin/runin-between-list-marker-and-before-content-expected.png: Added.
+ * fast/runin/runin-between-list-marker-and-before-content-expected.txt: Added.
+ * fast/runin/runin-between-list-marker-and-before-content.html: Added.
+ * fast/runin/runin-into-div-with-float-child-expected.png: Added.
+ * fast/runin/runin-into-div-with-float-child-expected.txt: Added.
+ * fast/runin/runin-into-div-with-float-child.html: Added.
+ * fast/runin/runin-not-go-into-float-expected.png: Added.
+ * fast/runin/runin-not-go-into-float-expected.txt: Added.
+ * fast/runin/runin-not-go-into-float.html: Added.
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 97124
2011-10-10 Abhishek Arya <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/fast/table/table-row-before-after-content-around-table-cell-expected.png (from rev 97180, trunk/LayoutTests/fast/table/table-row-before-after-content-around-table-cell-expected.png)
(Binary files differ)
Copied: branches/safari-534.54-branch/LayoutTests/fast/table/table-row-before-after-content-around-table-cell-expected.txt (from rev 97180, trunk/LayoutTests/fast/table/table-row-before-after-content-around-table-cell-expected.txt) (0 => 104101)
--- branches/safari-534.54-branch/LayoutTests/fast/table/table-row-before-after-content-around-table-cell-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/table/table-row-before-after-content-around-table-cell-expected.txt 2012-01-05 01:11:53 UTC (rev 104101)
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x116
+ RenderBlock {HTML} at (0,0) size 800x116
+ RenderBody {BODY} at (8,8) size 784x100
+ RenderBlock {DIV} at (0,0) size 784x100
+ RenderTable at (0,0) size 300x100
+ RenderTableSection (anonymous) at (0,0) size 300x100
+ RenderTableRow {DIV} at (0,0) size 300x100
+ RenderTableCell (anonymous) at (0,0) size 100x100 [r=0 c=0 rs=1 cs=1]
+ RenderInline (generated) at (0,0) size 100x100 [color=#0000FF]
+ RenderText at (0,0) size 100x100
+ text run at (0,0) width 100: "A"
+ RenderTableCell {DIV} at (100,0) size 100x100 [color=#008000] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 100x100
+ text run at (0,0) width 100: "B"
+ RenderTableCell (anonymous) at (200,0) size 100x100 [r=0 c=2 rs=1 cs=1]
+ RenderInline (generated) at (0,0) size 100x100 [color=#FFA500]
+ RenderText at (0,0) size 100x100
+ text run at (0,0) width 100: "C"
Copied: branches/safari-534.54-branch/LayoutTests/fast/table/table-row-before-after-content-around-table-cell.html (from rev 97180, trunk/LayoutTests/fast/table/table-row-before-after-content-around-table-cell.html) (0 => 104101)
--- branches/safari-534.54-branch/LayoutTests/fast/table/table-row-before-after-content-around-table-cell.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/table/table-row-before-after-content-around-table-cell.html 2012-01-05 01:11:53 UTC (rev 104101)
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<body style="font-family: ahem; -webkit-font-smoothing: none;">
+<style>
+.tr { display: table-row; }
+.td { display: table-cell; }
+div.tr:before { content: "A"; color: blue; }
+div.tr:after { content: "C"; color: orange; }
+</style>
+<body>
+<div>
+<div class="tr">
+<div class="td" style="color: green">B</div>
+</div>
+</div>
+<script>
+document.body.style.fontSize = "100px";
+</script>
+</body>
+</html>
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104100 => 104101)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 01:04:36 UTC (rev 104100)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 01:11:53 UTC (rev 104101)
@@ -1,3 +1,20 @@
+2011-1-4 Lucas Forschler <[email protected]>
+
+ Merge 97180
+
+ 2011-10-11 Abhishek Arya <[email protected]>
+
+ Generalize r95461 change to include table-cell and
+ allow splitting between :before, :after content.
+ https://bugs.webkit.org/show_bug.cgi?id=69854
+
+ Reviewed by Eric Seidel.
+
+ Test: fast/table/table-row-before-after-content-around-table-cell.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::addChild):
+
2012-01-04 Oliver Hunt <[email protected]>
Merge r94457
@@ -37,6 +54,23 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 97180
+
+ 2011-10-11 Abhishek Arya <[email protected]>
+
+ Generalize r95461 change to include table-cell and
+ allow splitting between :before, :after content.
+ https://bugs.webkit.org/show_bug.cgi?id=69854
+
+ Reviewed by Eric Seidel.
+
+ Test: fast/table/table-row-before-after-content-around-table-cell.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::addChild):
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 97124
2011-10-10 Abhishek Arya <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp (104100 => 104101)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-05 01:04:36 UTC (rev 104100)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-05 01:11:53 UTC (rev 104101)
@@ -272,7 +272,7 @@
RenderObject* beforeContent = 0;
bool beforeChildHasBeforeAndAfterContent = false;
- if (beforeChild && (beforeChild->isTable() || beforeChild->isTableSection() || beforeChild->isTableRow())) {
+ if (beforeChild && (beforeChild->isTable() || beforeChild->isTableSection() || beforeChild->isTableRow() || beforeChild->isTableCell())) {
beforeContent = beforeChild->findBeforeContentRenderer();
RenderObject* afterContent = beforeChild->findAfterContentRenderer();
if (beforeContent && afterContent) {
