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

Side by Side Diff: cc/test/layer_tree_host_common_test.h

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 5 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
6 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 6 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 bool can_use_lcd_text); 71 bool can_use_lcd_text);
72 72
73 void ExecuteCalculateDrawProperties(LayerImpl* root_layer, 73 void ExecuteCalculateDrawProperties(LayerImpl* root_layer,
74 float device_scale_factor, 74 float device_scale_factor,
75 float page_scale_factor, 75 float page_scale_factor,
76 LayerImpl* page_scale_application_layer, 76 LayerImpl* page_scale_application_layer,
77 bool can_use_lcd_text); 77 bool can_use_lcd_text);
78 78
79 template <class LayerType> 79 template <class LayerType>
80 void ExecuteCalculateDrawProperties(LayerType* root_layer) { 80 void ExecuteCalculateDrawProperties(LayerType* root_layer) {
81 LayerType* page_scale_application_layer = NULL; 81 LayerType* page_scale_application_layer = nullptr;
82 ExecuteCalculateDrawProperties( 82 ExecuteCalculateDrawProperties(
83 root_layer, 1.f, 1.f, page_scale_application_layer, false); 83 root_layer, 1.f, 1.f, page_scale_application_layer, false);
84 } 84 }
85 85
86 template <class LayerType> 86 template <class LayerType>
87 void ExecuteCalculateDrawProperties(LayerType* root_layer, 87 void ExecuteCalculateDrawProperties(LayerType* root_layer,
88 float device_scale_factor) { 88 float device_scale_factor) {
89 LayerType* page_scale_application_layer = NULL; 89 LayerType* page_scale_application_layer = nullptr;
90 ExecuteCalculateDrawProperties(root_layer, 90 ExecuteCalculateDrawProperties(root_layer,
91 device_scale_factor, 91 device_scale_factor,
92 1.f, 92 1.f,
93 page_scale_application_layer, 93 page_scale_application_layer,
94 false); 94 false);
95 } 95 }
96 96
97 template <class LayerType> 97 template <class LayerType>
98 void ExecuteCalculateDrawProperties(LayerType* root_layer, 98 void ExecuteCalculateDrawProperties(LayerType* root_layer,
99 float device_scale_factor, 99 float device_scale_factor,
(...skipping 27 matching lines...) Expand all
127 FakeLayerTreeHostClient client_; 127 FakeLayerTreeHostClient client_;
128 int render_surface_layer_list_count_; 128 int render_surface_layer_list_count_;
129 }; 129 };
130 130
131 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, 131 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
132 public testing::Test {}; 132 public testing::Test {};
133 133
134 } // namespace cc 134 } // namespace cc
135 135
136 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_ 136 #endif // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698