diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 07:17:46 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 07:17:46 +0000 |
| commit | 068d7ef6aed7f5a7bdaf1e8d28b422c547be294d (patch) | |
| tree | a66fd6a12e3a9ae7ef16c66043fd4e4bebe4d28c /cc/resource_provider_unittest.cc | |
| parent | 2bddc10a9e71bd3e7d7f010b46ec96c7ab623336 (diff) | |
| download | chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.zip chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.tar.gz chromium_src-068d7ef6aed7f5a7bdaf1e8d28b422c547be294d.tar.bz2 | |
A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2
BUG=152904
Review URL: https://chromiumcodereview.appspot.com/11232051
TBR=aelias@chromium.org
Review URL: https://codereview.chromium.org/11369071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_provider_unittest.cc')
| -rw-r--r-- | cc/resource_provider_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc index 6465bc8..2aca348 100644 --- a/cc/resource_provider_unittest.cc +++ b/cc/resource_provider_unittest.cc @@ -10,12 +10,12 @@ #include "cc/graphics_context.h" #include "cc/scoped_ptr_deque.h" #include "cc/scoped_ptr_hash_map.h" +#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/compositor_fake_web_graphics_context_3d.h" #include "cc/test/fake_web_compositor_output_surface.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" -#include "ui/gfx/rect.h" #include <public/WebGraphicsContext3D.h> using namespace cc; @@ -300,6 +300,7 @@ public: } protected: + DebugScopedSetImplThread implThread; scoped_ptr<ContextSharedData> m_sharedData; scoped_ptr<GraphicsContext> m_context; scoped_ptr<ResourceProvider> m_resourceProvider; |