RenderTreeBuilder => RenderTreeBuilderForElement and RenderTreeBuilderForText

Source/core/dom/RenderTreeBuilder.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2011 Google 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
@@ skipping 41 matching lines @@
 
     // Avoid an O(N^2) walk over the children when reattaching all children of a node.
     if (m_renderingParent->needsAttach())
         return 0;
 
     return NodeRenderingTraversal::nextSiblingRenderer(m_node);
 }
 
 RenderObject* RenderTreeBuilder::parentRenderer() const
 {
-    ASSERT(m_renderingParent);
-
-    Element* element = m_node->isElementNode() ? toElement(m_node) : 0;
-
-    if (element && m_renderingParent->renderer()) {
-        // FIXME: Guarding this by m_renderingParent->renderer() isn't quite right as the spec for
-        // top layer only talks about display: none ancestors so putting a <dialog> inside an
-        // <optgroup> seems like it should still work even though this check will prevent it.
-        if (element->isInTopLayer())
-            return m_node->document().renderView();
-    }
-
     return m_renderingParent->renderer();
 }
 
-bool RenderTreeBuilder::shouldCreateRenderer() const
+bool RenderTreeBuilder::rendererIsNeeded() const
 {
     if (!m_renderingParent)
         return false;
+    RenderObject* parentRenderer = this->parentRenderer();
+    if (!parentRenderer)
+        return false;
+    if (!parentRenderer->canHaveChildren())
+        return false;
+    return true;
+}
+
+void RenderTreeBuilder::createRendererIfNeeded()
+{
+    ASSERT(!m_node->renderer());
+
+    if (rendererIsNeeded())
+        createRenderer();
+}
+
+bool RenderTreeBuilderForElement::rendererIsNeeded() const
+{
+    if (!RenderTreeBuilder::rendererIsNeeded())
+        return false;
+
+    ASSERT(m_renderingParent);
+
+    // FIXME: Should the following be in SVGElement::rendererIsNeeded()?
     if (m_node->isSVGElement()) {
         // SVG elements only render when inside <svg>, or if the element is an <svg> itself.
         if (!isSVGSVGElement(*m_node) && !m_renderingParent->isSVGElement())
             return false;
         if (!toSVGElement(m_node)->isValid())
             return false;
     }
-    RenderObject* parentRenderer = this->parentRenderer();
-    if (!parentRenderer)
-        return false;
-    if (!parentRenderer->canHaveChildren())
-        return false;
-    return true;
+
+    return toElement(m_node)->rendererIsNeeded(*m_style.get());
 }
 
-RenderStyle& RenderTreeBuilder::style() const
+RenderObject* RenderTreeBuilderForElement::parentRenderer() const
 {
-    if (!m_style)
-        m_style = toElement(m_node)->styleForRenderer();
-    return *m_style;
+    ASSERT(m_renderingParent);
+
+    if (m_renderingParent->renderer()) {
+        // FIXME: Guarding this by m_renderingParent->renderer() isn't quite right as the spec for
+        // top layer only talks about display: none ancestors so putting a <dialog> inside an
+        // <optgroup> seems like it should still work even though this check will prevent it.
+        if (toElement(m_node)->isInTopLayer())
+            return m_node->document().renderView();
+    }
+
+    return RenderTreeBuilder::parentRenderer();
 }
 
-void RenderTreeBuilder::createRendererForElementIfNeeded()
+void RenderTreeBuilderForElement::createRenderer()
 {
+    ASSERT(rendererIsNeeded());
     ASSERT(!m_node->renderer());
 
-    if (!shouldCreateRenderer())
-        return;
-
     Element* element = toElement(m_node);
-    RenderStyle& style = this->style();
-
-    if (!element->rendererIsNeeded(style))
-        return;
+    RenderStyle& style = *m_style.get();
 
     RenderObject* newRenderer = element->createRenderer(&style);
     if (!newRenderer)
         return;
 
     RenderObject* parentRenderer = this->parentRenderer();
 
     if (!parentRenderer->isChildAllowed(newRenderer, &style)) {
         newRenderer->destroy();
         return;
@@ skipping 10 matching lines @@
     if (Fullscreen::isActiveFullScreenElement(*element)) {
         newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer, &element->document());
         if (!newRenderer)
             return;
     }
 
     // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer.
     parentRenderer->addChild(newRenderer, nextRenderer);
 }
 
-void RenderTreeBuilder::createRendererForTextIfNeeded()
+bool RenderTreeBuilderForText::rendererIsNeeded() const
 {
+    if (!RenderTreeBuilder::rendererIsNeeded())
+        return false;
+
+    return toText(m_node)->textRendererIsNeeded(*parentRenderer()->style(), *parentRenderer());
+}
+
+void RenderTreeBuilderForText::createRenderer()
+{
+    ASSERT(rendererIsNeeded());
     ASSERT(!m_node->renderer());
 
-    if (!shouldCreateRenderer())
-        return;
-
     Text* textNode = toText(m_node);
     RenderObject* parentRenderer = this->parentRenderer();
+    RenderStyle* style = parentRenderer->style();
 
-    m_style = parentRenderer->style();
-
-    if (!textNode->textRendererIsNeeded(*m_style, *parentRenderer))
-        return;
-
-    RenderText* newRenderer = textNode->createTextRenderer(m_style.get());
-    if (!parentRenderer->isChildAllowed(newRenderer, m_style.get())) {
+    RenderText* newRenderer = textNode->createTextRenderer(style);
+    if (!parentRenderer->isChildAllowed(newRenderer, style)) {
         newRenderer->destroy();
         return;
     }
 
     // Make sure the RenderObject already knows it is going to be added to a RenderFlowThread before we set the style
     // for the first time. Otherwise code using inRenderFlowThread() in the styleWillChange and styleDidChange will fail.
     newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
 
     RenderObject* nextRenderer = this->nextRenderer();
     textNode->setRenderer(newRenderer);
     // Parent takes care of the animations, no need to call setAnimatableStyle.
-    newRenderer->setStyle(m_style.release());
+    newRenderer->setStyle(style);
     parentRenderer->addChild(newRenderer, nextRenderer);
 }
 
 }