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

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

Issue 693423002: Devirtualize animatedLocalTransform() and rename it for clarity (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove some codes that snuck in 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 | 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 319 }
320 320
321 void RenderSVGText::layout() 321 void RenderSVGText::layout()
322 { 322 {
323 ASSERT(needsLayout()); 323 ASSERT(needsLayout());
324 324
325 subtreeStyleDidChange(); 325 subtreeStyleDidChange();
326 326
327 bool updateCachedBoundariesInParents = false; 327 bool updateCachedBoundariesInParents = false;
328 if (m_needsTransformUpdate) { 328 if (m_needsTransformUpdate) {
329 m_localTransform = toSVGTextElement(node())->animatedLocalTransform(); 329 m_localTransform = toSVGTextElement(node())->calculateAnimatedLocalTrans form();
330 m_needsTransformUpdate = false; 330 m_needsTransformUpdate = false;
331 updateCachedBoundariesInParents = true; 331 updateCachedBoundariesInParents = true;
332 } 332 }
333 333
334 if (!everHadLayout()) { 334 if (!everHadLayout()) {
335 // When laying out initially, collect all layout attributes, build the c haracter data map, 335 // When laying out initially, collect all layout attributes, build the c haracter data map,
336 // and propogate resulting SVGLayoutAttributes to all RenderSVGInlineTex t children in the subtree. 336 // and propogate resulting SVGLayoutAttributes to all RenderSVGInlineTex t children in the subtree.
337 ASSERT(m_layoutAttributes.isEmpty()); 337 ASSERT(m_layoutAttributes.isEmpty());
338 collectLayoutAttributes(this, m_layoutAttributes); 338 collectLayoutAttributes(this, m_layoutAttributes);
339 updateFontInAllDescendants(this); 339 updateFontInAllDescendants(this);
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 SVGResourcesCache::clientWillBeRemovedFromTree(child); 507 SVGResourcesCache::clientWillBeRemovedFromTree(child);
508 508
509 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; 509 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
510 FontCachePurgePreventer fontCachePurgePreventer; 510 FontCachePurgePreventer fontCachePurgePreventer;
511 subtreeChildWillBeRemoved(child, affectedAttributes); 511 subtreeChildWillBeRemoved(child, affectedAttributes);
512 RenderSVGBlock::removeChild(child); 512 RenderSVGBlock::removeChild(child);
513 subtreeChildWasRemoved(affectedAttributes); 513 subtreeChildWasRemoved(affectedAttributes);
514 } 514 }
515 515
516 } 516 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGShape.cpp ('k') | Source/core/rendering/svg/RenderSVGTextPath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698