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

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

Issue 263393003: Add early-out to RenderSVG{Block,ModelObject}::repaintTreeAfterLayout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add early-out to RenderSVGBlock too. Created 6 years, 7 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // returns incorrect values for SVG objects. Overriding this method provides acc ess to the absolute bounds. 121 // returns incorrect values for SVG objects. Overriding this method provides acc ess to the absolute bounds.
122 void RenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads) 122 void RenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads)
123 { 123 {
124 quads.append(localToAbsoluteQuad(FloatQuad(repaintRectInLocalCoordinates())) ); 124 quads.append(localToAbsoluteQuad(FloatQuad(repaintRectInLocalCoordinates())) );
125 } 125 }
126 126
127 void RenderSVGModelObject::repaintTreeAfterLayout() 127 void RenderSVGModelObject::repaintTreeAfterLayout()
128 { 128 {
129 // Note: This is a reduced version of RenderBox::repaintTreeAfterLayout(). 129 // Note: This is a reduced version of RenderBox::repaintTreeAfterLayout().
130 // FIXME: Should share code with RenderBox::repaintTreeAfterLayout(). 130 // FIXME: Should share code with RenderBox::repaintTreeAfterLayout().
131 LayoutStateDisabler layoutStateDisabler(*this);
132
133 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); 131 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled());
134 ASSERT(!needsLayout()); 132 ASSERT(!needsLayout());
135 133
134 if (!shouldCheckForInvalidationAfterLayout())
135 return;
136
137 LayoutStateDisabler layoutStateDisabler(*this);
138
136 const LayoutRect oldRepaintRect = previousRepaintRect(); 139 const LayoutRect oldRepaintRect = previousRepaintRect();
137 const LayoutPoint oldPositionFromRepaintContainer = previousPositionFromRepa intContainer(); 140 const LayoutPoint oldPositionFromRepaintContainer = previousPositionFromRepa intContainer();
138 RenderLayerModelObject* repaintContainer = containerForRepaint(); 141 RenderLayerModelObject* repaintContainer = containerForRepaint();
139 setPreviousRepaintRect(clippedOverflowRectForRepaint(repaintContainer)); 142 setPreviousRepaintRect(clippedOverflowRectForRepaint(repaintContainer));
140 setPreviousPositionFromRepaintContainer(positionFromRepaintContainer(repaint Container)); 143 setPreviousPositionFromRepaintContainer(positionFromRepaintContainer(repaint Container));
141 144
142 // If we are set to do a full repaint that means the RenderView will be 145 // If we are set to do a full repaint that means the RenderView will be
143 // invalidated. We can then skip issuing of invalidations for the child 146 // invalidated. We can then skip issuing of invalidations for the child
144 // renderers as they'll be covered by the RenderView. 147 // renderers as they'll be covered by the RenderView.
145 if (view()->doingFullRepaint()) { 148 if (view()->doingFullRepaint()) {
146 RenderObject::repaintTreeAfterLayout(); 149 RenderObject::repaintTreeAfterLayout();
147 return; 150 return;
148 } 151 }
149 152
150 const LayoutRect& newRepaintRect = previousRepaintRect(); 153 const LayoutRect& newRepaintRect = previousRepaintRect();
151 const LayoutPoint& newPositionFromRepaintContainer = previousPositionFromRep aintContainer(); 154 const LayoutPoint& newPositionFromRepaintContainer = previousPositionFromRep aintContainer();
152 repaintAfterLayoutIfNeeded(containerForRepaint(), 155 repaintAfterLayoutIfNeeded(containerForRepaint(),
153 shouldDoFullRepaintAfterLayout(), oldRepaintRect, oldPositionFromRepaint Container, &newRepaintRect, &newPositionFromRepaintContainer); 156 shouldDoFullRepaintAfterLayout(), oldRepaintRect, oldPositionFromRepaint Container, &newRepaintRect, &newPositionFromRepaintContainer);
154 157
155 RenderObject::repaintTreeAfterLayout(); 158 RenderObject::repaintTreeAfterLayout();
156 } 159 }
157 160
158 } // namespace WebCore 161 } // namespace WebCore
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