Changeset 96427 in webkit

Timestamp:

Sep 30, 2011 2:36:57 PM (13 years ago)

Author:

mitz@apple.com

Message:

<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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.png (added)
• LayoutTests/fast/css-generated-content/first-letter-in-nested-before-expected.txt (added)
• LayoutTests/fast/css-generated-content/first-letter-in-nested-before.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObjectChildList.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/rendering/RenderObjectChildList.cpp

@@ -435 +435 @@
                     newStyle->inheritFrom(pseudoElementStyle);
                     newStyle->setDisplay(curr->style()->display());
+                    newStyle->setStyleType(curr->style()->styleType());
                     curr->setStyle(newStyle);
                     curr = curr->parent();

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -143 +143 @@
     m_layoutState = 0;
     setNeedsLayout(false);
+#if !ASSERT_DISABLED
+    for (RenderObject* renderer = this; renderer; renderer = renderer->nextInPreOrder())
+        ASSERT(!renderer->needsLayout());
+#endif
 }