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

Unified Diff: cc/scoped_texture_unittest.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review comments and fix all cc_unittests Created 8 years, 2 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: cc/scoped_texture_unittest.cc
diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc
index 0be883d438a0ba12677b3f250e9b8909b84ccd10..fdd4e30fec01fa8072bfdfa4b9cf96ab016100a4 100644
--- a/cc/scoped_texture_unittest.cc
+++ b/cc/scoped_texture_unittest.cc
@@ -7,7 +7,6 @@
#include "cc/scoped_texture.h"
#include "cc/renderer.h"
-#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
#include "cc/test/fake_graphics_context.h"
#include "cc/test/tiled_layer_test_common.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,7 +21,6 @@ namespace {
TEST(ScopedTextureTest, NewScopedTexture)
{
scoped_ptr<GraphicsContext> context(createFakeGraphicsContext());
- DebugScopedSetImplThread implThread;
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
scoped_ptr<ScopedTexture> texture = ScopedTexture::create(resourceProvider.get());
@@ -37,7 +35,6 @@ TEST(ScopedTextureTest, NewScopedTexture)
TEST(ScopedTextureTest, CreateScopedTexture)
{
scoped_ptr<GraphicsContext> context(createFakeGraphicsContext());
- DebugScopedSetImplThread implThread;
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
scoped_ptr<ScopedTexture> texture = ScopedTexture::create(resourceProvider.get());
texture->allocate(Renderer::ImplPool, IntSize(30, 30), GL_RGBA, ResourceProvider::TextureUsageAny);
@@ -54,7 +51,6 @@ TEST(ScopedTextureTest, CreateScopedTexture)
TEST(ScopedTextureTest, ScopedTextureIsDeleted)
{
scoped_ptr<GraphicsContext> context(createFakeGraphicsContext());
- DebugScopedSetImplThread implThread;
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
{
@@ -82,7 +78,6 @@ TEST(ScopedTextureTest, ScopedTextureIsDeleted)
TEST(ScopedTextureTest, LeakScopedTexture)
{
scoped_ptr<GraphicsContext> context(createFakeGraphicsContext());
- DebugScopedSetImplThread implThread;
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
{

Powered by Google App Engine
This is Rietveld 408576698