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

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

Issue 414503002: Enable paint invalidation container ASSERT (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Dummy rebaseline for the picky trybots :( 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/RenderBox.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) 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 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 return compositedLayer; 1009 return compositedLayer;
1010 } 1010 }
1011 1011
1012 RenderLayer* RenderLayer::enclosingLayerForPaintInvalidation() const 1012 RenderLayer* RenderLayer::enclosingLayerForPaintInvalidation() const
1013 { 1013 {
1014 ASSERT(isAllowedToQueryCompositingState()); 1014 ASSERT(isAllowedToQueryCompositingState());
1015 1015
1016 if (isPaintInvalidationContainer()) 1016 if (isPaintInvalidationContainer())
1017 return const_cast<RenderLayer*>(this); 1017 return const_cast<RenderLayer*>(this);
1018 1018
1019 for (const RenderLayer* curr = compositingContainer(); curr; curr = curr->co mpositingContainer()) { 1019 for (const RenderLayer* curr = parent(); curr; curr = curr->parent()) {
1020 if (curr->isPaintInvalidationContainer()) 1020 if (curr->isPaintInvalidationContainer())
1021 return const_cast<RenderLayer*>(curr); 1021 return const_cast<RenderLayer*>(curr);
1022 } 1022 }
1023 1023
1024 return 0; 1024 return 0;
1025 } 1025 }
1026 1026
1027 RenderLayer* RenderLayer::enclosingFilterLayer(IncludeSelfOrNot includeSelf) con st 1027 RenderLayer* RenderLayer::enclosingFilterLayer(IncludeSelfOrNot includeSelf) con st
1028 { 1028 {
1029 const RenderLayer* curr = (includeSelf == IncludeSelf) ? this : parent(); 1029 const RenderLayer* curr = (includeSelf == IncludeSelf) ? this : parent();
(...skipping 2760 matching lines...) Expand 10 before | Expand all | Expand 10 after
3790 } 3790 }
3791 } 3791 }
3792 3792
3793 void showLayerTree(const blink::RenderObject* renderer) 3793 void showLayerTree(const blink::RenderObject* renderer)
3794 { 3794 {
3795 if (!renderer) 3795 if (!renderer)
3796 return; 3796 return;
3797 showLayerTree(renderer->enclosingLayer()); 3797 showLayerTree(renderer->enclosingLayer());
3798 } 3798 }
3799 #endif 3799 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698