Index: third_party/WebKit/Source/platform/graphics/CompositorFactory.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/CompositorFactory.cpp b/third_party/WebKit/Source/platform/graphics/CompositorFactory.cpp |
index 8695aeac3d3cc893b1df1aca3649b2232bf82461..beb3c01c07b8e535ab590dc0c9ac4a1b4f6186fa 100644 |
--- a/third_party/WebKit/Source/platform/graphics/CompositorFactory.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/CompositorFactory.cpp |
@@ -17,58 +17,60 @@ namespace blink { |
class CompositorFactoryImpl : public CompositorFactory { |
public: |
- CompositorFilterAnimationCurve* createFilterAnimationCurve() override |
+ PassOwnPtr<CompositorFilterAnimationCurve> createFilterAnimationCurve() override |
{ |
- return new CompositorFilterAnimationCurve(); |
+ return adoptPtr(new CompositorFilterAnimationCurve()); |
} |
- CompositorFloatAnimationCurve* createFloatAnimationCurve() override |
+ PassOwnPtr<CompositorFloatAnimationCurve> createFloatAnimationCurve() override |
{ |
- return new CompositorFloatAnimationCurve(); |
+ return adoptPtr(new CompositorFloatAnimationCurve()); |
} |
- CompositorScrollOffsetAnimationCurve* createScrollOffsetAnimationCurve( |
+ PassOwnPtr<CompositorScrollOffsetAnimationCurve> createScrollOffsetAnimationCurve( |
FloatPoint targetValue, |
CompositorAnimationCurve::TimingFunctionType timingFunctionType, |
CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior durationBehavior) |
{ |
- return new CompositorScrollOffsetAnimationCurve(targetValue, timingFunctionType, |
- durationBehavior); |
+ return adoptPtr(new CompositorScrollOffsetAnimationCurve(targetValue, timingFunctionType, |
+ durationBehavior)); |
} |
- CompositorTransformAnimationCurve* createTransformAnimationCurve() override |
+ PassOwnPtr<CompositorTransformAnimationCurve> createTransformAnimationCurve() override |
{ |
- return new CompositorTransformAnimationCurve(); |
+ return adoptPtr(new CompositorTransformAnimationCurve()); |
} |
- CompositorTransformOperations* createTransformOperations() override |
+ PassOwnPtr<CompositorTransformOperations> createTransformOperations() override |
{ |
- return new CompositorTransformOperations(); |
+ return adoptPtr(new CompositorTransformOperations()); |
} |
- CompositorFilterOperations* createFilterOperations() override |
+ PassOwnPtr<CompositorFilterOperations> createFilterOperations() override |
{ |
- return new CompositorFilterOperations(); |
+ return adoptPtr(new CompositorFilterOperations()); |
} |
- CompositorAnimation* createAnimation(const blink::CompositorAnimationCurve& curve, blink::CompositorAnimation::TargetProperty target, int groupId, int animationId) override |
+ PassOwnPtr<CompositorAnimation> createAnimation(const blink::CompositorAnimationCurve& curve, blink::CompositorAnimation::TargetProperty target, int groupId, int animationId) override |
{ |
- return new CompositorAnimation(curve, target, animationId, groupId); |
+ return adoptPtr(new CompositorAnimation(curve, target, animationId, groupId)); |
} |
- CompositorAnimationPlayer* createAnimationPlayer() |
+ PassOwnPtr<CompositorAnimationPlayer> createAnimationPlayer() |
{ |
- return new CompositorAnimationPlayer(); |
+ return adoptPtr(new CompositorAnimationPlayer()); |
} |
- CompositorAnimationTimeline* createAnimationTimeline() |
+ PassOwnPtr<CompositorAnimationTimeline> createAnimationTimeline() |
{ |
- return new CompositorAnimationTimeline(); |
+ return adoptPtr(new CompositorAnimationTimeline()); |
} |
}; |
static CompositorFactory* s_factory = 0; |
+CompositorFactory::~CompositorFactory() { } |
+ |
void CompositorFactory::initializeDefault() |
{ |
delete s_factory; |
@@ -93,4 +95,25 @@ CompositorFactory& CompositorFactory::current() |
return *s_factory; |
} |
+PassOwnPtr<CompositorFilterAnimationCurve> CompositorFactory::createFilterAnimationCurve() { return nullptr; } |
+ |
+PassOwnPtr<CompositorFloatAnimationCurve> CompositorFactory::createFloatAnimationCurve() { return nullptr; } |
+ |
+PassOwnPtr<CompositorScrollOffsetAnimationCurve> CompositorFactory::createScrollOffsetAnimationCurve( |
+ FloatPoint targetValue, |
+ CompositorAnimationCurve::TimingFunctionType, |
+ CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior) { return nullptr; } |
+ |
+PassOwnPtr<CompositorTransformAnimationCurve> CompositorFactory::createTransformAnimationCurve() { return nullptr; } |
+ |
+PassOwnPtr<CompositorTransformOperations> CompositorFactory::createTransformOperations() { return nullptr; } |
+ |
+PassOwnPtr<CompositorFilterOperations> CompositorFactory::createFilterOperations() { return nullptr; } |
+ |
+PassOwnPtr<CompositorAnimation> CompositorFactory::createAnimation(const CompositorAnimationCurve&, CompositorAnimation::TargetProperty, int groupId, int animationId) { return nullptr; } |
+ |
+PassOwnPtr<CompositorAnimationPlayer> CompositorFactory::createAnimationPlayer() { return nullptr; } |
+ |
+PassOwnPtr<CompositorAnimationTimeline> CompositorFactory::createAnimationTimeline() { return nullptr; } |
+ |
} // namespace blink |