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

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

Issue 360833002: Divorce PaintInvalidationState from LayoutState (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address Julien's comments Created 6 years, 5 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
« no previous file with comments | « Source/core/rendering/svg/RenderSVGText.h ('k') | Source/core/rendering/svg/SVGRenderSupport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 const RenderSVGText* RenderSVGText::locateRenderSVGTextAncestor(const RenderObje ct* start) 87 const RenderSVGText* RenderSVGText::locateRenderSVGTextAncestor(const RenderObje ct* start)
88 { 88 {
89 ASSERT(start); 89 ASSERT(start);
90 while (start && !start->isSVGText()) 90 while (start && !start->isSVGText())
91 start = start->parent(); 91 start = start->parent();
92 if (!start || !start->isSVGText()) 92 if (!start || !start->isSVGText())
93 return 0; 93 return 0;
94 return toRenderSVGText(start); 94 return toRenderSVGText(start);
95 } 95 }
96 96
97 void RenderSVGText::mapRectToPaintInvalidationBacking(const RenderLayerModelObje ct* paintInvalidationContainer, LayoutRect& rect, bool fixed) const 97 void RenderSVGText::mapRectToPaintInvalidationBacking(const RenderLayerModelObje ct* paintInvalidationContainer, LayoutRect& rect, bool fixed, const PaintInvalid ationState* paintInvalidationState) const
98 { 98 {
99 FloatRect repaintRect = rect; 99 FloatRect repaintRect = rect;
100 computeFloatRectForPaintInvalidation(paintInvalidationContainer, repaintRect , fixed); 100 computeFloatRectForPaintInvalidation(paintInvalidationContainer, repaintRect , fixed, paintInvalidationState);
101 rect = enclosingLayoutRect(repaintRect); 101 rect = enclosingLayoutRect(repaintRect);
102 } 102 }
103 103
104 static inline void collectLayoutAttributes(RenderObject* text, Vector<SVGTextLay outAttributes*>& attributes) 104 static inline void collectLayoutAttributes(RenderObject* text, Vector<SVGTextLay outAttributes*>& attributes)
105 { 105 {
106 for (RenderObject* descendant = text; descendant; descendant = descendant->n extInPreOrder(text)) { 106 for (RenderObject* descendant = text; descendant; descendant = descendant->n extInPreOrder(text)) {
107 if (descendant->isSVGInlineText()) 107 if (descendant->isSVGInlineText())
108 attributes.append(toRenderSVGInlineText(descendant)->layoutAttribute s()); 108 attributes.append(toRenderSVGInlineText(descendant)->layoutAttribute s());
109 } 109 }
110 } 110 }
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 return 0; 541 return 0;
542 } 542 }
543 543
544 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl e 544 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl e
545 // in a SVG text element context. 545 // in a SVG text element context.
546 void RenderSVGText::updateFirstLetter() 546 void RenderSVGText::updateFirstLetter()
547 { 547 {
548 } 548 }
549 549
550 } 550 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGText.h ('k') | Source/core/rendering/svg/SVGRenderSupport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698