| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 const RenderSVGText* RenderSVGText::locateRenderSVGTextAncestor(const RenderObje
ct* start) | 85 const RenderSVGText* RenderSVGText::locateRenderSVGTextAncestor(const RenderObje
ct* start) |
| 86 { | 86 { |
| 87 ASSERT(start); | 87 ASSERT(start); |
| 88 while (start && !start->isSVGText()) | 88 while (start && !start->isSVGText()) |
| 89 start = start->parent(); | 89 start = start->parent(); |
| 90 if (!start || !start->isSVGText()) | 90 if (!start || !start->isSVGText()) |
| 91 return 0; | 91 return 0; |
| 92 return toRenderSVGText(start); | 92 return toRenderSVGText(start); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void RenderSVGText::mapRectToPaintInvalidationBacking(const RenderLayerModelObje
ct* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState*
paintInvalidationState) const | |
| 96 { | |
| 97 FloatRect paintInvalidationRect = rect; | |
| 98 paintInvalidationRect.inflate(style()->outlineWidth()); | |
| 99 computeFloatRectForPaintInvalidation(paintInvalidationContainer, paintInvali
dationRect, paintInvalidationState); | |
| 100 rect = enclosingLayoutRect(paintInvalidationRect); | |
| 101 } | |
| 102 | |
| 103 static inline void collectLayoutAttributes(RenderObject* text, Vector<SVGTextLay
outAttributes*>& attributes) | 95 static inline void collectLayoutAttributes(RenderObject* text, Vector<SVGTextLay
outAttributes*>& attributes) |
| 104 { | 96 { |
| 105 for (RenderObject* descendant = text; descendant; descendant = descendant->n
extInPreOrder(text)) { | 97 for (RenderObject* descendant = text; descendant; descendant = descendant->n
extInPreOrder(text)) { |
| 106 if (descendant->isSVGInlineText()) | 98 if (descendant->isSVGInlineText()) |
| 107 attributes.append(toRenderSVGInlineText(descendant)->layoutAttribute
s()); | 99 attributes.append(toRenderSVGInlineText(descendant)->layoutAttribute
s()); |
| 108 } | 100 } |
| 109 } | 101 } |
| 110 | 102 |
| 111 static inline bool findPreviousAndNextAttributes(RenderSVGText* root, RenderSVGI
nlineText* locateElement, SVGTextLayoutAttributes*& previous, SVGTextLayoutAttri
butes*& next) | 103 static inline bool findPreviousAndNextAttributes(RenderSVGText* root, RenderSVGI
nlineText* locateElement, SVGTextLayoutAttributes*& previous, SVGTextLayoutAttri
butes*& next) |
| 112 { | 104 { |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 SVGResourcesCache::clientWillBeRemovedFromTree(child); | 499 SVGResourcesCache::clientWillBeRemovedFromTree(child); |
| 508 | 500 |
| 509 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; | 501 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; |
| 510 FontCachePurgePreventer fontCachePurgePreventer; | 502 FontCachePurgePreventer fontCachePurgePreventer; |
| 511 subtreeChildWillBeRemoved(child, affectedAttributes); | 503 subtreeChildWillBeRemoved(child, affectedAttributes); |
| 512 RenderSVGBlock::removeChild(child); | 504 RenderSVGBlock::removeChild(child); |
| 513 subtreeChildWasRemoved(affectedAttributes); | 505 subtreeChildWasRemoved(affectedAttributes); |
| 514 } | 506 } |
| 515 | 507 |
| 516 } | 508 } |
| OLD | NEW |