cc/test/CCAnimationTestCommon.h - Issue 11086053: Revert 161133 - [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: cc/test/CCAnimationTestCommon.h

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

Patch Set: 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

Index: cc/test/CCAnimationTestCommon.h

===================================================================

--- cc/test/CCAnimationTestCommon.h (revision 161134)

+++ cc/test/CCAnimationTestCommon.h (working copy)

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

#include "CCLayerAnimationController.h"

#include "IntSize.h"

+#include <wtf/OwnPtr.h>

namespace cc {

class CCLayerImpl;

class LayerChromium;

@@ -25,7 +27,7 @@

virtual double duration() const OVERRIDE;

virtual float getValue(double now) const OVERRIDE;

- virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;

+ virtual PassOwnPtr<cc::CCAnimationCurve> clone() const OVERRIDE;

private:

double m_duration;

@@ -39,7 +41,7 @@

virtual double duration() const OVERRIDE;

virtual WebKit::WebTransformationMatrix getValue(double time) const OVERRIDE;

- virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;

+ virtual PassOwnPtr<cc::CCAnimationCurve> clone() const OVERRIDE;

private:

double m_duration;

@@ -53,7 +55,7 @@

virtual double duration() const OVERRIDE;

virtual float getValue(double time) const OVERRIDE;

- virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;

+ virtual PassOwnPtr<cc::CCAnimationCurve> clone() const OVERRIDE;

private:

double m_duration;

« no previous file with comments | « cc/TreeSynchronizerTest.cpp ('k') | cc/test/CCAnimationTestCommon.cpp » ('j') | no next file with comments »