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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 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) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
6 * Copyright (C) 2008 Rob Buis <buis@kde.org> 6 * Copyright (C) 2008 Rob Buis <buis@kde.org>
7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
9 * Copyright (C) 2012 Google Inc. 9 * Copyright (C) 2012 Google Inc.
10 * 10 *
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 , m_needsTransformUpdate(true) 60 , m_needsTransformUpdate(true)
61 , m_needsTextMetricsUpdate(false) 61 , m_needsTextMetricsUpdate(false)
62 { 62 {
63 } 63 }
64 64
65 RenderSVGText::~RenderSVGText() 65 RenderSVGText::~RenderSVGText()
66 { 66 {
67 ASSERT(m_layoutAttributes.isEmpty()); 67 ASSERT(m_layoutAttributes.isEmpty());
68 } 68 }
69 69
70 bool RenderSVGText::isChildAllowed(RenderObject* child, RenderStyle*) const 70 bool RenderSVGText::isChildAllowed(RenderObject* child, const RenderStyle*) cons t
71 { 71 {
72 return child->isSVGInline() || (child->isText() && SVGRenderSupport::isRende rableTextNode(child)); 72 return child->isSVGInline() || (child->isText() && SVGRenderSupport::isRende rableTextNode(child));
73 } 73 }
74 74
75 RenderSVGText* RenderSVGText::locateRenderSVGTextAncestor(RenderObject* start) 75 RenderSVGText* RenderSVGText::locateRenderSVGTextAncestor(RenderObject* start)
76 { 76 {
77 ASSERT(start); 77 ASSERT(start);
78 while (start && !start->isSVGText()) 78 while (start && !start->isSVGText())
79 start = start->parent(); 79 start = start->parent();
80 if (!start || !start->isSVGText()) 80 if (!start || !start->isSVGText())
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 SVGResourcesCache::clientWillBeRemovedFromTree(child); 499 SVGResourcesCache::clientWillBeRemovedFromTree(child);
500 500
501 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; 501 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
502 FontCachePurgePreventer fontCachePurgePreventer; 502 FontCachePurgePreventer fontCachePurgePreventer;
503 subtreeChildWillBeRemoved(child, affectedAttributes); 503 subtreeChildWillBeRemoved(child, affectedAttributes);
504 RenderSVGBlock::removeChild(child); 504 RenderSVGBlock::removeChild(child);
505 subtreeChildWasRemoved(affectedAttributes); 505 subtreeChildWasRemoved(affectedAttributes);
506 } 506 }
507 507
508 } 508 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698