| Index: webkit/compositor_bindings/TextureLayerChromiumTest.cpp
|
| diff --git a/webkit/compositor_bindings/TextureLayerChromiumTest.cpp b/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
|
| index b038ac0f0f81cede8d8a7298fb9a94a8a23f228b..947872dda38f3ab62ca6c88e19b532ce2a0fff98 100644
|
| --- a/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
|
| +++ b/webkit/compositor_bindings/TextureLayerChromiumTest.cpp
|
| @@ -8,9 +8,9 @@
|
|
|
| #include "CCLayerTreeHost.h"
|
| #include "FakeCCLayerTreeHostClient.h"
|
| +#include "WebCompositorInitializer.h"
|
| #include <gmock/gmock.h>
|
| #include <gtest/gtest.h>
|
| -#include <public/WebCompositor.h>
|
|
|
| using namespace WebCore;
|
| using ::testing::Mock;
|
| @@ -36,11 +36,15 @@ private:
|
|
|
|
|
| class TextureLayerChromiumTest : public testing::Test {
|
| +public:
|
| + TextureLayerChromiumTest()
|
| + : m_compositorInitializer(0)
|
| + {
|
| + }
|
| +
|
| protected:
|
| virtual void SetUp()
|
| {
|
| - // Initialize without threading support.
|
| - WebKit::WebCompositor::initialize(0);
|
| m_layerTreeHost = adoptPtr(new MockCCLayerTreeHost);
|
| }
|
|
|
| @@ -51,10 +55,11 @@ protected:
|
|
|
| m_layerTreeHost->setRootLayer(0);
|
| m_layerTreeHost.clear();
|
| - WebKit::WebCompositor::shutdown();
|
| }
|
|
|
| OwnPtr<MockCCLayerTreeHost> m_layerTreeHost;
|
| +private:
|
| + WebKitTests::WebCompositorInitializer m_compositorInitializer;
|
| };
|
|
|
| TEST_F(TextureLayerChromiumTest, syncImplWhenChangingTextureId)
|
|
|