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

Side by Side Diff: Source/core/dom/RenderTreeBuilder.cpp

Issue 139743005: Replace RenderFullScreen with top layer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: needs baseline 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 unified diff | Download patch | Annotate | Revision Log
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"
38 #include "core/rendering/RenderNamedFlowThread.h" 37 #include "core/rendering/RenderNamedFlowThread.h"
39 #include "core/rendering/RenderObject.h" 38 #include "core/rendering/RenderObject.h"
40 #include "core/rendering/RenderText.h" 39 #include "core/rendering/RenderText.h"
41 #include "core/rendering/RenderView.h" 40 #include "core/rendering/RenderView.h"
42 41
43 namespace WebCore { 42 namespace WebCore {
44 43
45 RenderObject* RenderTreeBuilder::nextRenderer() const 44 RenderObject* RenderTreeBuilder::nextRenderer() const
46 { 45 {
47 ASSERT(m_renderingParent); 46 ASSERT(m_renderingParent);
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 } 219 }
221 220
222 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style 221 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style
223 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail. 222 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail.
224 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 223 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
225 224
226 RenderObject* nextRenderer = this->nextRenderer(); 225 RenderObject* nextRenderer = this->nextRenderer();
227 element->setRenderer(newRenderer); 226 element->setRenderer(newRenderer);
228 newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend on renderer() already being set. 227 newRenderer->setAnimatableStyle(&style); // setAnimatableStyle() can depend on renderer() already being set.
229 228
230 if (FullscreenElementStack::isActiveFullScreenElement(element)) {
231 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer , &element->document());
232 if (!newRenderer)
233 return;
234 }
235
236 // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer. 229 // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer.
esprehn 2014/01/21 18:59:05 This comment is also dead, the "child of" comment
falken 2014/01/22 06:08:02 Ah, I see. Done.
237 parentRenderer->addChild(newRenderer, nextRenderer); 230 parentRenderer->addChild(newRenderer, nextRenderer);
238 } 231 }
239 232
240 void RenderTreeBuilder::createRendererForTextIfNeeded() 233 void RenderTreeBuilder::createRendererForTextIfNeeded()
241 { 234 {
242 ASSERT(!m_node->renderer()); 235 ASSERT(!m_node->renderer());
243 236
244 // If we're out of composition then we can't render since there's no parent to inherit from. 237 // If we're out of composition then we can't render since there's no parent to inherit from.
245 if (!m_renderingParent) 238 if (!m_renderingParent)
246 return; 239 return;
(...skipping 23 matching lines...) Expand all
270 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 263 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
271 264
272 RenderObject* nextRenderer = this->nextRenderer(); 265 RenderObject* nextRenderer = this->nextRenderer();
273 textNode->setRenderer(newRenderer); 266 textNode->setRenderer(newRenderer);
274 // Parent takes care of the animations, no need to call setAnimatableStyle. 267 // Parent takes care of the animations, no need to call setAnimatableStyle.
275 newRenderer->setStyle(m_style.release()); 268 newRenderer->setStyle(m_style.release());
276 parentRenderer->addChild(newRenderer, nextRenderer); 269 parentRenderer->addChild(newRenderer, nextRenderer);
277 } 270 }
278 271
279 } 272 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698