Merge 73488

WebCore/rendering/ShadowElement.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 50 matching lines @@
 }
 
 void ShadowBlockElement::updateStyleForPart(PseudoId pseudoId)
 {
     if (renderer()->style()->styleType() != pseudoId)
         renderer()->setStyle(createStyleForPart(renderer()->parent(), pseudoId));
 }
 
 PassRefPtr<ShadowBlockElement> ShadowBlockElement::createForPart(HTMLElement* shadowParent, PseudoId pseudoId)
 {
-    RenderObject* parentRenderer = shadowParent->renderer();
+    RefPtr<ShadowBlockElement> part = create(shadowParent);
+    part->initAsPart(pseudoId);
+    return part.release();
+}
+
+void ShadowBlockElement::initAsPart(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();
-    return part.release();
+    setRenderer(createRenderer(parentRenderer->renderArena(), styleForPart.get()));
+    renderer()->setStyle(styleForPart.release());
+    setAttached();
+    setInDocument();
 }
 
 PassRefPtr<RenderStyle> ShadowBlockElement::createStyleForPart(RenderObject* parentRenderer, PseudoId pseudoId)
 {
     RefPtr<RenderStyle> styleForPart;
     RenderStyle* pseudoStyle = parentRenderer->getCachedPseudoStyle(pseudoId);
     if (pseudoStyle)
         styleForPart = RenderStyle::clone(pseudoStyle);
     else
         styleForPart = RenderStyle::create();
@@ skipping 18 matching lines @@
 {
     return adoptRef(new ShadowInputElement(shadowParent));
 }
 
 ShadowInputElement::ShadowInputElement(HTMLElement* shadowParent)
     : ShadowElement<HTMLInputElement>(inputTag, shadowParent)
 {
 }
 
 } // namespace WebCore