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

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

Issue 640203002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
6 #define CC_TREES_LAYER_TREE_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 void set_source_frame_number(int frame_number) { 129 void set_source_frame_number(int frame_number) {
130 source_frame_number_ = frame_number; 130 source_frame_number_ = frame_number;
131 } 131 }
132 132
133 HeadsUpDisplayLayerImpl* hud_layer() { return hud_layer_; } 133 HeadsUpDisplayLayerImpl* hud_layer() { return hud_layer_; }
134 void set_hud_layer(HeadsUpDisplayLayerImpl* layer_impl) { 134 void set_hud_layer(HeadsUpDisplayLayerImpl* layer_impl) {
135 hud_layer_ = layer_impl; 135 hud_layer_ = layer_impl;
136 } 136 }
137 137
138 LayerImpl* InnerViewportScrollLayer() const; 138 LayerImpl* InnerViewportScrollLayer() const;
139 // This function may return NULL, it is the caller's responsibility to check. 139 // This function may return nullptr, it is the caller's responsibility to chec k.
140 LayerImpl* OuterViewportScrollLayer() const; 140 LayerImpl* OuterViewportScrollLayer() const;
141 gfx::ScrollOffset TotalScrollOffset() const; 141 gfx::ScrollOffset TotalScrollOffset() const;
142 gfx::ScrollOffset TotalMaxScrollOffset() const; 142 gfx::ScrollOffset TotalMaxScrollOffset() const;
143 gfx::Vector2dF TotalScrollDelta() const; 143 gfx::Vector2dF TotalScrollDelta() const;
144 144
145 LayerImpl* InnerViewportContainerLayer() const; 145 LayerImpl* InnerViewportContainerLayer() const;
146 LayerImpl* CurrentlyScrollingLayer() const; 146 LayerImpl* CurrentlyScrollingLayer() const;
147 void SetCurrentlyScrollingLayer(LayerImpl* layer); 147 void SetCurrentlyScrollingLayer(LayerImpl* layer);
148 void ClearCurrentlyScrollingLayer(); 148 void ClearCurrentlyScrollingLayer();
149 149
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 398
399 scoped_ptr<PageScaleAnimation> page_scale_animation_; 399 scoped_ptr<PageScaleAnimation> page_scale_animation_;
400 400
401 private: 401 private:
402 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 402 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
403 }; 403 };
404 404
405 } // namespace cc 405 } // namespace cc
406 406
407 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 407 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698