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

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

Issue 192293002: Use new is*Element() helper functions in DOM code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add is*Element(PassRefPtr) helper Created 6 years, 9 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 return m_renderingParent->renderer(); 74 return m_renderingParent->renderer();
75 } 75 }
76 76
77 bool RenderTreeBuilder::shouldCreateRenderer() const 77 bool RenderTreeBuilder::shouldCreateRenderer() const
78 { 78 {
79 if (!m_renderingParent) 79 if (!m_renderingParent)
80 return false; 80 return false;
81 if (m_node->isSVGElement()) { 81 if (m_node->isSVGElement()) {
82 // SVG elements only render when inside <svg>, or if the element is an < svg> itself. 82 // SVG elements only render when inside <svg>, or if the element is an < svg> itself.
83 if (!m_node->hasTagName(SVGNames::svgTag) && !m_renderingParent->isSVGEl ement()) 83 if (!isSVGSVGElement(*m_node) && !m_renderingParent->isSVGElement())
84 return false; 84 return false;
85 if (!toSVGElement(m_node)->isValid()) 85 if (!toSVGElement(m_node)->isValid())
86 return false; 86 return false;
87 } 87 }
88 RenderObject* parentRenderer = this->parentRenderer(); 88 RenderObject* parentRenderer = this->parentRenderer();
89 if (!parentRenderer) 89 if (!parentRenderer)
90 return false; 90 return false;
91 if (!parentRenderer->canHaveChildren()) 91 if (!parentRenderer->canHaveChildren())
92 return false; 92 return false;
93 return true; 93 return true;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); 180 newRenderer->setFlowThreadState(parentRenderer->flowThreadState());
181 181
182 RenderObject* nextRenderer = this->nextRenderer(); 182 RenderObject* nextRenderer = this->nextRenderer();
183 textNode->setRenderer(newRenderer); 183 textNode->setRenderer(newRenderer);
184 // Parent takes care of the animations, no need to call setAnimatableStyle. 184 // Parent takes care of the animations, no need to call setAnimatableStyle.
185 newRenderer->setStyle(m_style.release()); 185 newRenderer->setStyle(m_style.release());
186 parentRenderer->addChild(newRenderer, nextRenderer); 186 parentRenderer->addChild(newRenderer, nextRenderer);
187 } 187 }
188 188
189 } 189 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698