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

Side by Side Diff: third_party/WebKit/Source/core/dom/Element.cpp

Issue 2035793007: Make sure z-index is adjusted after applying pending animations on elements (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « third_party/WebKit/LayoutTests/animations/transform-animation-stacking-context-expected.txt ('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) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 if (hasCustomStyleCallbacks()) 1652 if (hasCustomStyleCallbacks())
1653 style = customStyleForLayoutObject(); 1653 style = customStyleForLayoutObject();
1654 if (!style) 1654 if (!style)
1655 style = originalStyleForLayoutObject(); 1655 style = originalStyleForLayoutObject();
1656 DCHECK(style); 1656 DCHECK(style);
1657 1657
1658 // styleForElement() might add active animations so we need to get it again. 1658 // styleForElement() might add active animations so we need to get it again.
1659 if (ElementAnimations* elementAnimations = this->elementAnimations()) { 1659 if (ElementAnimations* elementAnimations = this->elementAnimations()) {
1660 elementAnimations->cssAnimations().maybeApplyPendingUpdate(this); 1660 elementAnimations->cssAnimations().maybeApplyPendingUpdate(this);
1661 elementAnimations->updateAnimationFlags(*style); 1661 elementAnimations->updateAnimationFlags(*style);
1662
1663 // This is supposed to be done by StyleAdjuster, but we may not have upd ated animation
1664 // list until this point.
1665 if (style->hasAutoZIndex() && (style->hasCurrentOpacityAnimation()
1666 || style->hasCurrentTransformAnimation()
1667 || style->hasCurrentFilterAnimation()))
1668 style->setZIndex(0);
1662 } 1669 }
1663 1670
1664 if (style->hasTransform()) { 1671 if (style->hasTransform()) {
1665 if (const StylePropertySet* inlineStyle = this->inlineStyle()) 1672 if (const StylePropertySet* inlineStyle = this->inlineStyle())
1666 style->setHasInlineTransform(inlineStyle->hasProperty(CSSPropertyTra nsform)); 1673 style->setHasInlineTransform(inlineStyle->hasProperty(CSSPropertyTra nsform));
1667 } 1674 }
1668 1675
1669 return style.release(); 1676 return style.release();
1670 } 1677 }
1671 1678
(...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after
3709 3716
3710 DEFINE_TRACE_WRAPPERS(Element) 3717 DEFINE_TRACE_WRAPPERS(Element)
3711 { 3718 {
3712 if (hasRareData()) { 3719 if (hasRareData()) {
3713 visitor->traceWrappers(elementRareData()); 3720 visitor->traceWrappers(elementRareData());
3714 } 3721 }
3715 ContainerNode::traceWrappers(visitor); 3722 ContainerNode::traceWrappers(visitor);
3716 } 3723 }
3717 3724
3718 } // namespace blink 3725 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/animations/transform-animation-stacking-context-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698