Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(705)

Unified Diff: webkit/compositor_bindings/TextureLayerChromiumTest.cpp

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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)
« no previous file with comments | « webkit/compositor_bindings/PlatformGestureCurveTarget.h ('k') | webkit/compositor_bindings/TiledLayerChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698