| Index: sky/engine/core/animation/AnimationClock.cpp
|
| diff --git a/sky/engine/core/animation/AnimationClock.cpp b/sky/engine/core/animation/AnimationClock.cpp
|
| deleted file mode 100644
|
| index 09be3423554a77428abdddaef4101f83b8c0c04e..0000000000000000000000000000000000000000
|
| --- a/sky/engine/core/animation/AnimationClock.cpp
|
| +++ /dev/null
|
| @@ -1,81 +0,0 @@
|
| -/*
|
| - * Copyright (c) 2014, Google Inc. All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are
|
| - * met:
|
| - *
|
| - * * Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * * Redistributions in binary form must reproduce the above
|
| - * copyright notice, this list of conditions and the following disclaimer
|
| - * in the documentation and/or other materials provided with the
|
| - * distribution.
|
| - * * Neither the name of Google Inc. nor the names of its
|
| - * contributors may be used to endorse or promote products derived from
|
| - * this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "sky/engine/core/animation/AnimationClock.h"
|
| -
|
| -#include <math.h>
|
| -#include "sky/engine/wtf/CurrentTime.h"
|
| -
|
| -namespace {
|
| -
|
| -// FIXME: This is an approximation of time between frames, used when
|
| -// ticking the animation clock outside of animation frame callbacks.
|
| -// Ideally this would be generated by the compositor.
|
| -const double approximateFrameTime = 1 / 60.0;
|
| -
|
| -}
|
| -
|
| -namespace blink {
|
| -
|
| -unsigned AnimationClock::s_currentTask = 0;
|
| -
|
| -void AnimationClock::updateTime(double time)
|
| -{
|
| - if (time > m_time)
|
| - m_time = time;
|
| - m_currentTask = s_currentTask;
|
| -}
|
| -
|
| -double AnimationClock::currentTime()
|
| -{
|
| - if (m_currentTask != s_currentTask) {
|
| - const double currentTime = m_monotonicallyIncreasingTime();
|
| - if (m_time < currentTime) {
|
| - // Advance to the first estimated frame after the current time.
|
| - const double frameShift = fmod(currentTime - m_time, approximateFrameTime);
|
| - const double newTime = currentTime + (approximateFrameTime - frameShift);
|
| - ASSERT(newTime >= currentTime);
|
| - ASSERT(newTime <= currentTime + approximateFrameTime);
|
| - updateTime(newTime);
|
| - } else {
|
| - m_currentTask = s_currentTask;
|
| - }
|
| - }
|
| - return m_time;
|
| -}
|
| -
|
| -void AnimationClock::resetTimeForTesting()
|
| -{
|
| - m_time = 0;
|
| - m_currentTask = 0;
|
| - s_currentTask = 0;
|
| -}
|
| -
|
| -}
|
|
|