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

Unified Diff: cc/scoped_texture_unittest.cc

Issue 11369071: A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
===================================================================
--- cc/scoped_texture_unittest.cc (revision 165906)
+++ cc/scoped_texture_unittest.cc (working copy)
@@ -7,6 +7,7 @@
#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"
@@ -21,6 +22,7 @@
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());
@@ -35,6 +37,7 @@
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, gfx::Size(30, 30), GL_RGBA, ResourceProvider::TextureUsageAny);
@@ -51,6 +54,7 @@
TEST(ScopedTextureTest, ScopedTextureIsDeleted)
{
scoped_ptr<GraphicsContext> context(createFakeGraphicsContext());
+ DebugScopedSetImplThread implThread;
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
{
@@ -78,6 +82,7 @@
TEST(ScopedTextureTest, LeakScopedTexture)
{
scoped_ptr<GraphicsContext> context(createFakeGraphicsContext());
+ DebugScopedSetImplThread implThread;
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get()));
{
« no previous file with comments | « cc/resource_update_controller_unittest.cc ('k') | cc/scrollbar_animation_controller_linear_fade_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698