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/render_surface_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/render_surface_unittest.cc')
| -rw-r--r-- | cc/render_surface_unittest.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc index 0bd7be5..be35ac1 100644 --- a/cc/render_surface_unittest.cc +++ b/cc/render_surface_unittest.cc @@ -39,6 +39,9 @@ TEST(RenderSurfaceTest, verifySurfaceChangesAreTrackedProperly) // This test checks that surfacePropertyChanged() has the correct behavior. // + // This will fake that we are on the correct thread for testing purposes. + DebugScopedSetImplThread setImplThread; + scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(1); owningLayer->createRenderSurface(); ASSERT_TRUE(owningLayer->renderSurface()); @@ -73,6 +76,9 @@ TEST(RenderSurfaceTest, verifySurfaceChangesAreTrackedProperly) TEST(RenderSurfaceTest, sanityCheckSurfaceCreatesCorrectSharedQuadState) { + // This will fake that we are on the correct thread for testing purposes. + DebugScopedSetImplThread setImplThread; + scoped_ptr<LayerImpl> rootLayer = LayerImpl::create(1); scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(2); @@ -124,6 +130,9 @@ private: TEST(RenderSurfaceTest, sanityCheckSurfaceCreatesCorrectRenderPass) { + // This will fake that we are on the correct thread for testing purposes. + DebugScopedSetImplThread setImplThread; + scoped_ptr<LayerImpl> rootLayer = LayerImpl::create(1); scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(2); |