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

Side by Side Diff: cc/trees/layer_tree_host_impl_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/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host_unittest_context.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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 using ::testing::_; 54 using ::testing::_;
55 using media::VideoFrame; 55 using media::VideoFrame;
56 56
57 namespace cc { 57 namespace cc {
58 namespace { 58 namespace {
59 59
60 class LayerTreeHostImplTest : public testing::Test, 60 class LayerTreeHostImplTest : public testing::Test,
61 public LayerTreeHostImplClient { 61 public LayerTreeHostImplClient {
62 public: 62 public:
63 LayerTreeHostImplTest() 63 LayerTreeHostImplTest()
64 : proxy_(scoped_ptr<Thread>(NULL)), 64 : proxy_(scoped_ptr<Thread>()),
65 always_impl_thread_(&proxy_), 65 always_impl_thread_(&proxy_),
66 always_main_thread_blocked_(&proxy_), 66 always_main_thread_blocked_(&proxy_),
67 did_try_initialize_renderer_(false), 67 did_try_initialize_renderer_(false),
68 on_can_draw_state_changed_called_(false), 68 on_can_draw_state_changed_called_(false),
69 has_pending_tree_(false), 69 has_pending_tree_(false),
70 did_request_commit_(false), 70 did_request_commit_(false),
71 did_request_redraw_(false), 71 did_request_redraw_(false),
72 did_upload_visible_tile_(false), 72 did_upload_visible_tile_(false),
73 reduce_memory_result_(true) { 73 reduce_memory_result_(true) {
74 media::InitializeMediaLibraryForTesting(); 74 media::InitializeMediaLibraryForTesting();
(...skipping 5792 matching lines...) Expand 10 before | Expand all | Expand 10 after
5867 EXPECT_FALSE(did_try_initialize_renderer_); 5867 EXPECT_FALSE(did_try_initialize_renderer_);
5868 host_impl_->DeferredInitialize(scoped_refptr<ContextProvider>()); 5868 host_impl_->DeferredInitialize(scoped_refptr<ContextProvider>());
5869 EXPECT_TRUE(did_try_initialize_renderer_); 5869 EXPECT_TRUE(did_try_initialize_renderer_);
5870 5870
5871 // Defer intialized GL draw. 5871 // Defer intialized GL draw.
5872 DrawFrame(); 5872 DrawFrame();
5873 } 5873 }
5874 5874
5875 } // namespace 5875 } // namespace
5876 } // namespace cc 5876 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698