summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/compositor_bindings/WebAnimationCurveCommon.cpp9
-rw-r--r--webkit/compositor_bindings/WebAnimationCurveCommon.h3
-rw-r--r--webkit/compositor_bindings/WebAnimationImpl.cpp11
-rw-r--r--webkit/compositor_bindings/WebAnimationImpl.h6
-rw-r--r--webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp6
-rw-r--r--webkit/compositor_bindings/WebFloatAnimationCurveImpl.h7
-rw-r--r--webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp12
-rw-r--r--webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp4
-rw-r--r--webkit/compositor_bindings/WebTransformAnimationCurveImpl.h7
-rw-r--r--webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp12
10 files changed, 41 insertions, 36 deletions
diff --git a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
index 2cd5ac2..d13750e 100644
--- a/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.cpp
@@ -8,9 +8,12 @@
#include "CCTimingFunction.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+
namespace WebKit {
-scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
+PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType type)
{
switch (type) {
case WebAnimationCurve::TimingFunctionTypeEase:
@@ -22,9 +25,9 @@ scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingF
case WebAnimationCurve::TimingFunctionTypeEaseInOut:
return cc::CCEaseInOutTimingFunction::create();
case WebAnimationCurve::TimingFunctionTypeLinear:
- return scoped_ptr<cc::CCTimingFunction>();
+ return nullptr;
}
- return scoped_ptr<cc::CCTimingFunction>();
+ return nullptr;
}
} // namespace WebKit
diff --git a/webkit/compositor_bindings/WebAnimationCurveCommon.h b/webkit/compositor_bindings/WebAnimationCurveCommon.h
index 1278830..2df8b5f 100644
--- a/webkit/compositor_bindings/WebAnimationCurveCommon.h
+++ b/webkit/compositor_bindings/WebAnimationCurveCommon.h
@@ -5,7 +5,6 @@
#ifndef WebAnimationCurveCommon_h
#define WebAnimationCurveCommon_h
-#include "base/memory/scoped_ptr.h"
#include <public/WebAnimationCurve.h>
#include <wtf/Forward.h>
@@ -14,7 +13,7 @@ class CCTimingFunction;
}
namespace WebKit {
-scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType);
+PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingFunctionType);
}
#endif // WebAnimationCurveCommon_h
diff --git a/webkit/compositor_bindings/WebAnimationImpl.cpp b/webkit/compositor_bindings/WebAnimationImpl.cpp
index cf401e9..b915082 100644
--- a/webkit/compositor_bindings/WebAnimationImpl.cpp
+++ b/webkit/compositor_bindings/WebAnimationImpl.cpp
@@ -13,6 +13,7 @@
#include <public/WebAnimation.h>
#include <public/WebAnimationCurve.h>
#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
using cc::CCActiveAnimation;
@@ -33,7 +34,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
groupId = nextGroupId++;
WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
- scoped_ptr<cc::CCAnimationCurve> curve;
+ OwnPtr<cc::CCAnimationCurve> curve;
switch (curveType) {
case WebAnimationCurve::AnimationCurveTypeFloat: {
const WebFloatAnimationCurveImpl* floatCurveImpl = static_cast<const WebFloatAnimationCurveImpl*>(&webCurve);
@@ -46,7 +47,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
break;
}
}
- m_animation = CCActiveAnimation::create(curve.Pass(), animationId, groupId, static_cast<cc::CCActiveAnimation::TargetProperty>(targetProperty));
+ m_animation = CCActiveAnimation::create(curve.release(), animationId, groupId, static_cast<cc::CCActiveAnimation::TargetProperty>(targetProperty));
}
WebAnimationImpl::~WebAnimationImpl()
@@ -103,11 +104,11 @@ void WebAnimationImpl::setAlternatesDirection(bool alternates)
m_animation->setAlternatesDirection(alternates);
}
-scoped_ptr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
+PassOwnPtr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
{
- scoped_ptr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAnimation::NonControllingInstance));
+ OwnPtr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAnimation::NonControllingInstance));
toReturn->setNeedsSynchronizedStartTime(true);
- return toReturn.Pass();
+ return toReturn.release();
}
} // namespace WebKit
diff --git a/webkit/compositor_bindings/WebAnimationImpl.h b/webkit/compositor_bindings/WebAnimationImpl.h
index d15eeb3..a4abfc9 100644
--- a/webkit/compositor_bindings/WebAnimationImpl.h
+++ b/webkit/compositor_bindings/WebAnimationImpl.h
@@ -5,7 +5,6 @@
#ifndef WebAnimationImpl_h
#define WebAnimationImpl_h
-#include "base/memory/scoped_ptr.h"
#include <public/WebAnimation.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -33,10 +32,9 @@ public:
virtual bool alternatesDirection() const OVERRIDE;
virtual void setAlternatesDirection(bool) OVERRIDE;
- scoped_ptr<cc::CCActiveAnimation> cloneToCCAnimation();
-
+ PassOwnPtr<cc::CCActiveAnimation> cloneToCCAnimation();
private:
- scoped_ptr<cc::CCActiveAnimation> m_animation;
+ OwnPtr<cc::CCActiveAnimation> m_animation;
};
}
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
index 8bce2ce..15351e1 100644
--- a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
@@ -10,6 +10,8 @@
#include "CCKeyframedAnimationCurve.h"
#include "CCTimingFunction.h"
#include "WebAnimationCurveCommon.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
namespace WebKit {
@@ -44,7 +46,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).PassAs<cc::CCTimingFunction>()));
+ m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));
}
float WebFloatAnimationCurveImpl::getValue(double time) const
@@ -52,7 +54,7 @@ float WebFloatAnimationCurveImpl::getValue(double time) const
return m_curve->getValue(time);
}
-scoped_ptr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
+PassOwnPtr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
{
return m_curve->clone();
}
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
index 757d3e6..be6d80c 100644
--- a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.h
@@ -5,8 +5,9 @@
#ifndef WebFloatAnimationCurveImpl_h
#define WebFloatAnimationCurveImpl_h
-#include "base/memory/scoped_ptr.h"
#include <public/WebFloatAnimationCurve.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
namespace cc {
class CCAnimationCurve;
@@ -30,10 +31,10 @@ public:
virtual float getValue(double time) const OVERRIDE;
- scoped_ptr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const;
+ PassOwnPtr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const;
private:
- scoped_ptr<cc::CCKeyframedFloatAnimationCurve> m_curve;
+ OwnPtr<cc::CCKeyframedFloatAnimationCurve> m_curve;
};
}
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
index 8cb12e5..c358886e 100644
--- a/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveTest.cpp
@@ -119,7 +119,7 @@ TEST(WebFloatAnimationCurveTest, EaseTimingFunction)
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEase);
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -146,7 +146,7 @@ TEST(WebFloatAnimationCurveTest, EaseInTimingFunction)
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseIn);
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -160,7 +160,7 @@ TEST(WebFloatAnimationCurveTest, EaseOutTimingFunction)
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseOut);
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -174,7 +174,7 @@ TEST(WebFloatAnimationCurveTest, EaseInOutTimingFunction)
curve->add(WebFloatKeyframe(0, 0), WebAnimationCurve::TimingFunctionTypeEaseInOut);
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -192,7 +192,7 @@ TEST(WebFloatAnimationCurveTest, CustomBezierTimingFunction)
curve->add(WebFloatKeyframe(0, 0), x1, y1, x2, y2);
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
@@ -206,7 +206,7 @@ TEST(WebFloatAnimationCurveTest, DefaultTimingFunction)
curve->add(WebFloatKeyframe(0, 0));
curve->add(WebFloatKeyframe(1, 1), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time));
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
index e6b732f..dae0bd1 100644
--- a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp
@@ -45,7 +45,7 @@ void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, T
void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, double x1, double y1, double x2, double y2)
{
- m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2).PassAs<cc::CCTimingFunction>()));
+ m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));
}
WebTransformationMatrix WebTransformAnimationCurveImpl::getValue(double time) const
@@ -53,7 +53,7 @@ WebTransformationMatrix WebTransformAnimationCurveImpl::getValue(double time) co
return m_curve->getValue(time);
}
-scoped_ptr<cc::CCAnimationCurve> WebTransformAnimationCurveImpl::cloneToCCAnimationCurve() const
+PassOwnPtr<cc::CCAnimationCurve> WebTransformAnimationCurveImpl::cloneToCCAnimationCurve() const
{
return m_curve->clone();
}
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
index 88f1c3e..8631ef9 100644
--- a/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveImpl.h
@@ -5,8 +5,9 @@
#ifndef WebTransformAnimationCurveImpl_h
#define WebTransformAnimationCurveImpl_h
-#include "base/memory/scoped_ptr.h"
#include <public/WebTransformAnimationCurve.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
namespace cc {
class CCAnimationCurve;
@@ -30,10 +31,10 @@ public:
virtual WebTransformationMatrix getValue(double time) const OVERRIDE;
- scoped_ptr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const;
+ PassOwnPtr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const;
private:
- scoped_ptr<cc::CCKeyframedTransformAnimationCurve> m_curve;
+ OwnPtr<cc::CCKeyframedTransformAnimationCurve> m_curve;
};
}
diff --git a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
index fe0ab80..09021c7 100644
--- a/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
+++ b/webkit/compositor_bindings/WebTransformAnimationCurveTest.cpp
@@ -156,7 +156,7 @@ TEST(WebTransformAnimationCurveTest, EaseTimingFunction)
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEase);
curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -191,7 +191,7 @@ TEST(WebTransformAnimationCurveTest, EaseInTimingFunction)
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseIn);
curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -209,7 +209,7 @@ TEST(WebTransformAnimationCurveTest, EaseOutTimingFunction)
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseOut);
curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseOutTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -227,7 +227,7 @@ TEST(WebTransformAnimationCurveTest, EaseInOutTimingFunction)
curve->add(WebTransformKeyframe(0, operations1), WebAnimationCurve::TimingFunctionTypeEaseInOut);
curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseInOutTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -249,7 +249,7 @@ TEST(WebTransformAnimationCurveTest, CustomBezierTimingFunction)
curve->add(WebTransformKeyframe(0, operations1), x1, y1, x2, y2);
curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2));
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
@@ -267,7 +267,7 @@ TEST(WebTransformAnimationCurveTest, DefaultTimingFunction)
curve->add(WebTransformKeyframe(0, operations1));
curve->add(WebTransformKeyframe(1, operations2), WebAnimationCurve::TimingFunctionTypeLinear);
- scoped_ptr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
+ OwnPtr<cc::CCTimingFunction> timingFunction(cc::CCEaseTimingFunction::create());
for (int i = 0; i <= 4; ++i) {
const double time = i * 0.25;
EXPECT_FLOAT_EQ(timingFunction->getValue(time), curve->getValue(time).m41());
generated by cgit v1.1 at 2025-05-14 14:06:21 +0000