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

Side by Side Diff: cc/trees/layer_tree_host_common.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 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 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_
6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_ 6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <limits> 10 #include <limits>
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 }; 168 };
169 169
170 struct CC_EXPORT ScrollAndScaleSet { 170 struct CC_EXPORT ScrollAndScaleSet {
171 ScrollAndScaleSet(); 171 ScrollAndScaleSet();
172 ~ScrollAndScaleSet(); 172 ~ScrollAndScaleSet();
173 173
174 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; 174 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls;
175 float page_scale_delta; 175 float page_scale_delta;
176 gfx::Vector2dF elastic_overscroll_delta; 176 gfx::Vector2dF elastic_overscroll_delta;
177 float top_controls_delta; 177 float top_controls_delta;
178 std::vector<scoped_ptr<SwapPromise>> swap_promises; 178 std::vector<std::unique_ptr<SwapPromise>> swap_promises;
179 179
180 bool EqualsForTesting(const ScrollAndScaleSet& other) const; 180 bool EqualsForTesting(const ScrollAndScaleSet& other) const;
181 void ToProtobuf(proto::ScrollAndScaleSet* proto) const; 181 void ToProtobuf(proto::ScrollAndScaleSet* proto) const;
182 void FromProtobuf(const proto::ScrollAndScaleSet& proto); 182 void FromProtobuf(const proto::ScrollAndScaleSet& proto);
183 183
184 private: 184 private:
185 DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet); 185 DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet);
186 }; 186 };
187 187
188 template <typename LayerType> 188 template <typename LayerType>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 for (auto* layer : *host_impl) 237 for (auto* layer : *host_impl)
238 CallFunctionForLayer(layer, function); 238 CallFunctionForLayer(layer, function);
239 } 239 }
240 240
241 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer); 241 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer);
242 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer); 242 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer);
243 243
244 } // namespace cc 244 } // namespace cc
245 245
246 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ 246 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698