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

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

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update 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 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_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
6 #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ 6 #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 const DebugRect& rect, 116 const DebugRect& rect,
117 SkColor stroke_color, 117 SkColor stroke_color,
118 SkColor fill_color, 118 SkColor fill_color,
119 float stroke_width, 119 float stroke_width,
120 const std::string& label_text) const; 120 const std::string& label_text) const;
121 void DrawDebugRects(SkCanvas* canvas, DebugRectHistory* debug_rect_history); 121 void DrawDebugRects(SkCanvas* canvas, DebugRectHistory* debug_rect_history);
122 122
123 void AcquireResource(ResourceProvider* resource_provider); 123 void AcquireResource(ResourceProvider* resource_provider);
124 void ReleaseUnmatchedSizeResources(ResourceProvider* resource_provider); 124 void ReleaseUnmatchedSizeResources(ResourceProvider* resource_provider);
125 125
126 ScopedPtrVector<ScopedResource> resources_; 126 std::vector<scoped_ptr<ScopedResource>> resources_;
127 skia::RefPtr<SkSurface> hud_surface_; 127 skia::RefPtr<SkSurface> hud_surface_;
128 128
129 skia::RefPtr<SkTypeface> typeface_; 129 skia::RefPtr<SkTypeface> typeface_;
130 130
131 float internal_contents_scale_; 131 float internal_contents_scale_;
132 gfx::Size internal_content_bounds_; 132 gfx::Size internal_content_bounds_;
133 133
134 Graph fps_graph_; 134 Graph fps_graph_;
135 Graph paint_time_graph_; 135 Graph paint_time_graph_;
136 MemoryHistory::Entry memory_entry_; 136 MemoryHistory::Entry memory_entry_;
137 int fade_step_; 137 int fade_step_;
138 std::vector<DebugRect> paint_rects_; 138 std::vector<DebugRect> paint_rects_;
139 139
140 base::TimeTicks time_of_last_graph_update_; 140 base::TimeTicks time_of_last_graph_update_;
141 141
142 DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayerImpl); 142 DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayerImpl);
143 }; 143 };
144 144
145 } // namespace cc 145 } // namespace cc
146 146
147 #endif // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_ 147 #endif // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698