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

Side by Side 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, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/FullscreenElementStack.cpp ('k') | Source/core/html/HTMLDialogElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
7 * Copyright (C) 2011 Google Inc. All rights reserved. 7 * Copyright (C) 2011 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 16 matching lines...) Expand all
27 #include "core/dom/RenderTreeBuilder.h" 27 #include "core/dom/RenderTreeBuilder.h"
28 28
29 #include "HTMLNames.h" 29 #include "HTMLNames.h"
30 #include "RuntimeEnabledFeatures.h" 30 #include "RuntimeEnabledFeatures.h"
31 #include "SVGNames.h" 31 #include "SVGNames.h"
32 #include "core/css/resolver/StyleResolver.h" 32 #include "core/css/resolver/StyleResolver.h"
33 #include "core/dom/FullscreenElementStack.h" 33 #include "core/dom/FullscreenElementStack.h"
34 #include "core/dom/Node.h" 34 #include "core/dom/Node.h"
35 #include "core/dom/Text.h" 35 #include "core/dom/Text.h"
36 #include "core/rendering/FlowThreadController.h" 36 #include "core/rendering/FlowThreadController.h"
37 #include "core/rendering/RenderFullScreen.h"
37 #include "core/rendering/RenderNamedFlowThread.h" 38 #include "core/rendering/RenderNamedFlowThread.h"
38 #include "core/rendering/RenderObject.h" 39 #include "core/rendering/RenderObject.h"
39 #include "core/rendering/RenderText.h" 40 #include "core/rendering/RenderText.h"
40 #include "core/rendering/RenderView.h" 41 #include "core/rendering/RenderView.h"
41 #include "core/svg/SVGElement.h" 42 #include "core/svg/SVGElement.h"
42 43
43 namespace WebCore { 44 namespace WebCore {
44 45
45 RenderObject* RenderTreeBuilder::nextRenderer() const 46 RenderObject* RenderTreeBuilder::nextRenderer() const
46 { 47 {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 return; 224 return;
224 } 225 }
225 226
226 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style 227 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style
227 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail. 228 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail.
228 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 229 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
229 230
230 RenderObject* nextRenderer = this->nextRenderer(); 231 RenderObject* nextRenderer = this->nextRenderer();
231 element->setRenderer(newRenderer); 232 element->setRenderer(newRenderer);
232 newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend on renderer() already being set. 233 newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend on renderer() already being set.
234
235 if (FullscreenElementStack::isActiveFullScreenElement(element)) {
236 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer , &element->document());
237 if (!newRenderer)
238 return;
239 }
240
241 // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer.
233 parentRenderer->addChild(newRenderer, nextRenderer); 242 parentRenderer->addChild(newRenderer, nextRenderer);
234 } 243 }
235 244
236 void RenderTreeBuilder::createRendererForTextIfNeeded() 245 void RenderTreeBuilder::createRendererForTextIfNeeded()
237 { 246 {
238 ASSERT(!m_node->renderer()); 247 ASSERT(!m_node->renderer());
239 248
240 // If we're out of composition then we can't render since there's no parent to inherit from. 249 // If we're out of composition then we can't render since there's no parent to inherit from.
241 if (!m_renderingParent) 250 if (!m_renderingParent)
242 return; 251 return;
(...skipping 23 matching lines...) Expand all
266 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 275 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
267 276
268 RenderObject* nextRenderer = this->nextRenderer(); 277 RenderObject* nextRenderer = this->nextRenderer();
269 textNode->setRenderer(newRenderer); 278 textNode->setRenderer(newRenderer);
270 // Parent takes care of the animations, no need to call setAnimatableStyle. 279 // Parent takes care of the animations, no need to call setAnimatableStyle.
271 newRenderer->setStyle(m_style.release()); 280 newRenderer->setStyle(m_style.release());
272 parentRenderer->addChild(newRenderer, nextRenderer); 281 parentRenderer->addChild(newRenderer, nextRenderer);
273 } 282 }
274 283
275 } 284 }
OLDNEW
« 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