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

Side by Side Diff: cc/texture_layer_unittest.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review comments and fix all cc_unittests Created 8 years, 2 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "cc/texture_layer.h" 7 #include "cc/texture_layer.h"
8 8
9 #include "cc/layer_tree_host.h" 9 #include "cc/layer_tree_host.h"
10 #include "cc/test/fake_layer_tree_host_client.h" 10 #include "cc/test/fake_layer_tree_host_client.h"
11 #include "cc/test/web_compositor_initializer.h" 11 #include "cc/test/web_compositor_initializer.h"
12 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 using namespace cc; 15 using namespace cc;
16 using ::testing::Mock; 16 using ::testing::Mock;
17 using ::testing::_; 17 using ::testing::_;
18 using ::testing::AtLeast; 18 using ::testing::AtLeast;
19 using ::testing::AnyNumber; 19 using ::testing::AnyNumber;
20 20
21 namespace { 21 namespace {
22 22
23 class MockLayerImplTreeHost : public LayerTreeHost { 23 class MockLayerImplTreeHost : public LayerTreeHost {
24 public: 24 public:
25 MockLayerImplTreeHost() 25 MockLayerImplTreeHost()
26 : LayerTreeHost(&m_fakeClient, LayerTreeSettings()) 26 : LayerTreeHost(&m_fakeClient, LayerTreeSettings())
27 { 27 {
28 initialize(); 28 initialize(NULL);
29 } 29 }
30 30
31 MOCK_METHOD0(acquireLayerTextures, void()); 31 MOCK_METHOD0(acquireLayerTextures, void());
32 32
33 private: 33 private:
34 FakeLayerImplTreeHostClient m_fakeClient; 34 FakeLayerImplTreeHostClient m_fakeClient;
35 }; 35 };
36 36
37 37
38 class TextureLayerTest : public testing::Test { 38 class TextureLayerTest : public testing::Test {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(0); 112 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(0);
113 testLayer->setTextureId(1); 113 testLayer->setTextureId(1);
114 Mock::VerifyAndClearExpectations(m_layerTreeHost.get()); 114 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
115 115
116 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(AtLeast(1)); 116 EXPECT_CALL(*m_layerTreeHost, acquireLayerTextures()).Times(AtLeast(1));
117 testLayer->removeFromParent(); 117 testLayer->removeFromParent();
118 Mock::VerifyAndClearExpectations(m_layerTreeHost.get()); 118 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
119 } 119 }
120 120
121 } // anonymous namespace 121 } // anonymous namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698