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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 219013002: CSS Animations: Adjust auto z-index when animating perspective (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | « LayoutTests/animations/webkit-perspective-expected.html ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpolationsForTransitions = state.animationUpdate()->activeInterpolatio nsForTransitions(); 1077 const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpolationsForTransitions = state.animationUpdate()->activeInterpolatio nsForTransitions();
1078 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF orAnimations); 1078 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF orAnimations);
1079 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF orTransitions); 1079 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF orTransitions);
1080 applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsFo rAnimations); 1080 applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsFo rAnimations);
1081 applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsFo rTransitions); 1081 applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsFo rTransitions);
1082 1082
1083 // If the animations/transitions change opacity or transform, we need to upd ate 1083 // If the animations/transitions change opacity or transform, we need to upd ate
1084 // the style to impose the stacking rules. Note that this is also 1084 // the style to impose the stacking rules. Note that this is also
1085 // done in StyleResolver::adjustRenderStyle(). 1085 // done in StyleResolver::adjustRenderStyle().
1086 RenderStyle* style = state.style(); 1086 RenderStyle* style = state.style();
1087 if (style->hasAutoZIndex() && (style->opacity() < 1.0f || style->hasTransfor m())) 1087 if (style->hasAutoZIndex() && (style->opacity() < 1.0f || style->hasTransfor mRelatedProperty()))
1088 style->setZIndex(0); 1088 style->setZIndex(0);
1089 1089
1090 // Start loading resources used by animations. 1090 // Start loading resources used by animations.
1091 loadPendingResources(state); 1091 loadPendingResources(state);
1092 } 1092 }
1093 1093
1094 template <StyleResolver::StyleApplicationPass pass> 1094 template <StyleResolver::StyleApplicationPass pass>
1095 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil lBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpo lations) 1095 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil lBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& activeInterpo lations)
1096 { 1096 {
1097 ASSERT(pass != AnimationProperties); 1097 ASSERT(pass != AnimationProperties);
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 visitor->trace(m_keyframesRuleMap); 1420 visitor->trace(m_keyframesRuleMap);
1421 visitor->trace(m_viewportDependentMediaQueryResults); 1421 visitor->trace(m_viewportDependentMediaQueryResults);
1422 visitor->trace(m_viewportStyleResolver); 1422 visitor->trace(m_viewportStyleResolver);
1423 visitor->trace(m_siblingRuleSet); 1423 visitor->trace(m_siblingRuleSet);
1424 visitor->trace(m_uncommonAttributeRuleSet); 1424 visitor->trace(m_uncommonAttributeRuleSet);
1425 visitor->trace(m_watchedSelectorsRules); 1425 visitor->trace(m_watchedSelectorsRules);
1426 visitor->trace(m_treeBoundaryCrossingRules); 1426 visitor->trace(m_treeBoundaryCrossingRules);
1427 } 1427 }
1428 1428
1429 } // namespace WebCore 1429 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/animations/webkit-perspective-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698