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

Side by Side Diff: sky/engine/core/dom/RenderTreeBuilder.cpp

Issue 708913002: Remove rendererIsNeeded. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/dom/Element.cpp ('k') | sky/engine/core/dom/shadow/InsertionPoint.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 11 matching lines...) Expand all
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 * 23 *
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/dom/RenderTreeBuilder.h" 27 #include "core/dom/RenderTreeBuilder.h"
28 28
29 #include "core/css/resolver/StyleResolver.h" 29 #include "core/css/resolver/StyleResolver.h"
30 #include "core/dom/Node.h" 30 #include "core/dom/Node.h"
31 #include "core/dom/Text.h" 31 #include "core/dom/Text.h"
32 #include "core/dom/shadow/InsertionPoint.h"
32 #include "core/rendering/RenderObject.h" 33 #include "core/rendering/RenderObject.h"
33 #include "core/rendering/RenderText.h" 34 #include "core/rendering/RenderText.h"
34 #include "core/rendering/RenderView.h" 35 #include "core/rendering/RenderView.h"
35 #include "platform/RuntimeEnabledFeatures.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 RenderObject* RenderTreeBuilder::nextRenderer() const 39 RenderObject* RenderTreeBuilder::nextRenderer() const
40 { 40 {
41 ASSERT(m_renderingParent); 41 ASSERT(m_renderingParent);
42 42
43 // Avoid an O(N^2) walk over the children when reattaching all children of a node. 43 // Avoid an O(N^2) walk over the children when reattaching all children of a node.
44 if (m_renderingParent->needsAttach()) 44 if (m_renderingParent->needsAttach())
45 return 0; 45 return 0;
46 46
47 return NodeRenderingTraversal::nextSiblingRenderer(m_node); 47 return NodeRenderingTraversal::nextSiblingRenderer(m_node);
48 } 48 }
49 49
50 RenderObject* RenderTreeBuilder::parentRenderer() const 50 RenderObject* RenderTreeBuilder::parentRenderer() const
51 { 51 {
52 ASSERT(m_renderingParent); 52 ASSERT(m_renderingParent);
53 return m_renderingParent->renderer(); 53 return m_renderingParent->renderer();
54 } 54 }
55 55
56 bool RenderTreeBuilder::shouldCreateRenderer() const 56 bool RenderTreeBuilder::shouldCreateRenderer() const
57 { 57 {
58 if (!m_renderingParent) 58 if (!m_renderingParent)
59 return false; 59 return false;
60 RenderObject* parentRenderer = this->parentRenderer(); 60 RenderObject* parentRenderer = this->parentRenderer();
61 if (!parentRenderer) 61 if (!parentRenderer)
62 return false; 62 return false;
63 if (!parentRenderer->canHaveChildren()) 63 if (!parentRenderer->canHaveChildren())
64 return false; 64 return false;
65 if (isActiveInsertionPoint(*m_node))
66 return false;
65 return true; 67 return true;
66 } 68 }
67 69
68 RenderStyle& RenderTreeBuilder::style() const 70 RenderStyle& RenderTreeBuilder::style() const
69 { 71 {
70 if (!m_style) 72 if (!m_style)
71 m_style = toElement(m_node)->styleForRenderer(); 73 m_style = toElement(m_node)->styleForRenderer();
72 return *m_style; 74 return *m_style;
73 } 75 }
74 76
75 void RenderTreeBuilder::createRendererForElementIfNeeded() 77 void RenderTreeBuilder::createRendererForElementIfNeeded()
76 { 78 {
77 ASSERT(!m_node->renderer()); 79 ASSERT(!m_node->renderer());
78 80
79 if (!shouldCreateRenderer()) 81 if (!shouldCreateRenderer())
80 return; 82 return;
81 83
82 Element* element = toElement(m_node); 84 Element* element = toElement(m_node);
83 RenderStyle& style = this->style(); 85 RenderStyle& style = this->style();
84 86
85 if (!element->rendererIsNeeded(style)) 87 if (style.display() == NONE)
86 return; 88 return;
87 89
88 RenderObject* newRenderer = element->createRenderer(&style); 90 RenderObject* newRenderer = element->createRenderer(&style);
89 if (!newRenderer) 91 if (!newRenderer)
90 return; 92 return;
91 93
92 RenderObject* parentRenderer = this->parentRenderer(); 94 RenderObject* parentRenderer = this->parentRenderer();
93 95
94 if (!parentRenderer->isChildAllowed(newRenderer, &style)) { 96 if (!parentRenderer->isChildAllowed(newRenderer, &style)) {
95 newRenderer->destroy(); 97 newRenderer->destroy();
(...skipping 30 matching lines...) Expand all
126 } 128 }
127 129
128 RenderObject* nextRenderer = this->nextRenderer(); 130 RenderObject* nextRenderer = this->nextRenderer();
129 textNode->setRenderer(newRenderer); 131 textNode->setRenderer(newRenderer);
130 // Parent takes care of the animations, no need to call setAnimatableStyle. 132 // Parent takes care of the animations, no need to call setAnimatableStyle.
131 newRenderer->setStyle(m_style.release()); 133 newRenderer->setStyle(m_style.release());
132 parentRenderer->addChild(newRenderer, nextRenderer); 134 parentRenderer->addChild(newRenderer, nextRenderer);
133 } 135 }
134 136
135 } 137 }
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Element.cpp ('k') | sky/engine/core/dom/shadow/InsertionPoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698