Index: third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h |
diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h b/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h |
index 687fa04ed948ab29c0e8d98aa555cbcd84ebf3e5..384f4cc23c4d4884e742ca40a2c13bd885a8dc19 100644 |
--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h |
+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h |
@@ -26,7 +26,7 @@ |
#define CompositorAnimationsTestHelper_h |
#include "core/animation/CompositorAnimations.h" |
-#include "platform/testing/TestingPlatformSupport.h" |
+#include "public/platform/Platform.h" |
#include "public/platform/WebCompositorAnimationPlayer.h" |
#include "public/platform/WebCompositorAnimationTimeline.h" |
#include "public/platform/WebCompositorSupport.h" |
@@ -152,13 +152,31 @@ |
}; |
private: |
- class PlatformProxy : public TestingPlatformSupport { |
+ class PlatformProxy : public Platform { |
public: |
- explicit PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(compositor) { } |
+ PlatformProxy(WebCompositorSupportMock** compositor) : m_platform(Platform::current()), m_compositor(compositor) { } |
+ |
+ ~PlatformProxy() |
+ { |
+ blink::Platform::initialize(m_platform); |
+ } |
+ |
+ virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); } |
+ const unsigned char* getTraceCategoryEnabledFlag(const char* categoryName) override |
+ { |
+ static const unsigned char tracingIsDisabled = 0; |
+ return &tracingIsDisabled; |
+ } |
+ |
+ WebThread* currentThread() override |
+ { |
+ return m_platform->currentThread(); |
+ } |
+ |
private: |
+ blink::Platform* m_platform; // Not owned. |
+ WebCompositorSupportMock** m_compositor; |
WebCompositorSupport* compositorSupport() override { return *m_compositor; } |
- |
- WebCompositorSupportMock** m_compositor; |
}; |
WebCompositorSupportMock* m_mockCompositor; |