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

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

Issue 27104002: Fix ASSERT failure in RenderGeometryMap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: +test Created 7 years, 2 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/RenderLayer.h ('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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 651
652 void RenderLayer::updateLayerPositionsAfterScroll(RenderGeometryMap* geometryMap , UpdateLayerPositionsAfterScrollFlags flags) 652 void RenderLayer::updateLayerPositionsAfterScroll(RenderGeometryMap* geometryMap , UpdateLayerPositionsAfterScrollFlags flags)
653 { 653 {
654 // FIXME: This shouldn't be needed, but there are some corner cases where 654 // FIXME: This shouldn't be needed, but there are some corner cases where
655 // these flags are still dirty. Update so that the check below is valid. 655 // these flags are still dirty. Update so that the check below is valid.
656 updateDescendantDependentFlags(); 656 updateDescendantDependentFlags();
657 657
658 // If we have no visible content and no visible descendants, there is no poi nt recomputing 658 // If we have no visible content and no visible descendants, there is no poi nt recomputing
659 // our rectangles as they will be empty. If our visibility changes, we are e xpected to 659 // our rectangles as they will be empty. If our visibility changes, we are e xpected to
660 // recompute all our positions anyway. 660 // recompute all our positions anyway.
661 if (!m_hasVisibleDescendant && !m_hasVisibleContent) 661 if (subtreeIsInvisible())
662 return; 662 return;
663 663
664 bool positionChanged = updateLayerPosition(); 664 bool positionChanged = updateLayerPosition();
665 if (positionChanged) 665 if (positionChanged)
666 flags |= HasChangedAncestor; 666 flags |= HasChangedAncestor;
667 667
668 if (geometryMap) 668 if (geometryMap)
669 geometryMap->pushMappingsToAncestor(this, parent()); 669 geometryMap->pushMappingsToAncestor(this, parent());
670 670
671 if (flags & HasChangedAncestor || flags & HasSeenViewportConstrainedAncestor || flags & IsOverflowScroll) 671 if (flags & HasChangedAncestor || flags & HasSeenViewportConstrainedAncestor || flags & IsOverflowScroll)
(...skipping 4564 matching lines...) Expand 10 before | Expand all | Expand 10 after
5236 } 5236 }
5237 } 5237 }
5238 5238
5239 void showLayerTree(const WebCore::RenderObject* renderer) 5239 void showLayerTree(const WebCore::RenderObject* renderer)
5240 { 5240 {
5241 if (!renderer) 5241 if (!renderer)
5242 return; 5242 return;
5243 showLayerTree(renderer->enclosingLayer()); 5243 showLayerTree(renderer->enclosingLayer());
5244 } 5244 }
5245 #endif 5245 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698