From 0564c12f54f1c4ffd4ddb5a438fffb58b83820b8 Mon Sep 17 00:00:00 2001
From: "mitz@apple.com" <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 30 Sep 2011 21:36:57 +0000
Subject: [PATCH] <rdar://problem/10208291> first-letter in generated before
 content with display: table is not updated

Reviewed by Sam Weinig.

Source/WebCore:

Test: fast/css-generated-content/first-letter-in-nested-before.html

* rendering/RenderObjectChildList.cpp:
(WebCore::RenderObjectChildList::updateBeforeAfterContent): Preserve the style type of anonymous
containers around the generated content when updating their style. This preserves the first-letter-ness
of the inline wrapping the first letter, which allows updateFirstLetter() to identify it later.

LayoutTests:

* fast/css-generated-content/first-letter-in-nested-before-expected.png: Added.
* fast/css-generated-content/first-letter-in-nested-before-expected.txt: Added.
* fast/css-generated-content/first-letter-in-nested-before.html: Added.



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@96427 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                                  |  10 ++++++++++
 .../first-letter-in-nested-before-expected.png         | Bin 0 -> 11389 bytes
 .../first-letter-in-nested-before-expected.txt         |  17 +++++++++++++++++
 .../first-letter-in-nested-before.html                 |  13 +++++++++++++
 Source/WebCore/ChangeLog                               |  13 +++++++++++++
 Source/WebCore/rendering/RenderObjectChildList.cpp     |   1 +
 Source/WebCore/rendering/RenderView.cpp                |   4 ++++
 7 files changed, 58 insertions(+)
 create mode 100644 LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.png
 create mode 100644 LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt
 create mode 100644 LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7c76356..5bfd34f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-09-30  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10208291> first-letter in generated before content with display: table is not updated
+
+        Reviewed by Sam Weinig.
+
+        * fast/css-generated-content/first-letter-in-nested-before-expected.png: Added.
+        * fast/css-generated-content/first-letter-in-nested-before-expected.txt: Added.
+        * fast/css-generated-content/first-letter-in-nested-before.html: Added.
+
 2011-09-30  David Hyatt  <hyatt@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=69167
diff --git a/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.png b/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..6835cd5a7d9a7be266316f1b8673eea9a62bd852
GIT binary patch
literal 11389
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

literal 0
HcmV?d00001

diff --git a/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt b/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt
new file mode 100644
index 0000000..7b01704
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt
@@ -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
diff --git a/LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html b/LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html
new file mode 100644
index 0000000..6c3624b
--- /dev/null
+++ b/LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html
@@ -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>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f771ed6..814ed07 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-09-30  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10208291> first-letter in generated before content with display: table is not updated
+
+        Reviewed by Sam Weinig.
+
+        Test: fast/css-generated-content/first-letter-in-nested-before.html
+
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore::RenderObjectChildList::updateBeforeAfterContent): Preserve the style type of anonymous
+        containers around the generated content when updating their style. This preserves the first-letter-ness
+        of the inline wrapping the first letter, which allows updateFirstLetter() to identify it later.
+
 2011-09-30  Cary Clark  <caryclark@google.com>
 
         Inset focus ring (Skia on Mac)
diff --git a/Source/WebCore/rendering/RenderObjectChildList.cpp b/Source/WebCore/rendering/RenderObjectChildList.cpp
index 04f8f70..0e68f9c 100644
--- a/Source/WebCore/rendering/RenderObjectChildList.cpp
+++ b/Source/WebCore/rendering/RenderObjectChildList.cpp
@@ -434,6 +434,7 @@ void RenderObjectChildList::updateBeforeAfterContent(RenderObject* owner, Pseudo
                     RefPtr<RenderStyle> newStyle = RenderStyle::create();
                     newStyle->inheritFrom(pseudoElementStyle);
                     newStyle->setDisplay(curr->style()->display());
+                    newStyle->setStyleType(curr->style()->styleType());
                     curr->setStyle(newStyle);
                     curr = curr->parent();
                 }
diff --git a/Source/WebCore/rendering/RenderView.cpp b/Source/WebCore/rendering/RenderView.cpp
index 1fefac4..775b15d 100644
--- a/Source/WebCore/rendering/RenderView.cpp
+++ b/Source/WebCore/rendering/RenderView.cpp
@@ -142,6 +142,10 @@ void RenderView::layout()
     ASSERT(m_layoutState == &state);
     m_layoutState = 0;
     setNeedsLayout(false);
+#if !ASSERT_DISABLED
+    for (RenderObject* renderer = this; renderer; renderer = renderer->nextInPreOrder())
+        ASSERT(!renderer->needsLayout());
+#endif
 }
 
 void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
-- 
1.8.3.1