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

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

Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: foramted. Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/layer.h" 5 #include "cc/layers/layer.h"
6 6
7 #include "cc/debug/lap_timer.h" 7 #include "cc/debug/lap_timer.h"
8 #include "cc/resources/layer_painter.h" 8 #include "cc/resources/layer_painter.h"
9 #include "cc/test/fake_impl_proxy.h" 9 #include "cc/test/fake_impl_proxy.h"
10 #include "cc/test/fake_layer_tree_host.h" 10 #include "cc/test/fake_layer_tree_host.h"
(...skipping 27 matching lines...) Expand all
38 kTimeCheckInterval) {} 38 kTimeCheckInterval) {}
39 39
40 protected: 40 protected:
41 virtual void SetUp() override { 41 virtual void SetUp() override {
42 layer_tree_host_ = FakeLayerTreeHost::Create(&fake_client_); 42 layer_tree_host_ = FakeLayerTreeHost::Create(&fake_client_);
43 layer_tree_host_->InitializeSingleThreaded( 43 layer_tree_host_->InitializeSingleThreaded(
44 &fake_client_, base::MessageLoopProxy::current()); 44 &fake_client_, base::MessageLoopProxy::current());
45 } 45 }
46 46
47 virtual void TearDown() override { 47 virtual void TearDown() override {
48 layer_tree_host_->SetRootLayer(NULL); 48 layer_tree_host_->SetRootLayer(nullptr);
49 layer_tree_host_ = nullptr; 49 layer_tree_host_ = nullptr;
50 } 50 }
51 51
52 FakeImplProxy proxy_; 52 FakeImplProxy proxy_;
53 TestSharedBitmapManager shared_bitmap_manager_; 53 TestSharedBitmapManager shared_bitmap_manager_;
54 FakeLayerTreeHostImpl host_impl_; 54 FakeLayerTreeHostImpl host_impl_;
55 55
56 FakeLayerTreeHostClient fake_client_; 56 FakeLayerTreeHostClient fake_client_;
57 scoped_ptr<FakeLayerTreeHost> layer_tree_host_; 57 scoped_ptr<FakeLayerTreeHost> layer_tree_host_;
58 LapTimer timer_; 58 LapTimer timer_;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 "", 113 "",
114 "props_didnt_change", 114 "props_didnt_change",
115 timer_.LapsPerSecond(), 115 timer_.LapsPerSecond(),
116 "runs/s", 116 "runs/s",
117 true); 117 true);
118 } 118 }
119 119
120 120
121 } // namespace 121 } // namespace
122 } // namespace cc 122 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698