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

Side by Side Diff: cc/layers/layer_impl.h

Issue 1717283003: tracing: Make ConvertableToTraceFormat move-only scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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_LAYERS_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_LAYER_IMPL_H_
6 #define CC_LAYERS_LAYER_IMPL_H_ 6 #define CC_LAYERS_LAYER_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 return needs_push_properties() || descendant_needs_push_properties(); 612 return needs_push_properties() || descendant_needs_push_properties();
613 } 613 }
614 614
615 bool needs_push_properties() const { return needs_push_properties_; } 615 bool needs_push_properties() const { return needs_push_properties_; }
616 bool descendant_needs_push_properties() const { 616 bool descendant_needs_push_properties() const {
617 return num_dependents_need_push_properties_ > 0; 617 return num_dependents_need_push_properties_ > 0;
618 } 618 }
619 619
620 virtual void RunMicroBenchmark(MicroBenchmarkImpl* benchmark); 620 virtual void RunMicroBenchmark(MicroBenchmarkImpl* benchmark);
621 621
622 virtual void SetDebugInfo( 622 void SetDebugInfo(
623 scoped_refptr<base::trace_event::ConvertableToTraceFormat> other); 623 scoped_ptr<base::trace_event::ConvertableToTraceFormat> debug_info);
624 624
625 bool IsDrawnRenderSurfaceLayerListMember() const; 625 bool IsDrawnRenderSurfaceLayerListMember() const;
626 626
627 void Set3dSortingContextId(int id); 627 void Set3dSortingContextId(int id);
628 int sorting_context_id() { return sorting_context_id_; } 628 int sorting_context_id() { return sorting_context_id_; }
629 629
630 void SetFrameTimingRequests( 630 void SetFrameTimingRequests(
631 const std::vector<FrameTimingRequest>& frame_timing_requests); 631 const std::vector<FrameTimingRequest>& frame_timing_requests);
632 const std::vector<FrameTimingRequest>& frame_timing_requests() const { 632 const std::vector<FrameTimingRequest>& frame_timing_requests() const {
633 return frame_timing_requests_; 633 return frame_timing_requests_;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 // Manages animations for this layer. 854 // Manages animations for this layer.
855 scoped_refptr<LayerAnimationController> layer_animation_controller_; 855 scoped_refptr<LayerAnimationController> layer_animation_controller_;
856 856
857 std::vector<scoped_ptr<CopyOutputRequest>> copy_requests_; 857 std::vector<scoped_ptr<CopyOutputRequest>> copy_requests_;
858 858
859 // Group of properties that need to be computed based on the layer tree 859 // Group of properties that need to be computed based on the layer tree
860 // hierarchy before layers can be drawn. 860 // hierarchy before layers can be drawn.
861 DrawProperties draw_properties_; 861 DrawProperties draw_properties_;
862 PerformanceProperties<LayerImpl> performance_properties_; 862 PerformanceProperties<LayerImpl> performance_properties_;
863 863
864 scoped_refptr<base::trace_event::ConvertableToTraceFormat> debug_info_; 864 scoped_ptr<base::trace_event::ConvertableToTraceFormat> owned_debug_info_;
865 base::trace_event::ConvertableToTraceFormat* debug_info_;
865 scoped_ptr<RenderSurfaceImpl> render_surface_; 866 scoped_ptr<RenderSurfaceImpl> render_surface_;
866 867
867 bool force_render_surface_; 868 bool force_render_surface_;
868 869
869 std::vector<FrameTimingRequest> frame_timing_requests_; 870 std::vector<FrameTimingRequest> frame_timing_requests_;
870 bool frame_timing_requests_dirty_; 871 bool frame_timing_requests_dirty_;
871 bool visited_; 872 bool visited_;
872 bool layer_or_descendant_is_drawn_; 873 bool layer_or_descendant_is_drawn_;
873 // If true, the layer or one of its descendants has a touch handler. 874 // If true, the layer or one of its descendants has a touch handler.
874 bool layer_or_descendant_has_touch_handler_; 875 bool layer_or_descendant_has_touch_handler_;
875 bool sorted_for_recursion_; 876 bool sorted_for_recursion_;
876 877
877 DISALLOW_COPY_AND_ASSIGN(LayerImpl); 878 DISALLOW_COPY_AND_ASSIGN(LayerImpl);
878 }; 879 };
879 880
880 } // namespace cc 881 } // namespace cc
881 882
882 #endif // CC_LAYERS_LAYER_IMPL_H_ 883 #endif // CC_LAYERS_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/layer_client.h ('k') | cc/layers/layer_impl.cc » ('j') | cc/layers/layer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698