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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGInline.cpp

Issue 1856393002: Simplify layout attribute invalidation in LayoutSVGText (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 4 years, 8 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp » ('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 Oliver Hunt <ojh16@student.canterbury.ac.nz> 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
3 * Copyright (C) 2006 Apple Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Inc. All rights reserved.
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 LayoutInline::styleDidChange(diff, oldStyle); 124 LayoutInline::styleDidChange(diff, oldStyle);
125 SVGResourcesCache::clientStyleChanged(this, diff, styleRef()); 125 SVGResourcesCache::clientStyleChanged(this, diff, styleRef());
126 } 126 }
127 127
128 void LayoutSVGInline::addChild(LayoutObject* child, LayoutObject* beforeChild) 128 void LayoutSVGInline::addChild(LayoutObject* child, LayoutObject* beforeChild)
129 { 129 {
130 LayoutInline::addChild(child, beforeChild); 130 LayoutInline::addChild(child, beforeChild);
131 SVGResourcesCache::clientWasAddedToTree(child, child->styleRef()); 131 SVGResourcesCache::clientWasAddedToTree(child, child->styleRef());
132 132
133 if (LayoutSVGText* textLayoutObject = LayoutSVGText::locateLayoutSVGTextAnce stor(this)) 133 if (LayoutSVGText* textLayoutObject = LayoutSVGText::locateLayoutSVGTextAnce stor(this))
134 textLayoutObject->subtreeChildWasAdded(child); 134 textLayoutObject->subtreeChildWasAdded();
135 } 135 }
136 136
137 void LayoutSVGInline::removeChild(LayoutObject* child) 137 void LayoutSVGInline::removeChild(LayoutObject* child)
138 { 138 {
139 SVGResourcesCache::clientWillBeRemovedFromTree(child); 139 SVGResourcesCache::clientWillBeRemovedFromTree(child);
140 140
141 if (LayoutSVGText* textLayoutObject = LayoutSVGText::locateLayoutSVGTextAnce stor(this)) 141 if (LayoutSVGText* textLayoutObject = LayoutSVGText::locateLayoutSVGTextAnce stor(this))
142 textLayoutObject->subtreeChildWillBeRemoved(child); 142 textLayoutObject->subtreeChildWillBeRemoved();
143 LayoutInline::removeChild(child); 143 LayoutInline::removeChild(child);
144 } 144 }
145 145
146 void LayoutSVGInline::invalidateTreeIfNeeded(const PaintInvalidationState& paint InvalidationState) 146 void LayoutSVGInline::invalidateTreeIfNeeded(const PaintInvalidationState& paint InvalidationState)
147 { 147 {
148 ASSERT(!needsLayout()); 148 ASSERT(!needsLayout());
149 149
150 if (!shouldCheckForPaintInvalidation(paintInvalidationState)) 150 if (!shouldCheckForPaintInvalidation(paintInvalidationState))
151 return; 151 return;
152 152
153 PaintInvalidationState newPaintInvalidationState(paintInvalidationState, *th is); 153 PaintInvalidationState newPaintInvalidationState(paintInvalidationState, *th is);
154 PaintInvalidationReason reason = invalidatePaintIfNeeded(newPaintInvalidatio nState); 154 PaintInvalidationReason reason = invalidatePaintIfNeeded(newPaintInvalidatio nState);
155 clearPaintInvalidationFlags(newPaintInvalidationState); 155 clearPaintInvalidationFlags(newPaintInvalidationState);
156 156
157 if (reason == PaintInvalidationDelayedFull) 157 if (reason == PaintInvalidationDelayedFull)
158 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this); 158 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this);
159 159
160 if (reason == PaintInvalidationSVGResourceChange) 160 if (reason == PaintInvalidationSVGResourceChange)
161 newPaintInvalidationState.setForceSubtreeInvalidationWithinContainer(); 161 newPaintInvalidationState.setForceSubtreeInvalidationWithinContainer();
162 162
163 newPaintInvalidationState.updateForChildren(); 163 newPaintInvalidationState.updateForChildren();
164 invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState); 164 invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState);
165 } 165 }
166 166
167 } // namespace blink 167 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698