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

Unified Diff: Source/core/dom/RenderTreeBuilder.cpp

Issue 132333018: Revert of Reland r165710 "Replace RenderFullScreen with top layer" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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/core/dom/FullscreenElementStack.cpp ('k') | Source/core/html/HTMLDialogElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/RenderTreeBuilder.cpp
diff --git a/Source/core/dom/RenderTreeBuilder.cpp b/Source/core/dom/RenderTreeBuilder.cpp
index b673e5b438f18aa20f3d7099dfe931cb1564e0ca..eb3349470a361e14d700027287a9087458299879 100644
--- a/Source/core/dom/RenderTreeBuilder.cpp
+++ b/Source/core/dom/RenderTreeBuilder.cpp
@@ -34,6 +34,7 @@
#include "core/dom/Node.h"
#include "core/dom/Text.h"
#include "core/rendering/FlowThreadController.h"
+#include "core/rendering/RenderFullScreen.h"
#include "core/rendering/RenderNamedFlowThread.h"
#include "core/rendering/RenderObject.h"
#include "core/rendering/RenderText.h"
@@ -230,6 +231,14 @@
RenderObject* nextRenderer = this->nextRenderer();
element->setRenderer(newRenderer);
newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend on renderer() already being set.
+
+ if (FullscreenElementStack::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);
}
« no previous file with comments | « Source/core/dom/FullscreenElementStack.cpp ('k') | Source/core/html/HTMLDialogElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698