Title: [96953] branches/chromium/874
- Revision
- 96953
- Author
- [email protected]
- Date
- 2011-10-07 10:02:48 -0700 (Fri, 07 Oct 2011)
Log Message
Merge 96427 - <rdar://problem/10208291> first-letter in generated before content with display: table is not updated
BUG=96427
Review URL: http://codereview.chromium.org/8201005
Modified Paths
Added Paths
Diff
Copied: branches/chromium/874/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.png (from rev 96427, trunk/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.png)
(Binary files differ)
Copied: branches/chromium/874/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt (from rev 96427, trunk/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt) (0 => 96953)
--- branches/chromium/874/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt 2011-10-07 17:02:48 UTC (rev 96953)
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {DIV} at (0,0) size 784x100 [color=#FF0000]
+ RenderText {#text} at (0,0) size 100x100
+ text run at (0,0) width 100: "A"
+ RenderBlock {DIV} at (0,0) size 784x100 [color=#008000]
+ RenderTable at (0,0) size 100x100
+ RenderTableSection (anonymous) at (0,0) size 100x100
+ RenderTableRow (anonymous) at (0,0) size 100x100
+ RenderTableCell (anonymous) at (0,0) size 100x100 [r=0 c=0 rs=1 cs=1]
+ RenderInline (generated) at (0,0) size 100x100
+ RenderText at (0,0) size 100x100
+ text run at (0,0) width 100: "A"
+ RenderText at (0,0) size 0x0
Copied: branches/chromium/874/LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html (from rev 96427, trunk/LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html) (0 => 96953)
--- branches/chromium/874/LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html (rev 0)
+++ branches/chromium/874/LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html 2011-10-07 17:02:48 UTC (rev 96953)
@@ -0,0 +1,13 @@
+<style>
+ #target { color: green; margin-top: -100px; }
+ #target:before { display: table; content: "A"; }
+ #target:first-letter { font-size: 200%; }
+</style>
+<body style="font-family: ahem; -webkit-font-smoothing: none;">
+ <div style="font-size: 100px; color: red;">A</div>
+ <div id="target"></div>
+ <script>
+ document.body.offsetTop;
+ document.getElementById("target").style.fontSize = "50px";
+ </script>
+</body>
Modified: branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp (96952 => 96953)
--- branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-10-07 17:00:44 UTC (rev 96952)
+++ branches/chromium/874/Source/WebCore/rendering/RenderObjectChildList.cpp 2011-10-07 17:02:48 UTC (rev 96953)
@@ -431,6 +431,7 @@
RefPtr<RenderStyle> newStyle = RenderStyle::create();
newStyle->inheritFrom(pseudoElementStyle);
newStyle->setDisplay(curr->style()->display());
+ newStyle->setStyleType(curr->style()->styleType());
curr->setStyle(newStyle);
curr = curr->parent();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
