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

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

Issue 433603004: Disentangle repaint-after-compositing from updateLayerPositionsAfterLayout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 4 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/RenderSVGBlock.cpp ('k') | no next file » | 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) 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 { 124 {
125 quads.append(localToAbsoluteQuad(FloatQuad(paintInvalidationRectInLocalCoord inates()))); 125 quads.append(localToAbsoluteQuad(FloatQuad(paintInvalidationRectInLocalCoord inates())));
126 } 126 }
127 127
128 void RenderSVGModelObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState) 128 void RenderSVGModelObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
129 { 129 {
130 // Note: This is a reduced version of RenderBox::invalidateTreeIfNeeded(). 130 // Note: This is a reduced version of RenderBox::invalidateTreeIfNeeded().
131 // FIXME: Should share code with RenderBox::invalidateTreeIfNeeded(). 131 // FIXME: Should share code with RenderBox::invalidateTreeIfNeeded().
132 ASSERT(!needsLayout()); 132 ASSERT(!needsLayout());
133 133
134 if (!shouldCheckForPaintInvalidation()) 134 if (!shouldCheckForPaintInvalidation(paintInvalidationState))
135 return; 135 return;
136 136
137 invalidatePaintIfNeeded(paintInvalidationState); 137 invalidatePaintIfNeeded(paintInvalidationState);
138 138
139 RenderObject::invalidateTreeIfNeeded(paintInvalidationState); 139 RenderObject::invalidateTreeIfNeeded(paintInvalidationState);
140 } 140 }
141 141
142 void RenderSVGModelObject::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState) 142 void RenderSVGModelObject::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
143 { 143 {
144 ForceHorriblySlowRectMapping slowRectMapping(&paintInvalidationState); 144 ForceHorriblySlowRectMapping slowRectMapping(&paintInvalidationState);
145 145
146 const LayoutRect oldPaintInvalidationRect = previousPaintInvalidationRect(); 146 const LayoutRect oldPaintInvalidationRect = previousPaintInvalidationRect();
147 const LayoutPoint oldPositionFromPaintInvalidationContainer = previousPositi onFromPaintInvalidationContainer(); 147 const LayoutPoint oldPositionFromPaintInvalidationContainer = previousPositi onFromPaintInvalidationContainer();
148 ASSERT(paintInvalidationState.paintInvalidationContainer() == containerForPa intInvalidation()); 148 ASSERT(paintInvalidationState.paintInvalidationContainer() == containerForPa intInvalidation());
149 setPreviousPaintInvalidationRect(boundsRectForPaintInvalidation(&paintInvali dationState.paintInvalidationContainer(), &paintInvalidationState)); 149 setPreviousPaintInvalidationRect(boundsRectForPaintInvalidation(&paintInvali dationState.paintInvalidationContainer(), &paintInvalidationState));
150 setPreviousPositionFromPaintInvalidationContainer(RenderLayer::positionFromP aintInvalidationContainer(this, &paintInvalidationState.paintInvalidationContain er(), &paintInvalidationState)); 150 setPreviousPositionFromPaintInvalidationContainer(RenderLayer::positionFromP aintInvalidationContainer(this, &paintInvalidationState.paintInvalidationContain er(), &paintInvalidationState));
151 151
152 // If we are set to do a full paint invalidation that means the RenderView w ill be 152 // If we are set to do a full paint invalidation that means the RenderView w ill be
153 // issue paint invalidations. We can then skip issuing of paint invalidation s for the child 153 // issue paint invalidations. We can then skip issuing of paint invalidation s for the child
154 // renderers as they'll be covered by the RenderView. 154 // renderers as they'll be covered by the RenderView.
155 if (view()->doingFullPaintInvalidation()) 155 if (view()->doingFullPaintInvalidation())
156 return; 156 return;
157 157
158 RenderObject::invalidatePaintIfNeeded(paintInvalidationState.paintInvalidati onContainer(), oldPaintInvalidationRect, oldPositionFromPaintInvalidationContain er, paintInvalidationState); 158 RenderObject::invalidatePaintIfNeeded(paintInvalidationState.paintInvalidati onContainer(), oldPaintInvalidationRect, oldPositionFromPaintInvalidationContain er, paintInvalidationState);
159 } 159 }
160 160
161 } // namespace blink 161 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698