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

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

Issue 788073004: Replace RenderFullscreen with top layer - Take II (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated after review comments. Created 6 years 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 "core/HTMLNames.h" 29 #include "core/HTMLNames.h"
30 #include "core/SVGNames.h" 30 #include "core/SVGNames.h"
31 #include "core/css/resolver/StyleResolver.h" 31 #include "core/css/resolver/StyleResolver.h"
32 #include "core/dom/FirstLetterPseudoElement.h" 32 #include "core/dom/FirstLetterPseudoElement.h"
33 #include "core/dom/Fullscreen.h" 33 #include "core/dom/Fullscreen.h"
34 #include "core/dom/Node.h" 34 #include "core/dom/Node.h"
35 #include "core/dom/PseudoElement.h" 35 #include "core/dom/PseudoElement.h"
36 #include "core/dom/Text.h" 36 #include "core/dom/Text.h"
37 #include "core/rendering/RenderFullScreen.h"
38 #include "core/rendering/RenderObject.h" 37 #include "core/rendering/RenderObject.h"
39 #include "core/rendering/RenderText.h" 38 #include "core/rendering/RenderText.h"
40 #include "core/rendering/RenderView.h" 39 #include "core/rendering/RenderView.h"
41 #include "core/svg/SVGElement.h" 40 #include "core/svg/SVGElement.h"
42 #include "platform/RuntimeEnabledFeatures.h" 41 #include "platform/RuntimeEnabledFeatures.h"
43 42
44 namespace blink { 43 namespace blink {
45 44
46 RenderTreeBuilderForElement::RenderTreeBuilderForElement(Element& element, Rende rStyle* style) 45 RenderTreeBuilderForElement::RenderTreeBuilderForElement(Element& element, Rende rStyle* style)
47 : RenderTreeBuilder(element, nullptr) 46 : RenderTreeBuilder(element, nullptr)
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 128 }
130 129
131 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style 130 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style
132 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail. 131 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail.
133 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 132 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
134 133
135 RenderObject* nextRenderer = this->nextRenderer(); 134 RenderObject* nextRenderer = this->nextRenderer();
136 m_node->setRenderer(newRenderer); 135 m_node->setRenderer(newRenderer);
137 newRenderer->setStyle(&style); // setStyle() can depend on renderer() alread y being set. 136 newRenderer->setStyle(&style); // setStyle() can depend on renderer() alread y being set.
138 137
139 if (Fullscreen::isActiveFullScreenElement(*m_node)) {
140 newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer , &m_node->document());
141 if (!newRenderer)
142 return;
143 }
144
145 // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer. 138 // Note: Adding newRenderer instead of renderer(). renderer() may be a child of newRenderer.
146 parentRenderer->addChild(newRenderer, nextRenderer); 139 parentRenderer->addChild(newRenderer, nextRenderer);
147 } 140 }
148 141
149 void RenderTreeBuilderForText::createRenderer() 142 void RenderTreeBuilderForText::createRenderer()
150 { 143 {
151 RenderObject* parentRenderer = this->parentRenderer(); 144 RenderObject* parentRenderer = this->parentRenderer();
152 RenderStyle* style = parentRenderer->style(); 145 RenderStyle* style = parentRenderer->style();
153 146
154 ASSERT(m_node->textRendererIsNeeded(*style, *parentRenderer)); 147 ASSERT(m_node->textRendererIsNeeded(*style, *parentRenderer));
155 148
156 RenderText* newRenderer = m_node->createTextRenderer(style); 149 RenderText* newRenderer = m_node->createTextRenderer(style);
157 if (!parentRenderer->isChildAllowed(newRenderer, style)) { 150 if (!parentRenderer->isChildAllowed(newRenderer, style)) {
158 newRenderer->destroy(); 151 newRenderer->destroy();
159 return; 152 return;
160 } 153 }
161 154
162 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style 155 // Make sure the RenderObject already knows it is going to be added to a Ren derFlowThread before we set the style
163 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail. 156 // for the first time. Otherwise code using inRenderFlowThread() in the styl eWillChange and styleDidChange will fail.
164 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 157 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
165 158
166 RenderObject* nextRenderer = this->nextRenderer(); 159 RenderObject* nextRenderer = this->nextRenderer();
167 m_node->setRenderer(newRenderer); 160 m_node->setRenderer(newRenderer);
168 // Parent takes care of the animations, no need to call setAnimatableStyle. 161 // Parent takes care of the animations, no need to call setAnimatableStyle.
169 newRenderer->setStyle(style); 162 newRenderer->setStyle(style);
170 parentRenderer->addChild(newRenderer, nextRenderer); 163 parentRenderer->addChild(newRenderer, nextRenderer);
171 } 164 }
172 165
173 } 166 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698