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

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

Issue 706353002: Revert paint-invalidation-container ASSERT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added a missing test to rebaselin. 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
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 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 return compositedLayer; 990 return compositedLayer;
991 } 991 }
992 992
993 RenderLayer* RenderLayer::enclosingLayerForPaintInvalidation() const 993 RenderLayer* RenderLayer::enclosingLayerForPaintInvalidation() const
994 { 994 {
995 ASSERT(isAllowedToQueryCompositingState()); 995 ASSERT(isAllowedToQueryCompositingState());
996 996
997 if (isPaintInvalidationContainer()) 997 if (isPaintInvalidationContainer())
998 return const_cast<RenderLayer*>(this); 998 return const_cast<RenderLayer*>(this);
999 999
1000 for (const RenderLayer* curr = parent(); curr; curr = curr->parent()) { 1000 for (const RenderLayer* curr = compositingContainer(); curr; curr = curr->co mpositingContainer()) {
1001 if (curr->isPaintInvalidationContainer()) 1001 if (curr->isPaintInvalidationContainer())
1002 return const_cast<RenderLayer*>(curr); 1002 return const_cast<RenderLayer*>(curr);
1003 } 1003 }
1004 1004
1005 return 0; 1005 return 0;
1006 } 1006 }
1007 1007
1008 void RenderLayer::setNeedsCompositingInputsUpdate() 1008 void RenderLayer::setNeedsCompositingInputsUpdate()
1009 { 1009 {
1010 m_needsAncestorDependentCompositingInputsUpdate = true; 1010 m_needsAncestorDependentCompositingInputsUpdate = true;
(...skipping 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after
2854 } 2854 }
2855 } 2855 }
2856 2856
2857 void showLayerTree(const blink::RenderObject* renderer) 2857 void showLayerTree(const blink::RenderObject* renderer)
2858 { 2858 {
2859 if (!renderer) 2859 if (!renderer)
2860 return; 2860 return;
2861 showLayerTree(renderer->enclosingLayer()); 2861 showLayerTree(renderer->enclosingLayer());
2862 } 2862 }
2863 #endif 2863 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698