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

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

Issue 715623004: Merge 185075 "Revert paint-invalidation-container ASSERT" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2171/
Patch Set: Created 6 years, 1 month 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 963 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 return compositedLayer; 974 return compositedLayer;
975 } 975 }
976 976
977 RenderLayer* RenderLayer::enclosingLayerForPaintInvalidation() const 977 RenderLayer* RenderLayer::enclosingLayerForPaintInvalidation() const
978 { 978 {
979 ASSERT(isAllowedToQueryCompositingState()); 979 ASSERT(isAllowedToQueryCompositingState());
980 980
981 if (isPaintInvalidationContainer()) 981 if (isPaintInvalidationContainer())
982 return const_cast<RenderLayer*>(this); 982 return const_cast<RenderLayer*>(this);
983 983
984 for (const RenderLayer* curr = parent(); curr; curr = curr->parent()) { 984 for (const RenderLayer* curr = compositingContainer(); curr; curr = curr->co mpositingContainer()) {
985 if (curr->isPaintInvalidationContainer()) 985 if (curr->isPaintInvalidationContainer())
986 return const_cast<RenderLayer*>(curr); 986 return const_cast<RenderLayer*>(curr);
987 } 987 }
988 988
989 return 0; 989 return 0;
990 } 990 }
991 991
992 void RenderLayer::setNeedsCompositingInputsUpdate() 992 void RenderLayer::setNeedsCompositingInputsUpdate()
993 { 993 {
994 m_needsAncestorDependentCompositingInputsUpdate = true; 994 m_needsAncestorDependentCompositingInputsUpdate = true;
(...skipping 2707 matching lines...) Expand 10 before | Expand all | Expand 10 after
3702 } 3702 }
3703 } 3703 }
3704 3704
3705 void showLayerTree(const blink::RenderObject* renderer) 3705 void showLayerTree(const blink::RenderObject* renderer)
3706 { 3706 {
3707 if (!renderer) 3707 if (!renderer)
3708 return; 3708 return;
3709 showLayerTree(renderer->enclosingLayer()); 3709 showLayerTree(renderer->enclosingLayer());
3710 } 3710 }
3711 #endif 3711 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698