summaryrefslogtreecommitdiffstats
path: root/cc/layer_impl_unittest.cc
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 21:21:59 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 21:21:59 +0000
commit5bc29a2dabe01f1e2315bcc287f11db10df4144b (patch)
tree0c451bebe2c40e867a935b5f52b25a242f5f825c /cc/layer_impl_unittest.cc
parent4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5 (diff)
downloadchromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.zip
chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.tar.gz
chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.tar.bz2
Revert 165476 - Remove static thread pointers from CC
Might be causing webkit_unit_tests to fail on mac/win BUG=152904 Review URL: https://codereview.chromium.org/11232051 TBR=jamesr@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl_unittest.cc')
-rw-r--r--cc/layer_impl_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc
index 259a6ed..3640185 100644
--- a/cc/layer_impl_unittest.cc
+++ b/cc/layer_impl_unittest.cc
@@ -58,6 +58,8 @@ TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
//
// The constructor on this will fake that we are on the correct thread.
+ DebugScopedSetImplThread setImplThread;
+
// Create a simple LayerImpl tree:
scoped_ptr<LayerImpl> root = LayerImpl::create(1);
root->addChild(LayerImpl::create(2));