Merge WebKit at Chromium 9.0.597.55: trivial merge by git

Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57

1 files changed, 11 insertions, 6 deletions

diff --git a/WebCore/rendering/ShadowElement.cpp b/WebCore/rendering/ShadowElement.cpp
index cea3164..72f48e2 100644
--- a/WebCore/rendering/ShadowElement.cpp
+++ b/WebCore/rendering/ShadowElement.cpp
@@ -68,16 +68,21 @@ void ShadowBlockElement::updateStyleForPart(PseudoId pseudoId)
 
 PassRefPtr<ShadowBlockElement> ShadowBlockElement::createForPart(HTMLElement* shadowParent, PseudoId pseudoId)
 {
-    RenderObject* parentRenderer = shadowParent->renderer();
-    RefPtr<RenderStyle> styleForPart = createStyleForPart(parentRenderer, pseudoId);
     RefPtr<ShadowBlockElement> part = create(shadowParent);
-    part->setRenderer(part->createRenderer(parentRenderer->renderArena(), styleForPart.get()));
-    part->renderer()->setStyle(styleForPart.release());
-    part->setAttached();
-    part->setInDocument();
+    part->initAsPart(pseudoId);
     return part.release();
 }
 
+void ShadowBlockElement::initAsPart(PseudoId pseudoId)
+{
+    RenderObject* parentRenderer = shadowParent()->renderer();
+    RefPtr<RenderStyle> styleForPart = createStyleForPart(parentRenderer, pseudoId);
+    setRenderer(createRenderer(parentRenderer->renderArena(), styleForPart.get()));
+    renderer()->setStyle(styleForPart.release());
+    setAttached();
+    setInDocument();
+}
+
 PassRefPtr<RenderStyle> ShadowBlockElement::createStyleForPart(RenderObject* parentRenderer, PseudoId pseudoId)
 {
     RefPtr<RenderStyle> styleForPart;