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

Unified Diff: cc/layer_unittest.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Apply code review comments 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
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | cc/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_unittest.cc
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index 2bbbef4db906dea6fde27092e775716adcde02b4..6c14ccfa3ed04822502e1292de7159260e399620 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -12,6 +12,7 @@
#include "cc/layer_tree_host.h"
#include "cc/settings.h"
#include "cc/single_thread_proxy.h"
+#include "cc/thread.h"
#include "cc/test/fake_layer_tree_host_client.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/test_common.h"
@@ -40,7 +41,7 @@ public:
MockLayerImplTreeHost()
: LayerTreeHost(&m_fakeClient, LayerTreeSettings())
{
- initialize();
+ initialize(scoped_ptr<Thread>(NULL));
}
MOCK_METHOD0(setNeedsCommit, void());
@@ -528,8 +529,6 @@ TEST_F(LayerTest, checkPropertyChangeCausesCorrectBehavior)
TEST_F(LayerTest, verifyPushPropertiesAccumulatesUpdateRect)
{
- DebugScopedSetImplThread setImplThread;
-
scoped_refptr<Layer> testLayer = Layer::create();
scoped_ptr<LayerImpl> implLayer = LayerImpl::create(1);
@@ -555,7 +554,7 @@ public:
{
scoped_ptr<FakeLayerImplTreeHost> host(new FakeLayerImplTreeHost);
// The initialize call will fail, since our client doesn't provide a valid GraphicsContext3D, but it doesn't matter in the tests that use this fake so ignore the return value.
- host->initialize();
+ host->initialize(scoped_ptr<Thread>(NULL));
return host.Pass();
}
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | cc/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698