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

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

Issue 1281493004: Make CSSAnimationUpdate stack-allocated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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/css/resolver/StyleResolverState.cpp ('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 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 1582
1583 PassRefPtr<ComputedStyle> Element::styleForLayoutObject() 1583 PassRefPtr<ComputedStyle> Element::styleForLayoutObject()
1584 { 1584 {
1585 ASSERT(document().inStyleRecalc()); 1585 ASSERT(document().inStyleRecalc());
1586 1586
1587 RefPtr<ComputedStyle> style; 1587 RefPtr<ComputedStyle> style;
1588 1588
1589 // FIXME: Instead of clearing updates that may have been added from calls to styleForElement 1589 // FIXME: Instead of clearing updates that may have been added from calls to styleForElement
1590 // outside recalcStyle, we should just never set them if we're not inside re calcStyle. 1590 // outside recalcStyle, we should just never set them if we're not inside re calcStyle.
1591 if (ElementAnimations* elementAnimations = this->elementAnimations()) 1591 if (ElementAnimations* elementAnimations = this->elementAnimations())
1592 elementAnimations->cssAnimations().setPendingUpdate(nullptr); 1592 elementAnimations->cssAnimations().clearPendingUpdate();
1593 1593
1594 if (hasCustomStyleCallbacks()) 1594 if (hasCustomStyleCallbacks())
1595 style = customStyleForLayoutObject(); 1595 style = customStyleForLayoutObject();
1596 if (!style) 1596 if (!style)
1597 style = originalStyleForLayoutObject(); 1597 style = originalStyleForLayoutObject();
1598 ASSERT(style); 1598 ASSERT(style);
1599 1599
1600 // styleForElement() might add active animations so we need to get it again. 1600 // styleForElement() might add active animations so we need to get it again.
1601 if (ElementAnimations* elementAnimations = this->elementAnimations()) { 1601 if (ElementAnimations* elementAnimations = this->elementAnimations()) {
1602 elementAnimations->cssAnimations().maybeApplyPendingUpdate(this); 1602 elementAnimations->cssAnimations().maybeApplyPendingUpdate(this);
(...skipping 1895 matching lines...) Expand 10 before | Expand all | Expand 10 after
3498 { 3498 {
3499 #if ENABLE(OILPAN) 3499 #if ENABLE(OILPAN)
3500 if (hasRareData()) 3500 if (hasRareData())
3501 visitor->trace(elementRareData()); 3501 visitor->trace(elementRareData());
3502 visitor->trace(m_elementData); 3502 visitor->trace(m_elementData);
3503 #endif 3503 #endif
3504 ContainerNode::trace(visitor); 3504 ContainerNode::trace(visitor);
3505 } 3505 }
3506 3506
3507 } // namespace blink 3507 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698