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

Side by Side Diff: cc/layers/delegated_renderer_layer_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/base/scoped_ptr_vector.h ('k') | cc/layers/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/delegated_renderer_layer_impl.h" 5 #include "cc/layers/delegated_renderer_layer_impl.h"
6 6
7 #include "cc/base/scoped_ptr_vector.h" 7 #include "cc/base/scoped_ptr_vector.h"
8 #include "cc/layers/append_quads_data.h" 8 #include "cc/layers/append_quads_data.h"
9 #include "cc/layers/quad_sink.h" 9 #include "cc/layers/quad_sink.h"
10 #include "cc/layers/solid_color_layer_impl.h" 10 #include "cc/layers/solid_color_layer_impl.h"
(...skipping 15 matching lines...) Expand all
26 #include "cc/trees/single_thread_proxy.h" 26 #include "cc/trees/single_thread_proxy.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 #include "ui/gfx/transform.h" 28 #include "ui/gfx/transform.h"
29 29
30 namespace cc { 30 namespace cc {
31 namespace { 31 namespace {
32 32
33 class DelegatedRendererLayerImplTest : public testing::Test { 33 class DelegatedRendererLayerImplTest : public testing::Test {
34 public: 34 public:
35 DelegatedRendererLayerImplTest() 35 DelegatedRendererLayerImplTest()
36 : proxy_(scoped_ptr<Thread>(NULL)), 36 : proxy_(scoped_ptr<Thread>()),
37 always_impl_thread_and_main_thread_blocked_(&proxy_) { 37 always_impl_thread_and_main_thread_blocked_(&proxy_) {
38 LayerTreeSettings settings; 38 LayerTreeSettings settings;
39 settings.minimum_occlusion_tracking_size = gfx::Size(); 39 settings.minimum_occlusion_tracking_size = gfx::Size();
40 40
41 host_impl_ = LayerTreeHostImpl::Create(settings, 41 host_impl_ = LayerTreeHostImpl::Create(settings,
42 &client_, 42 &client_,
43 &proxy_, 43 &proxy_,
44 &stats_instrumentation_); 44 &stats_instrumentation_);
45 host_impl_->InitializeRenderer(CreateFakeOutputSurface()); 45 host_impl_->InitializeRenderer(CreateFakeOutputSurface());
46 host_impl_->SetViewportSize(gfx::Size(10, 10)); 46 host_impl_->SetViewportSize(gfx::Size(10, 10));
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 root_delegated_shared_quad_state->clip_rect.ToString()); 1245 root_delegated_shared_quad_state->clip_rect.ToString());
1246 // Quads came with a clip rect. 1246 // Quads came with a clip rect.
1247 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped); 1247 EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
1248 1248
1249 host_impl_->DrawLayers(&frame, base::TimeTicks::Now()); 1249 host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
1250 host_impl_->DidDrawAllLayers(frame); 1250 host_impl_->DidDrawAllLayers(frame);
1251 } 1251 }
1252 1252
1253 } // namespace 1253 } // namespace
1254 } // namespace cc 1254 } // namespace cc
OLDNEW
« no previous file with comments | « cc/base/scoped_ptr_vector.h ('k') | cc/layers/layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698