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

Side by Side Diff: Source/core/rendering/svg/RenderSVGRoot.cpp

Issue 147213004: Revert of Convert remaining RenderSVG* nodes to RenderObject::isChildAllowed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase; Include r166238. 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. 5 * Copyright (C) 2009 Google, Inc.
6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 293
294 void RenderSVGRoot::styleDidChange(StyleDifference diff, const RenderStyle* oldS tyle) 294 void RenderSVGRoot::styleDidChange(StyleDifference diff, const RenderStyle* oldS tyle)
295 { 295 {
296 if (diff == StyleDifferenceLayout) 296 if (diff == StyleDifferenceLayout)
297 setNeedsBoundariesUpdate(); 297 setNeedsBoundariesUpdate();
298 298
299 RenderReplaced::styleDidChange(diff, oldStyle); 299 RenderReplaced::styleDidChange(diff, oldStyle);
300 SVGResourcesCache::clientStyleChanged(this, diff, style()); 300 SVGResourcesCache::clientStyleChanged(this, diff, style());
301 } 301 }
302 302
303 bool RenderSVGRoot::isChildAllowed(RenderObject* child, RenderStyle*) const
304 {
305 return child->isSVG() && !(child->isSVGInline() || child->isSVGInlineText()) ;
306 }
307
308 void RenderSVGRoot::addChild(RenderObject* child, RenderObject* beforeChild) 303 void RenderSVGRoot::addChild(RenderObject* child, RenderObject* beforeChild)
309 { 304 {
310 RenderReplaced::addChild(child, beforeChild); 305 RenderReplaced::addChild(child, beforeChild);
311 SVGResourcesCache::clientWasAddedToTree(child, child->style()); 306 SVGResourcesCache::clientWasAddedToTree(child, child->style());
312 } 307 }
313 308
314 void RenderSVGRoot::removeChild(RenderObject* child) 309 void RenderSVGRoot::removeChild(RenderObject* child)
315 { 310 {
316 SVGResourcesCache::clientWillBeRemovedFromTree(child); 311 SVGResourcesCache::clientWillBeRemovedFromTree(child);
317 RenderReplaced::removeChild(child); 312 RenderReplaced::removeChild(child);
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 438
444 bool RenderSVGRoot::hasRelativeLogicalHeight() const 439 bool RenderSVGRoot::hasRelativeLogicalHeight() const
445 { 440 {
446 SVGSVGElement* svg = toSVGSVGElement(node()); 441 SVGSVGElement* svg = toSVGSVGElement(node());
447 ASSERT(svg); 442 ASSERT(svg);
448 443
449 return svg->intrinsicHeight(SVGSVGElement::IgnoreCSSProperties).isPercent(); 444 return svg->intrinsicHeight(SVGSVGElement::IgnoreCSSProperties).isPercent();
450 } 445 }
451 446
452 } 447 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGRoot.h ('k') | Source/core/rendering/svg/RenderSVGTransformableContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698