Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / RenderTreeBuilder.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp b/src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp
index 439e784..7572603 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp
+++ b/src/third_party/WebKit/Source/core/dom/RenderTreeBuilder.cpp
@@ -26,11 +26,10 @@
 #include "config.h"
 #include "core/dom/RenderTreeBuilder.h"
 
-#include "HTMLNames.h"
-#include "RuntimeEnabledFeatures.h"
-#include "SVGNames.h"
+#include "core/HTMLNames.h"
+#include "core/SVGNames.h"
 #include "core/css/resolver/StyleResolver.h"
-#include "core/dom/FullscreenElementStack.h"
+#include "core/dom/Fullscreen.h"
 #include "core/dom/Node.h"
 #include "core/dom/Text.h"
 #include "core/rendering/RenderFullScreen.h"
@@ -38,8 +37,9 @@
 #include "core/rendering/RenderText.h"
 #include "core/rendering/RenderView.h"
 #include "core/svg/SVGElement.h"
+#include "platform/RuntimeEnabledFeatures.h"
 
-namespace WebCore {
+namespace blink {
 
 RenderObject* RenderTreeBuilder::nextRenderer() const
 {
@@ -104,15 +104,10 @@ void RenderTreeBuilder::createRendererForElementIfNeeded()
 {
     ASSERT(!m_node->renderer());
 
-    // If we're out of composition then we can't render since there's no parent to inherit from.
-    if (!m_renderingParent)
-        return;
-
-    Element* element = toElement(m_node);
-
     if (!shouldCreateRenderer())
         return;
 
+    Element* element = toElement(m_node);
     RenderStyle& style = this->style();
 
     if (!element->rendererIsNeeded(style))
@@ -137,7 +132,7 @@ void RenderTreeBuilder::createRendererForElementIfNeeded()
     element->setRenderer(newRenderer);
     newRenderer->setStyle(&style); // setStyle() can depend on renderer() already being set.
 
-    if (FullscreenElementStack::isActiveFullScreenElement(element)) {
+    if (Fullscreen::isActiveFullScreenElement(*element)) {
         newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer, &element->document());
         if (!newRenderer)
             return;
@@ -151,10 +146,6 @@ void RenderTreeBuilder::createRendererForTextIfNeeded()
 {
     ASSERT(!m_node->renderer());
 
-    // If we're out of composition then we can't render since there's no parent to inherit from.
-    if (!m_renderingParent)
-        return;
-
     if (!shouldCreateRenderer())
         return;