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

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

Issue 182293002: Make Element::ensureActiveAnimations() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/Animation.cpp ('k') | Source/core/dom/Element.h » ('j') | 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 namespace { 87 namespace {
88 88
89 using namespace WebCore; 89 using namespace WebCore;
90 90
91 void setAnimationUpdateIfNeeded(StyleResolverState& state, Element& element) 91 void setAnimationUpdateIfNeeded(StyleResolverState& state, Element& element)
92 { 92 {
93 // If any changes to CSS Animations were detected, stash the update away for application after the 93 // If any changes to CSS Animations were detected, stash the update away for application after the
94 // render object is updated if we're in the appropriate scope. 94 // render object is updated if we're in the appropriate scope.
95 if (state.animationUpdate()) 95 if (state.animationUpdate())
96 element.ensureActiveAnimations()->cssAnimations().setPendingUpdate(state .takeAnimationUpdate()); 96 element.ensureActiveAnimations().cssAnimations().setPendingUpdate(state. takeAnimationUpdate());
97 } 97 }
98 98
99 } // namespace 99 } // namespace
100 100
101 namespace WebCore { 101 namespace WebCore {
102 102
103 using namespace HTMLNames; 103 using namespace HTMLNames;
104 104
105 RenderStyle* StyleResolver::s_styleNotYetAvailable; 105 RenderStyle* StyleResolver::s_styleNotYetAvailable;
106 106
(...skipping 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 bool StyleResolver::mediaQueryAffectedByViewportChange() const 1411 bool StyleResolver::mediaQueryAffectedByViewportChange() const
1412 { 1412 {
1413 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 1413 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
1414 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result) 1414 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result)
1415 return true; 1415 return true;
1416 } 1416 }
1417 return false; 1417 return false;
1418 } 1418 }
1419 1419
1420 } // namespace WebCore 1420 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/Animation.cpp ('k') | Source/core/dom/Element.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698