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

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

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: just the vector Created 5 years, 1 month 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_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_
6 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 731
732 // In impl-side painting mode, inert tree with layers that can be recycled 732 // In impl-side painting mode, inert tree with layers that can be recycled
733 // by the next sync from the main thread. 733 // by the next sync from the main thread.
734 scoped_ptr<LayerTreeImpl> recycle_tree_; 734 scoped_ptr<LayerTreeImpl> recycle_tree_;
735 735
736 InputHandlerClient* input_handler_client_; 736 InputHandlerClient* input_handler_client_;
737 bool did_lock_scrolling_layer_; 737 bool did_lock_scrolling_layer_;
738 bool wheel_scrolling_; 738 bool wheel_scrolling_;
739 bool scroll_affects_scroll_handler_; 739 bool scroll_affects_scroll_handler_;
740 int scroll_layer_id_when_mouse_over_scrollbar_; 740 int scroll_layer_id_when_mouse_over_scrollbar_;
741 ScopedPtrVector<SwapPromise> swap_promises_for_main_thread_scroll_update_; 741 std::vector<scoped_ptr<SwapPromise>>
742 swap_promises_for_main_thread_scroll_update_;
742 743
743 // An object to implement the ScrollElasticityHelper interface and 744 // An object to implement the ScrollElasticityHelper interface and
744 // hold all state related to elasticity. May be NULL if never requested. 745 // hold all state related to elasticity. May be NULL if never requested.
745 scoped_ptr<ScrollElasticityHelper> scroll_elasticity_helper_; 746 scoped_ptr<ScrollElasticityHelper> scroll_elasticity_helper_;
746 747
747 bool tile_priorities_dirty_; 748 bool tile_priorities_dirty_;
748 749
749 const LayerTreeSettings settings_; 750 const LayerTreeSettings settings_;
750 LayerTreeDebugState debug_state_; 751 LayerTreeDebugState debug_state_;
751 bool visible_; 752 bool visible_;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 scoped_ptr<FrameTimingTracker> frame_timing_tracker_; 824 scoped_ptr<FrameTimingTracker> frame_timing_tracker_;
824 825
825 scoped_ptr<Viewport> viewport_; 826 scoped_ptr<Viewport> viewport_;
826 827
827 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 828 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
828 }; 829 };
829 830
830 } // namespace cc 831 } // namespace cc
831 832
832 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ 833 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698