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

Side by Side Diff: cc/layers/texture_layer_unittest.cc

Issue 16355009: Rewrite scoped_ptr<T>(NULL) to use the default ctor in cc/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix most vexing parse Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « cc/layers/scrollbar_layer_unittest.cc ('k') | cc/layers/tiled_layer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "cc/layers/texture_layer.h" 5 #include "cc/layers/texture_layer.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "cc/base/thread.h" 10 #include "cc/base/thread.h"
(...skipping 15 matching lines...) Expand all
26 using ::testing::AtLeast; 26 using ::testing::AtLeast;
27 using ::testing::AnyNumber; 27 using ::testing::AnyNumber;
28 28
29 namespace cc { 29 namespace cc {
30 namespace { 30 namespace {
31 31
32 class MockLayerTreeHost : public LayerTreeHost { 32 class MockLayerTreeHost : public LayerTreeHost {
33 public: 33 public:
34 explicit MockLayerTreeHost(LayerTreeHostClient* client) 34 explicit MockLayerTreeHost(LayerTreeHostClient* client)
35 : LayerTreeHost(client, LayerTreeSettings()) { 35 : LayerTreeHost(client, LayerTreeSettings()) {
36 Initialize(scoped_ptr<Thread>(NULL)); 36 Initialize(scoped_ptr<Thread>());
37 } 37 }
38 38
39 MOCK_METHOD0(AcquireLayerTextures, void()); 39 MOCK_METHOD0(AcquireLayerTextures, void());
40 MOCK_METHOD0(SetNeedsCommit, void()); 40 MOCK_METHOD0(SetNeedsCommit, void());
41 }; 41 };
42 42
43 class TextureLayerTest : public testing::Test { 43 class TextureLayerTest : public testing::Test {
44 public: 44 public:
45 TextureLayerTest() 45 TextureLayerTest()
46 : fake_client_( 46 : fake_client_(
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 base::Lock lock_; 717 base::Lock lock_;
718 unsigned expected_used_textures_on_commit_; 718 unsigned expected_used_textures_on_commit_;
719 }; 719 };
720 720
721 // The TextureLayerClient does not use mailboxes, so can't use a delegating 721 // The TextureLayerClient does not use mailboxes, so can't use a delegating
722 // renderer. 722 // renderer.
723 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TextureLayerClientTest); 723 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TextureLayerClientTest);
724 724
725 } // namespace 725 } // namespace
726 } // namespace cc 726 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/scrollbar_layer_unittest.cc ('k') | cc/layers/tiled_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698