OLD | NEW |
---|---|
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 3702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3713 | 3713 |
3714 inline bool RenderLayer::needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const | 3714 inline bool RenderLayer::needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const |
3715 { | 3715 { |
3716 ASSERT(newStyle); | 3716 ASSERT(newStyle); |
3717 return oldStyle && (oldStyle->clip() != newStyle->clip() || oldStyle->hasCli p() != newStyle->hasClip()); | 3717 return oldStyle && (oldStyle->clip() != newStyle->clip() || oldStyle->hasCli p() != newStyle->hasClip()); |
3718 } | 3718 } |
3719 | 3719 |
3720 inline bool RenderLayer::needsCompositingLayersRebuiltForOverflow(const RenderSt yle* oldStyle, const RenderStyle* newStyle) const | 3720 inline bool RenderLayer::needsCompositingLayersRebuiltForOverflow(const RenderSt yle* oldStyle, const RenderStyle* newStyle) const |
3721 { | 3721 { |
3722 ASSERT(newStyle); | 3722 ASSERT(newStyle); |
3723 return !hasCompositedLayerMapping() && oldStyle && (oldStyle->overflowX() != newStyle->overflowX()) && m_stackingNode->ancestorStackingContainerNode()->laye r()->hasCompositingDescendant(); | 3723 return !hasCompositedLayerMapping() && oldStyle && (oldStyle->overflowX() != newStyle->overflowX()) && m_stackingNode->ancestorStackingContainerNode() && m_ stackingNode->ancestorStackingContainerNode()->layer()->hasCompositingDescendant (); |
rune
2014/02/07 16:44:27
Is it time to split this statement across multiple
mstensho (USE GERRIT)
2014/02/11 10:44:14
Done.
| |
3724 } | 3724 } |
3725 | 3725 |
3726 inline bool RenderLayer::needsCompositingLayersRebuiltForFilters(const RenderSty le* oldStyle, const RenderStyle* newStyle, bool didPaintWithFilters) const | 3726 inline bool RenderLayer::needsCompositingLayersRebuiltForFilters(const RenderSty le* oldStyle, const RenderStyle* newStyle, bool didPaintWithFilters) const |
3727 { | 3727 { |
3728 if (!hasOrHadFilters(oldStyle, newStyle)) | 3728 if (!hasOrHadFilters(oldStyle, newStyle)) |
3729 return false; | 3729 return false; |
3730 | 3730 |
3731 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() | 3731 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() |
3732 ? hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitFilter) | 3732 ? hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitFilter) |
3733 : renderer()->animation().isRunningAcceleratedAnimationOnRenderer(render er(), CSSPropertyWebkitFilter)) { | 3733 : renderer()->animation().isRunningAcceleratedAnimationOnRenderer(render er(), CSSPropertyWebkitFilter)) { |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3987 } | 3987 } |
3988 } | 3988 } |
3989 | 3989 |
3990 void showLayerTree(const WebCore::RenderObject* renderer) | 3990 void showLayerTree(const WebCore::RenderObject* renderer) |
3991 { | 3991 { |
3992 if (!renderer) | 3992 if (!renderer) |
3993 return; | 3993 return; |
3994 showLayerTree(renderer->enclosingLayer()); | 3994 showLayerTree(renderer->enclosingLayer()); |
3995 } | 3995 } |
3996 #endif | 3996 #endif |
OLD | NEW |