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

Side by Side Diff: Source/core/rendering/RenderLayer.cpp

Issue 516603003: Revert of Make the compositing assert disabler for paint invalidation more targeted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 1288
1289 return oldChild; 1289 return oldChild;
1290 } 1290 }
1291 1291
1292 void RenderLayer::removeOnlyThisLayer() 1292 void RenderLayer::removeOnlyThisLayer()
1293 { 1293 {
1294 if (!m_parent) 1294 if (!m_parent)
1295 return; 1295 return;
1296 1296
1297 m_clipper.clearClipRectsIncludingDescendants(); 1297 m_clipper.clearClipRectsIncludingDescendants();
1298
1299 // For querying RenderLayer::compositingState()
1300 // Eager invalidation here is correct, since we are invalidating with respec t to the previous frame's
1301 // compositing state when removing the layer.
1302 DisableCompositingQueryAsserts disabler;
1303 paintInvalidator().paintInvalidationIncludingNonCompositingDescendants(); 1298 paintInvalidator().paintInvalidationIncludingNonCompositingDescendants();
1304 1299
1305 RenderLayer* nextSib = nextSibling(); 1300 RenderLayer* nextSib = nextSibling();
1306 1301
1307 // Remove the child reflection layer before moving other child layers. 1302 // Remove the child reflection layer before moving other child layers.
1308 // The reflection layer should not be moved to the parent. 1303 // The reflection layer should not be moved to the parent.
1309 if (m_reflectionInfo) 1304 if (m_reflectionInfo)
1310 removeChild(m_reflectionInfo->reflectionLayer()); 1305 removeChild(m_reflectionInfo->reflectionLayer());
1311 1306
1312 // Now walk our kids and reattach them to our parent. 1307 // Now walk our kids and reattach them to our parent.
(...skipping 2396 matching lines...) Expand 10 before | Expand all | Expand 10 after
3709 } 3704 }
3710 } 3705 }
3711 3706
3712 void showLayerTree(const blink::RenderObject* renderer) 3707 void showLayerTree(const blink::RenderObject* renderer)
3713 { 3708 {
3714 if (!renderer) 3709 if (!renderer)
3715 return; 3710 return;
3716 showLayerTree(renderer->enclosingLayer()); 3711 showLayerTree(renderer->enclosingLayer());
3717 } 3712 }
3718 #endif 3713 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderImage.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698