CC Animation: Move files from cc_blink to Source/platform/animation

third_party/WebKit/Source/platform/CompositorFactory.h

+// Copyright 2016 The Chromium Authors. All rights reserved.

[jbroman, 2016/02/01 15:44:36]

nit: This file probably belongs in platform/graphics/.

[loyso (OOO), 2016/02/04 05:49:29]

Done.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CompositorFactory_h
+#define CompositorFactory_h
+
+#include "platform/PlatformExport.h"
+#include "platform/animation/CompositorAnimation.h"
+#include "platform/animation/CompositorAnimationCurve.h"
+#include "platform/animation/CompositorScrollOffsetAnimationCurve.h"
+#include "platform/geometry/FloatPoint.h"
+#include "wtf/PassOwnPtr.h"
+
+namespace blink {
+
+class CompositorAnimationPlayer;
+class CompositorAnimationTimeline;
+class CompositorFilterAnimationCurve;
+class CompositorFilterOperations;
+class CompositorFloatAnimationCurve;
+class CompositorTransformAnimationCurve;
+class CompositorTransformOperations;
+
+class PLATFORM_EXPORT CompositorFactory {
+public:
+    static void initializeDefault();
+    static void initializeForTesting(PassOwnPtr<CompositorFactory>);
+    static void shutdown();
+    static CompositorFactory& current();
+
+    // Animation ----------------------------------------------------
+
+    virtual CompositorFilterAnimationCurve* createFilterAnimationCurve() { return nullptr; }

[jbroman, 2016/02/01 15:44:36]

Please return smart pointers (i.e. PassOwnPtr<T>) from all factory methods
(which we can do now that this is inside Blink).

(You may need to include more headers or move default implementations to the
source file.)

[loyso (OOO), 2016/02/04 05:49:29]

I doesn't work with gmock overrides.
See the dependent CL as a demo: https://codereview.chromium.org/1663963004

    class CompositorFactoryMock : public CompositorFactory {
    public:
        MOCK_METHOD4(createAnimation, PassOwnPtr<CompositorAnimation>(const
CompositorAnimationCurve& curve, CompositorAnimation::TargetProperty target, int
groupId, int animationId));
        MOCK_METHOD0(createFloatAnimationCurve,
PassOwnPtr<CompositorFloatAnimationCurve>());
        MOCK_METHOD0(createAnimationPlayer,
PassOwnPtr<CompositorAnimationPlayer>());
        MOCK_METHOD0(createAnimationTimeline,
PassOwnPtr<CompositorAnimationTimeline>());
    };

    EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())
        .WillOnce(Return(adoptPtr(new WebCompositorAnimationTimelineMock())));

../../testing/gmock/include/gmock/gmock-actions.h:539:43: error: call to deleted
function 'operator new'
  explicit ReturnAction(R value) : value_(new R(internal::move(value))) {}
                                          ^~~
../../testing/gmock/include/gmock/gmock-actions.h:1062:10: note: in
instantiation of member function
'testing::internal::ReturnAction<WTF::PassOwnPtr<blink::WebCompositorAnimationTimelineMock>
>::ReturnAction' requested here
  return internal::ReturnAction<R>(internal::move(value));
         ^
../../third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp:114:27:
note: in instantiation of function template specialization
'testing::Return<WTF::PassOwnPtr<blink::WebCompositorAnimationTimelineMock> >'
requested here
                .WillOnce(Return(adoptPtr(new
WebCompositorAnimationTimelineMock())));
                          ^
../../third_party/WebKit/Source/wtf/PassOwnPtr.h:42:5: note: candidate function
has been explicitly deleted
    DISALLOW_NEW();

Looks like gmock ReturnAction wants to allocate PassOwnPtr on a heap:

explicit ReturnAction(R value) : value_(new R(internal::move(value))) {}

which is disallowed:

template <typename T> class PassOwnPtr {
    DISALLOW_NEW();

Any ideas how to fix it?

[jbroman, 2016/02/04 15:17:55]

:( I hadn't realized someone had added that annotation to PassOwnPtr. IMHO, the
fix is probably to remove the DISALLOW_NEW annotation. I think it's entirely
reasonable to want to mock a function that returns a PassOwnPtr, and it's
reasonable for gmock to want to move the object to the heap as part of that.
That will need a wtf owner, though, so dealing with that separately SGTM.

+
+    virtual CompositorFloatAnimationCurve* createFloatAnimationCurve() { return nullptr; }
+
+    virtual CompositorScrollOffsetAnimationCurve* createScrollOffsetAnimationCurve(
+        FloatPoint targetValue,
+        CompositorAnimationCurve::TimingFunctionType,
+        CompositorScrollOffsetAnimationCurve::ScrollDurationBehavior) { return nullptr; }
+
+    virtual CompositorTransformAnimationCurve* createTransformAnimationCurve() { return nullptr; }
+
+    virtual CompositorTransformOperations* createTransformOperations() { return nullptr; }
+
+    virtual CompositorFilterOperations* createFilterOperations() { return nullptr; }
+
+    virtual CompositorAnimation* createAnimation(const CompositorAnimationCurve&, CompositorAnimation::TargetProperty, int groupId = 0, int animationId = 0) { return nullptr; }
+
+    virtual CompositorAnimationPlayer* createAnimationPlayer() { return nullptr; }
+
+    virtual CompositorAnimationTimeline* createAnimationTimeline() { return nullptr; }
+
+    virtual ~CompositorFactory() {}
+};
+}

[jbroman, 2016/02/01 15:44:36]

super-nit: closing namespace comment please:

} // namespace blink

[loyso (OOO), 2016/02/04 05:49:29]

Done.

+
+#endif // CompositorFactory_h