Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: Source/WebCore/dom/NodeRenderingContext.cpp

Issue 8218020: Merge 95371 - Don't detach elements from the render tree when entering fullscreen mode (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/rendering/RenderFullScreen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/NodeRenderingContext.cpp
===================================================================
--- Source/WebCore/dom/NodeRenderingContext.cpp (revision 97090)
+++ Source/WebCore/dom/NodeRenderingContext.cpp (working copy)
@@ -321,22 +321,6 @@
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();
@@ -357,7 +341,7 @@
#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.
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/rendering/RenderFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698