Changeset 109401 in webkit

Timestamp:

Mar 1, 2012, 12:54:43 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 108109
BUG=113707
Review URL: ​https://chromiumcodereview.appspot.com/9565026

Location:

branches/chromium/963

Files:

• LayoutTests/fast/css-generated-content/before-content-continuation-chain-expected.png (copied) (copied from trunk/LayoutTests/fast/css-generated-content/before-content-continuation-chain-expected.png )
• LayoutTests/fast/css-generated-content/before-content-continuation-chain-expected.txt (copied) (copied from trunk/LayoutTests/fast/css-generated-content/before-content-continuation-chain-expected.txt )
• LayoutTests/fast/css-generated-content/before-content-continuation-chain.html (copied) (copied from trunk/LayoutTests/fast/css-generated-content/before-content-continuation-chain.html )
• Source/WebCore/rendering/RenderObjectChildList.cpp (modified) (1 diff)

branches/chromium/963/Source/WebCore/rendering/RenderObjectChildList.cpp

@@ -518 +518 @@
                     return;
                 }
-                owner->addChild(generatedContentContainer, insertBefore);
+
+                // When we don't have a first child and are part of a continuation chain,
+                // insertBefore is incorrectly set to zero above, which causes the :before
+                // child to end up at the end of continuation chain.
+                // See https://bugs.webkit.org/show_bug.cgi?id=78380.
+                if (!insertBefore && type == BEFORE && owner->virtualContinuation())
+                    owner->addChildIgnoringContinuation(generatedContentContainer, 0);
+                else
+                    owner->addChild(generatedContentContainer, insertBefore);
             }
             if (generatedContentContainer->isChildAllowed(renderer, pseudoElementStyle))