webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp - Issue 11091057: [cc] Use base ptr types for cc's CSS animation classes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp

Issue 11091057: [cc] Use base ptr types for cc's CSS animation classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ternary => if statement Created 8 years, 2 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 | « webkit/compositor_bindings/WebFloatAnimationCurveImpl.h ('k') | webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp

diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp

index 15351e1548d9260f1b11e0fe8a714a101caaa6a7..8bce2ce9ebbaf9f6f3fc0c8e17c359b1173917f8 100644

--- a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp

+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp

@@ -10,8 +10,6 @@

#include "CCKeyframedAnimationCurve.h"

#include "CCTimingFunction.h"

#include "WebAnimationCurveCommon.h"

-#include <wtf/OwnPtr.h>

-#include <wtf/PassOwnPtr.h>

namespace WebKit {

@@ -46,7 +44,7 @@ void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, TimingFun

void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, double x1, double y1, double x2, double y2)

{

- m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));

+ m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2).PassAs<cc::CCTimingFunction>()));

}

float WebFloatAnimationCurveImpl::getValue(double time) const

@@ -54,7 +52,7 @@ float WebFloatAnimationCurveImpl::getValue(double time) const

return m_curve->getValue(time);

}

-PassOwnPtr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const

+scoped_ptr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const

{

return m_curve->clone();

}