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

Side by Side Diff: cc/layers/layer.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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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_LAYERS_LAYER_H_ 5 #ifndef CC_LAYERS_LAYER_H_
6 #define CC_LAYERS_LAYER_H_ 6 #define CC_LAYERS_LAYER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "cc/animation/layer_animation_controller.h" 15 #include "cc/animation/layer_animation_controller.h"
16 #include "cc/animation/layer_animation_value_observer.h" 16 #include "cc/animation/layer_animation_value_observer.h"
17 #include "cc/animation/layer_animation_value_provider.h" 17 #include "cc/animation/layer_animation_value_provider.h"
18 #include "cc/base/cc_export.h" 18 #include "cc/base/cc_export.h"
19 #include "cc/base/region.h" 19 #include "cc/base/region.h"
20 #include "cc/base/scoped_ptr_vector.h"
21 #include "cc/debug/frame_timing_request.h" 20 #include "cc/debug/frame_timing_request.h"
22 #include "cc/debug/micro_benchmark.h" 21 #include "cc/debug/micro_benchmark.h"
23 #include "cc/layers/layer_lists.h" 22 #include "cc/layers/layer_lists.h"
24 #include "cc/layers/layer_position_constraint.h" 23 #include "cc/layers/layer_position_constraint.h"
25 #include "cc/layers/paint_properties.h" 24 #include "cc/layers/paint_properties.h"
26 #include "cc/layers/scroll_blocks_on.h" 25 #include "cc/layers/scroll_blocks_on.h"
27 #include "cc/output/filter_operations.h" 26 #include "cc/output/filter_operations.h"
28 #include "cc/trees/property_tree.h" 27 #include "cc/trees/property_tree.h"
29 #include "skia/ext/refptr.h" 28 #include "skia/ext/refptr.h"
30 #include "third_party/skia/include/core/SkColor.h" 29 #include "third_party/skia/include/core/SkColor.h"
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 scoped_ptr<std::set<Layer*>> clip_children_; 721 scoped_ptr<std::set<Layer*>> clip_children_;
723 722
724 gfx::Transform transform_; 723 gfx::Transform transform_;
725 gfx::Point3F transform_origin_; 724 gfx::Point3F transform_origin_;
726 725
727 // Replica layer used for reflections. 726 // Replica layer used for reflections.
728 scoped_refptr<Layer> replica_layer_; 727 scoped_refptr<Layer> replica_layer_;
729 728
730 LayerClient* client_; 729 LayerClient* client_;
731 730
732 ScopedPtrVector<CopyOutputRequest> copy_requests_; 731 std::vector<scoped_ptr<CopyOutputRequest>> copy_requests_;
733 732
734 base::Closure did_scroll_callback_; 733 base::Closure did_scroll_callback_;
735 734
736 PaintProperties paint_properties_; 735 PaintProperties paint_properties_;
737 736
738 // These all act like draw properties, so don't need push properties. 737 // These all act like draw properties, so don't need push properties.
739 gfx::Rect visible_layer_rect_; 738 gfx::Rect visible_layer_rect_;
740 gfx::Rect clip_rect_; 739 gfx::Rect clip_rect_;
741 size_t num_unclipped_descendants_; 740 size_t num_unclipped_descendants_;
742 741
743 std::vector<FrameTimingRequest> frame_timing_requests_; 742 std::vector<FrameTimingRequest> frame_timing_requests_;
744 bool frame_timing_requests_dirty_; 743 bool frame_timing_requests_dirty_;
745 744
746 DISALLOW_COPY_AND_ASSIGN(Layer); 745 DISALLOW_COPY_AND_ASSIGN(Layer);
747 }; 746 };
748 747
749 } // namespace cc 748 } // namespace cc
750 749
751 #endif // CC_LAYERS_LAYER_H_ 750 #endif // CC_LAYERS_LAYER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698