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

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

Issue 157553002: Remove the Pagination struct, clean up viewport scroll policy propagation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master Created 6 years, 10 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
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 3717 matching lines...) Expand 10 before | Expand all | Expand 10 after
3728 3728
3729 inline bool RenderLayer::needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const 3729 inline bool RenderLayer::needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const
3730 { 3730 {
3731 ASSERT(newStyle); 3731 ASSERT(newStyle);
3732 return oldStyle && (oldStyle->clip() != newStyle->clip() || oldStyle->hasCli p() != newStyle->hasClip()); 3732 return oldStyle && (oldStyle->clip() != newStyle->clip() || oldStyle->hasCli p() != newStyle->hasClip());
3733 } 3733 }
3734 3734
3735 inline bool RenderLayer::needsCompositingLayersRebuiltForOverflow(const RenderSt yle* oldStyle, const RenderStyle* newStyle) const 3735 inline bool RenderLayer::needsCompositingLayersRebuiltForOverflow(const RenderSt yle* oldStyle, const RenderStyle* newStyle) const
3736 { 3736 {
3737 ASSERT(newStyle); 3737 ASSERT(newStyle);
3738 return !hasCompositedLayerMapping() && oldStyle && (oldStyle->overflowX() != newStyle->overflowX()) && m_stackingNode->ancestorStackingContainerNode()->laye r()->hasCompositingDescendant(); 3738 return !hasCompositedLayerMapping()
3739 && oldStyle
3740 && (oldStyle->overflowX() != newStyle->overflowX())
3741 && m_stackingNode->ancestorStackingContainerNode()
3742 && m_stackingNode->ancestorStackingContainerNode()->layer()->hasComposit ingDescendant();
3739 } 3743 }
3740 3744
3741 inline bool RenderLayer::needsCompositingLayersRebuiltForFilters(const RenderSty le* oldStyle, const RenderStyle* newStyle, bool didPaintWithFilters) const 3745 inline bool RenderLayer::needsCompositingLayersRebuiltForFilters(const RenderSty le* oldStyle, const RenderStyle* newStyle, bool didPaintWithFilters) const
3742 { 3746 {
3743 if (!hasOrHadFilters(oldStyle, newStyle)) 3747 if (!hasOrHadFilters(oldStyle, newStyle))
3744 return false; 3748 return false;
3745 3749
3746 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && hasActiveAnimations OnCompositor(*renderer(), CSSPropertyWebkitFilter)) { 3750 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && hasActiveAnimations OnCompositor(*renderer(), CSSPropertyWebkitFilter)) {
3747 3751
3748 // When the compositor is performing the filter animation, we shouldn't touch the compositing layers. 3752 // When the compositor is performing the filter animation, we shouldn't touch the compositing layers.
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
3997 } 4001 }
3998 } 4002 }
3999 4003
4000 void showLayerTree(const WebCore::RenderObject* renderer) 4004 void showLayerTree(const WebCore::RenderObject* renderer)
4001 { 4005 {
4002 if (!renderer) 4006 if (!renderer)
4003 return; 4007 return;
4004 showLayerTree(renderer->enclosingLayer()); 4008 showLayerTree(renderer->enclosingLayer());
4005 } 4009 }
4006 #endif 4010 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698