| 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 | 216 |
| 217 m_layoutAttributes.clear(); | 217 m_layoutAttributes.clear(); |
| 218 collectLayoutAttributes(this, m_layoutAttributes); | 218 collectLayoutAttributes(this, m_layoutAttributes); |
| 219 | 219 |
| 220 SVGTextLayoutAttributesBuilder(*this).buildLayoutAttributes(); | 220 SVGTextLayoutAttributesBuilder(*this).buildLayoutAttributes(); |
| 221 | 221 |
| 222 m_needsReordering = true; | 222 m_needsReordering = true; |
| 223 m_needsPositioningValuesUpdate = false; | 223 m_needsPositioningValuesUpdate = false; |
| 224 updateCachedBoundariesInParents = true; | 224 updateCachedBoundariesInParents = true; |
| 225 } else if (m_needsTextMetricsUpdate || SVGLayoutSupport::findTreeRootObject(
this)->isLayoutSizeChanged()) { | 225 } else if (m_needsTextMetricsUpdate || SVGLayoutSupport::findTreeRootObject(
this)->isLayoutSizeChanged()) { |
| 226 // If the root layout size changed (eg. window size changes) or the tran
sform to the root | 226 // If the root layout size changed (eg. window size changes), or the scr
een scale factor has |
| 227 // context has changed then recompute the on-screen font size. | 227 // changed, then recompute the on-screen font size. |
| 228 updateFontAndMetrics(*this); | 228 updateFontAndMetrics(*this); |
| 229 | 229 |
| 230 ASSERT(!m_needsReordering); | 230 ASSERT(!m_needsReordering); |
| 231 ASSERT(!m_needsPositioningValuesUpdate); | 231 ASSERT(!m_needsPositioningValuesUpdate); |
| 232 m_needsTextMetricsUpdate = false; | 232 m_needsTextMetricsUpdate = false; |
| 233 updateCachedBoundariesInParents = true; | 233 updateCachedBoundariesInParents = true; |
| 234 } | 234 } |
| 235 | 235 |
| 236 checkLayoutAttributesConsistency(this, m_layoutAttributes); | 236 checkLayoutAttributesConsistency(this, m_layoutAttributes); |
| 237 | 237 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this); | 417 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this); |
| 418 | 418 |
| 419 if (reason == PaintInvalidationSVGResourceChange) | 419 if (reason == PaintInvalidationSVGResourceChange) |
| 420 newPaintInvalidationState.setForceSubtreeInvalidationWithinContainer(); | 420 newPaintInvalidationState.setForceSubtreeInvalidationWithinContainer(); |
| 421 | 421 |
| 422 newPaintInvalidationState.updateForChildren(); | 422 newPaintInvalidationState.updateForChildren(); |
| 423 invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState); | 423 invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState); |
| 424 } | 424 } |
| 425 | 425 |
| 426 } // namespace blink | 426 } // namespace blink |
| OLD | NEW |