Log Message
Merged r97114.
Modified Paths
- branches/safari-534.54-branch/LayoutTests/ChangeLog
- branches/safari-534.54-branch/Source/WebCore/ChangeLog
- branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp
- branches/safari-534.54-branch/Source/WebCore/rendering/RenderTable.cpp
Added Paths
- branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.png
- branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.txt
- branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after.html
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104096 => 104097)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 00:40:06 UTC (rev 104096)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-05 00:54:01 UTC (rev 104097)
@@ -1,5 +1,19 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 97114
+
+ 2011-10-10 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10246137> Duplicate ::after content when both ::before and ::after are styled as table parts
+
+ Reviewed by Sam Weinig.
+
+ * fast/css-generated-content/table-parts-before-and-after-expected.png: Added.
+ * fast/css-generated-content/table-parts-before-and-after-expected.txt: Added.
+ * fast/css-generated-content/table-parts-before-and-after.html: Added.
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 97075
2011-10-10 Abhishek Arya <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.png (from rev 97114, trunk/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.png)
(Binary files differ)
Copied: branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.txt (from rev 97114, trunk/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.txt) (0 => 104097)
--- branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after-expected.txt 2012-01-05 00:54:01 UTC (rev 104097)
@@ -0,0 +1,101 @@
+layer at (0,0) size 785x736
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x736
+ RenderBlock {HTML} at (0,0) size 785x736
+ RenderBody {BODY} at (8,8) size 769x720
+ RenderBlock {DIV} at (0,0) size 769x120
+ RenderTable at (0,0) size 40x40
+ RenderTableSection (anonymous) at (0,0) size 40x40
+ RenderTableRow (anonymous) at (0,0) size 40x40
+ RenderTableCell (anonymous) at (0,0) size 40x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 40x40
+ text run at (0,0) width 40: "1"
+ RenderBlock (anonymous) at (0,40) size 769x40
+ RenderText {#text} at (0,0) size 80x40
+ text run at (0,0) width 80: "22"
+ RenderTable at (0,80) size 120x40
+ RenderTableSection (anonymous) at (0,0) size 120x40
+ RenderTableRow (anonymous) at (0,0) size 120x40
+ RenderTableCell (anonymous) at (0,0) size 120x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 120x40
+ text run at (0,0) width 120: "333"
+ RenderBlock {DIV} at (0,120) size 769x120 [color=#0000FF]
+ RenderTable at (0,0) size 40x40
+ RenderTableSection (anonymous) at (0,0) size 40x40
+ RenderTableRow (anonymous) at (0,0) size 40x40
+ RenderTableCell (anonymous) at (0,0) size 40x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 40x40
+ text run at (0,0) width 40: "1"
+ RenderBlock (anonymous) at (0,40) size 769x40
+ RenderText {#text} at (0,0) size 80x40
+ text run at (0,0) width 80: "22"
+ RenderTable at (0,80) size 120x40
+ RenderTableSection (anonymous) at (0,0) size 120x40
+ RenderTableRow (anonymous) at (0,0) size 120x40
+ RenderTableCell (anonymous) at (0,0) size 120x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 120x40
+ text run at (0,0) width 120: "333"
+ RenderBlock {DIV} at (0,240) size 769x120
+ RenderTable at (0,0) size 40x40
+ RenderTableSection (anonymous) at (0,0) size 40x40
+ RenderTableRow (anonymous) at (0,0) size 40x40
+ RenderTableCell (anonymous) at (0,0) size 40x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 40x40
+ text run at (0,0) width 40: "1"
+ RenderBlock (anonymous) at (0,40) size 769x40
+ RenderText {#text} at (0,0) size 80x40
+ text run at (0,0) width 80: "22"
+ RenderTable at (0,80) size 120x40
+ RenderTableSection (anonymous) at (0,0) size 120x40
+ RenderTableRow (anonymous) at (0,0) size 120x40
+ RenderTableCell (anonymous) at (0,0) size 120x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 120x40
+ text run at (0,0) width 120: "333"
+ RenderBlock {DIV} at (0,360) size 769x120 [color=#0000FF]
+ RenderTable at (0,0) size 40x40
+ RenderTableSection (anonymous) at (0,0) size 40x40
+ RenderTableRow (anonymous) at (0,0) size 40x40
+ RenderTableCell (anonymous) at (0,0) size 40x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 40x40
+ text run at (0,0) width 40: "1"
+ RenderBlock (anonymous) at (0,40) size 769x40
+ RenderText {#text} at (0,0) size 80x40
+ text run at (0,0) width 80: "22"
+ RenderTable at (0,80) size 120x40
+ RenderTableSection (anonymous) at (0,0) size 120x40
+ RenderTableRow (anonymous) at (0,0) size 120x40
+ RenderTableCell (anonymous) at (0,0) size 120x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 120x40
+ text run at (0,0) width 120: "333"
+ RenderBlock {DIV} at (0,480) size 769x120
+ RenderTable at (0,0) size 40x40
+ RenderTableSection (anonymous) at (0,0) size 40x40
+ RenderTableRow (anonymous) at (0,0) size 40x40
+ RenderTableCell (anonymous) at (0,0) size 40x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 40x40
+ text run at (0,0) width 40: "1"
+ RenderBlock (anonymous) at (0,40) size 769x40
+ RenderText {#text} at (0,0) size 80x40
+ text run at (0,0) width 80: "22"
+ RenderTable at (0,80) size 120x40
+ RenderTableSection (anonymous) at (0,0) size 120x40
+ RenderTableRow (anonymous) at (0,0) size 120x40
+ RenderTableCell (anonymous) at (0,0) size 120x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 120x40
+ text run at (0,0) width 120: "333"
+ RenderBlock {DIV} at (0,600) size 769x120 [color=#0000FF]
+ RenderTable at (0,0) size 40x40
+ RenderTableSection (anonymous) at (0,0) size 40x40
+ RenderTableRow (anonymous) at (0,0) size 40x40
+ RenderTableCell (anonymous) at (0,0) size 40x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 40x40
+ text run at (0,0) width 40: "1"
+ RenderBlock (anonymous) at (0,40) size 769x40
+ RenderText {#text} at (0,0) size 80x40
+ text run at (0,0) width 80: "22"
+ RenderTable at (0,80) size 120x40
+ RenderTableSection (anonymous) at (0,0) size 120x40
+ RenderTableRow (anonymous) at (0,0) size 120x40
+ RenderTableCell (anonymous) at (0,0) size 120x40 [r=0 c=0 rs=1 cs=1]
+ RenderText at (0,0) size 120x40
+ text run at (0,0) width 120: "333"
Copied: branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after.html (from rev 97114, trunk/LayoutTests/fast/css-generated-content/table-parts-before-and-after.html) (0 => 104097)
--- branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/css-generated-content/table-parts-before-and-after.html 2012-01-05 00:54:01 UTC (rev 104097)
@@ -0,0 +1,39 @@
+<style>
+ body {
+ font-family: ahem;
+ font-size: 40px;
+ -webkit-font-smoothing: none;
+ }
+
+ div::before {
+ content: "1";
+ }
+
+ div.table-before::before {
+ display: table;
+ }
+
+ div.row-group-before::before {
+ display: table-row-group;
+ }
+
+ div.row-before::before {
+ display: table-row;
+ }
+
+ div::after {
+ content: "333";
+ display: table-cell;
+ }
+</style>
+<div class="table-before">22</div>
+<div id="target-1" class="table-before">22</div>
+<div class="row-group-before">22</div>
+<div id="target-2" class="row-group-before">22</div>
+<div class="row-before">22</div>
+<div id="target-3" class="row-before">22</div>
+<script>
+ document.getElementById("target-1").style.color = "blue";
+ document.getElementById("target-2").style.color = "blue";
+ document.getElementById("target-3").style.color = "blue";
+</script>
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104096 => 104097)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 00:40:06 UTC (rev 104096)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-05 00:54:01 UTC (rev 104097)
@@ -1,5 +1,24 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 97114
+
+ 2011-10-10 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10246137> Duplicate ::after content when both ::before and ::after are styled as table parts
+
+ Reviewed by Sam Weinig.
+
+ Test: fast/css-generated-content/table-parts-before-and-after.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::addChild): Prevented table part childern after a ::before table from being merged
+ into it.
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::addChild): Prevented children after a ::before table section from being merged
+ into it.
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 97075
2011-10-10 Abhishek Arya <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp (104096 => 104097)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-05 00:40:06 UTC (rev 104096)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-05 00:54:01 UTC (rev 104097)
@@ -304,7 +304,7 @@
if (needsTable) {
RenderTable* table;
RenderObject* afterChild = beforeChild ? beforeChild->previousSibling() : children->lastChild();
- if (afterChild && afterChild->isAnonymous() && afterChild->isTable())
+ if (afterChild && afterChild->isAnonymous() && afterChild->isTable() && !afterChild->isBeforeContent())
table = toRenderTable(afterChild);
else {
table = new (renderArena()) RenderTable(document() /* is anonymous */);
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderTable.cpp (104096 => 104097)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderTable.cpp 2012-01-05 00:40:06 UTC (rev 104096)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderTable.cpp 2012-01-05 00:54:01 UTC (rev 104097)
@@ -174,7 +174,7 @@
return;
}
- if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChild()->isAnonymous()) {
+ if (!beforeChild && lastChild() && lastChild()->isTableSection() && lastChild()->isAnonymous() && !lastChild()->isBeforeContent()) {
lastChild()->addChild(child);
return;
}
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
