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

Side by Side Diff: Source/core/platform/animation/CSSAnimationData.cpp

Issue 61033003: Remove unused matchPlayState argument from CSSAnimationData::animationsMatch() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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/platform/animation/CSSAnimationData.h ('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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 m_timingFunctionSet = o.m_timingFunctionSet; 97 m_timingFunctionSet = o.m_timingFunctionSet;
98 m_isNone = o.m_isNone; 98 m_isNone = o.m_isNone;
99 99
100 return *this; 100 return *this;
101 } 101 }
102 102
103 CSSAnimationData::~CSSAnimationData() 103 CSSAnimationData::~CSSAnimationData()
104 { 104 {
105 } 105 }
106 106
107 bool CSSAnimationData::animationsMatch(const CSSAnimationData* o, bool matchPlay States) const 107 bool CSSAnimationData::animationsMatch(const CSSAnimationData* o) const
108 { 108 {
109 if (!o) 109 if (!o)
110 return false; 110 return false;
111 111
112 bool result = m_name == o->m_name 112 return m_name == o->m_name
113 && m_property == o->m_property 113 && m_playState == o->m_playState
114 && m_mode == o->m_mode 114 && m_property == o->m_property
115 && m_iterationCount == o->m_iterationCount 115 && m_mode == o->m_mode
116 && m_delay == o->m_delay 116 && m_iterationCount == o->m_iterationCount
117 && m_duration == o->m_duration 117 && m_delay == o->m_delay
118 && *(m_timingFunction.get()) == *(o->m_timingFunction.get()) 118 && m_duration == o->m_duration
119 && m_direction == o->m_direction 119 && *(m_timingFunction.get()) == *(o->m_timingFunction.get())
120 && m_fillMode == o->m_fillMode 120 && m_direction == o->m_direction
121 && m_delaySet == o->m_delaySet 121 && m_fillMode == o->m_fillMode
122 && m_directionSet == o->m_directionSet 122 && m_delaySet == o->m_delaySet
123 && m_durationSet == o->m_durationSet 123 && m_directionSet == o->m_directionSet
124 && m_fillModeSet == o->m_fillModeSet 124 && m_durationSet == o->m_durationSet
125 && m_iterationCountSet == o->m_iterationCountSet 125 && m_fillModeSet == o->m_fillModeSet
126 && m_nameSet == o->m_nameSet 126 && m_iterationCountSet == o->m_iterationCountSet
127 && m_propertySet == o->m_propertySet 127 && m_nameSet == o->m_nameSet
128 && m_timingFunctionSet == o->m_timingFunctionSet 128 && m_playStateSet == o->m_playStateSet
129 && m_isNone == o->m_isNone; 129 && m_propertySet == o->m_propertySet
130 130 && m_timingFunctionSet == o->m_timingFunctionSet
131 if (!result) 131 && m_isNone == o->m_isNone;
132 return false;
133
134 return !matchPlayStates || (m_playState == o->m_playState && m_playStateSet == o->m_playStateSet);
135 } 132 }
136 133
137 const String& CSSAnimationData::initialAnimationName() 134 const String& CSSAnimationData::initialAnimationName()
138 { 135 {
139 DEFINE_STATIC_LOCAL(String, initialValue, ("none")); 136 DEFINE_STATIC_LOCAL(String, initialValue, ("none"));
140 return initialValue; 137 return initialValue;
141 } 138 }
142 139
143 } // namespace WebCore 140 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/animation/CSSAnimationData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698