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

Unified Diff: Source/core/platform/animation/Animation.cpp

Issue 14391005: Rename Animation -> PrimitiveAnimation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update to long paths Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/animation/Animation.h ('k') | Source/core/platform/animation/AnimationList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/animation/Animation.cpp
diff --git a/Source/core/platform/animation/Animation.cpp b/Source/core/platform/animation/Animation.cpp
deleted file mode 100644
index a1dc769e4bcb6e27b4c81cbe6a5498e981d13a66..0000000000000000000000000000000000000000
--- a/Source/core/platform/animation/Animation.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "core/platform/animation/Animation.h"
-
-namespace WebCore {
-
-Animation::Animation()
- : m_name(initialAnimationName())
- , m_property(CSSPropertyInvalid)
- , m_mode(AnimateAll)
- , m_iterationCount(initialAnimationIterationCount())
- , m_delay(initialAnimationDelay())
- , m_duration(initialAnimationDuration())
- , m_timingFunction(initialAnimationTimingFunction())
- , m_direction(initialAnimationDirection())
- , m_fillMode(initialAnimationFillMode())
- , m_playState(initialAnimationPlayState())
- , m_delaySet(false)
- , m_directionSet(false)
- , m_durationSet(false)
- , m_fillModeSet(false)
- , m_iterationCountSet(false)
- , m_nameSet(false)
- , m_playStateSet(false)
- , m_propertySet(false)
- , m_timingFunctionSet(false)
- , m_isNone(false)
-{
-}
-
-Animation::Animation(const Animation& o)
- : RefCounted<Animation>()
- , m_name(o.m_name)
- , m_property(o.m_property)
- , m_mode(o.m_mode)
- , m_iterationCount(o.m_iterationCount)
- , m_delay(o.m_delay)
- , m_duration(o.m_duration)
- , m_timingFunction(o.m_timingFunction)
- , m_direction(o.m_direction)
- , m_fillMode(o.m_fillMode)
- , m_playState(o.m_playState)
- , m_delaySet(o.m_delaySet)
- , m_directionSet(o.m_directionSet)
- , m_durationSet(o.m_durationSet)
- , m_fillModeSet(o.m_fillModeSet)
- , m_iterationCountSet(o.m_iterationCountSet)
- , m_nameSet(o.m_nameSet)
- , m_playStateSet(o.m_playStateSet)
- , m_propertySet(o.m_propertySet)
- , m_timingFunctionSet(o.m_timingFunctionSet)
- , m_isNone(o.m_isNone)
-{
-}
-
-Animation& Animation::operator=(const Animation& o)
-{
- m_name = o.m_name;
- m_property = o.m_property;
- m_mode = o.m_mode;
- m_iterationCount = o.m_iterationCount;
- m_delay = o.m_delay;
- m_duration = o.m_duration;
- m_timingFunction = o.m_timingFunction;
- m_direction = o.m_direction;
- m_fillMode = o.m_fillMode;
- m_playState = o.m_playState;
-
- m_delaySet = o.m_delaySet;
- m_directionSet = o.m_directionSet;
- m_durationSet = o.m_durationSet;
- m_fillModeSet = o.m_fillModeSet;
- m_iterationCountSet = o.m_iterationCountSet;
- m_nameSet = o.m_nameSet;
- m_playStateSet = o.m_playStateSet;
- m_propertySet = o.m_propertySet;
- m_timingFunctionSet = o.m_timingFunctionSet;
- m_isNone = o.m_isNone;
-
- return *this;
-}
-
-Animation::~Animation()
-{
-}
-
-bool Animation::animationsMatch(const Animation* o, bool matchPlayStates) const
-{
- if (!o)
- return false;
-
- bool result = m_name == o->m_name
- && m_property == o->m_property
- && m_mode == o->m_mode
- && m_iterationCount == o->m_iterationCount
- && m_delay == o->m_delay
- && m_duration == o->m_duration
- && *(m_timingFunction.get()) == *(o->m_timingFunction.get())
- && m_direction == o->m_direction
- && m_fillMode == o->m_fillMode
- && m_delaySet == o->m_delaySet
- && m_directionSet == o->m_directionSet
- && m_durationSet == o->m_durationSet
- && m_fillModeSet == o->m_fillModeSet
- && m_iterationCountSet == o->m_iterationCountSet
- && m_nameSet == o->m_nameSet
- && m_propertySet == o->m_propertySet
- && m_timingFunctionSet == o->m_timingFunctionSet
- && m_isNone == o->m_isNone;
-
- if (!result)
- return false;
-
- return !matchPlayStates || (m_playState == o->m_playState && m_playStateSet == o->m_playStateSet);
-}
-
-const String& Animation::initialAnimationName()
-{
- DEFINE_STATIC_LOCAL(String, initialValue, (ASCIILiteral("none")));
- return initialValue;
-}
-
-} // namespace WebCore
« no previous file with comments | « Source/core/platform/animation/Animation.h ('k') | Source/core/platform/animation/AnimationList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698