Merge 95371 - Don't detach elements from the render tree when entering fullscreen mode

Source/WebCore/dom/NodeRenderingContext.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 303 matching lines @@
     if (!m_context.parentRenderer()->isChildAllowed(newRenderer, m_context.style())) {
         newRenderer->destroy();
         return 0;
     }
 
     node->setRenderer(newRenderer);
     newRenderer->setAnimatableStyle(m_context.releaseStyle()); // setAnimatableStyle() can depend on renderer() already being set.
     return newRenderer;
 }
 
-#if ENABLE(FULLSCREEN_API)
-static RenderObject* wrapWithRenderFullScreen(RenderObject* object, Document* document)
-{
-    RenderFullScreen* fullscreenRenderer = new (document->renderArena()) RenderFullScreen(document);
-    fullscreenRenderer->setStyle(RenderFullScreen::createFullScreenStyle());
-    // It's possible that we failed to create the new render and end up wrapping nothing.
-    // We'll end up displaying a black screen, but Jer says this is expected.
-    if (object)
-        fullscreenRenderer->addChild(object);
-    document->setFullScreenRenderer(fullscreenRenderer);
-    if (fullscreenRenderer->placeholder())
-        return fullscreenRenderer->placeholder();
-    return fullscreenRenderer;
-}
-#endif
-
 void NodeRendererFactory::createRendererIfNeeded()
 {
     Node* node = m_context.node();
     Document* document = node->document();
     if (!document->shouldCreateRenderers())
         return;
 
     RenderObject* parentRenderer = m_context.parentRenderer();
     RenderObject* nextRenderer = m_context.nextRenderer();
     RenderObject* newRenderer = createRendererAndStyle();
 
     if (m_context.hasFlowThreadParent()) {
         parentRenderer = m_context.parentFlowRenderer();
         // Do not call m_context.nextRenderer() here, because it expects to have 
         // the renderer added to its parent already.
         nextRenderer = m_context.parentFlowRenderer()->nextRendererForNode(node);
     }
 
 #if ENABLE(FULLSCREEN_API)
     if (document->webkitIsFullScreen() && document->webkitCurrentFullScreenElement() == node)
-        newRenderer = wrapWithRenderFullScreen(newRenderer, document);
+        newRenderer = RenderFullScreen::wrapRenderer(newRenderer, document);
 #endif
 
     // FIXME: This side effect should be visible from attach() code.
     m_context.hostChildrenChanged();
 
     if (!newRenderer)
         return;
 
     // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer.
     parentRenderer->addChild(newRenderer, nextRenderer);
 }
 
 }