| OLD | NEW |
| 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 } | 343 } |
| 344 } | 344 } |
| 345 | 345 |
| 346 void RenderSVGText::layout() | 346 void RenderSVGText::layout() |
| 347 { | 347 { |
| 348 ASSERT(needsLayout()); | 348 ASSERT(needsLayout()); |
| 349 LayoutRepainter repainter(*this, SVGRenderSupport::checkForSVGRepaintDuringL
ayout(this)); | 349 LayoutRepainter repainter(*this, SVGRenderSupport::checkForSVGRepaintDuringL
ayout(this)); |
| 350 | 350 |
| 351 bool updateCachedBoundariesInParents = false; | 351 bool updateCachedBoundariesInParents = false; |
| 352 if (m_needsTransformUpdate) { | 352 if (m_needsTransformUpdate) { |
| 353 SVGTextElement* text = static_cast<SVGTextElement*>(node()); | 353 m_localTransform = toSVGTextElement(node())->animatedLocalTransform(); |
| 354 m_localTransform = text->animatedLocalTransform(); | |
| 355 m_needsTransformUpdate = false; | 354 m_needsTransformUpdate = false; |
| 356 updateCachedBoundariesInParents = true; | 355 updateCachedBoundariesInParents = true; |
| 357 } | 356 } |
| 358 | 357 |
| 359 if (!everHadLayout()) { | 358 if (!everHadLayout()) { |
| 360 // When laying out initially, collect all layout attributes, build the c
haracter data map, | 359 // When laying out initially, collect all layout attributes, build the c
haracter data map, |
| 361 // and propogate resulting SVGLayoutAttributes to all RenderSVGInlineTex
t children in the subtree. | 360 // and propogate resulting SVGLayoutAttributes to all RenderSVGInlineTex
t children in the subtree. |
| 362 ASSERT(m_layoutAttributes.isEmpty()); | 361 ASSERT(m_layoutAttributes.isEmpty()); |
| 363 collectLayoutAttributes(this, m_layoutAttributes); | 362 collectLayoutAttributes(this, m_layoutAttributes); |
| 364 updateFontInAllDescendants(this); | 363 updateFontInAllDescendants(this); |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 return 0; | 551 return 0; |
| 553 } | 552 } |
| 554 | 553 |
| 555 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl
e | 554 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl
e |
| 556 // in a SVG text element context. | 555 // in a SVG text element context. |
| 557 void RenderSVGText::updateFirstLetter() | 556 void RenderSVGText::updateFirstLetter() |
| 558 { | 557 { |
| 559 } | 558 } |
| 560 | 559 |
| 561 } | 560 } |
| OLD | NEW |