From 2e2ba8ff45915f40ed3e014101269c175f2a89a0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Aug 2012 08:29:43 +0200 Subject: Imported WebKit commit bf0b0213bbf3886c96610020602012ca7d11b084 (http://svn.webkit.org/repository/webkit/trunk@126545) New snapshot with clang and python build fixes --- .../WebKit/chromium/src/WebFloatAnimationCurve.cpp | 72 ---------------------- 1 file changed, 72 deletions(-) delete mode 100644 Source/WebKit/chromium/src/WebFloatAnimationCurve.cpp (limited to 'Source/WebKit/chromium/src/WebFloatAnimationCurve.cpp') diff --git a/Source/WebKit/chromium/src/WebFloatAnimationCurve.cpp b/Source/WebKit/chromium/src/WebFloatAnimationCurve.cpp deleted file mode 100644 index e8cf7c2d2..000000000 --- a/Source/WebKit/chromium/src/WebFloatAnimationCurve.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2012 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: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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 "config.h" - -#include - -#include "CCKeyframedAnimationCurve.h" -#include "CCTimingFunction.h" -#include "WebAnimationCurveCommon.h" -#include -#include - -namespace WebKit { - -void WebFloatAnimationCurve::add(const WebFloatKeyframe& keyframe) -{ - add(keyframe, TimingFunctionTypeEase); -} - -void WebFloatAnimationCurve::add(const WebFloatKeyframe& keyframe, TimingFunctionType type) -{ - m_private->addKeyframe(WebCore::CCFloatKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type))); -} - -void WebFloatAnimationCurve::add(const WebFloatKeyframe& keyframe, double x1, double y1, double x2, double y2) -{ - m_private->addKeyframe(WebCore::CCFloatKeyframe::create(keyframe.time, keyframe.value, WebCore::CCCubicBezierTimingFunction::create(x1, y1, x2, y2))); -} - -float WebFloatAnimationCurve::getValue(double time) const -{ - return m_private->getValue(time); -} - -WebFloatAnimationCurve::operator PassOwnPtr() const -{ - return m_private->clone(); -} - -void WebFloatAnimationCurve::initialize() -{ - m_private.reset(WebCore::CCKeyframedFloatAnimationCurve::create().leakPtr()); -} - -void WebFloatAnimationCurve::destroy() -{ - m_private.reset(0); -} - -} // namespace WebKit -- cgit v1.2.1