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

Side by Side Diff: cc/resources/tile_manager.cc

Issue 454843002: cc: Do bitmap conversion for RasterBuffer in the worker thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code refactoring. Created 6 years, 4 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 #include "cc/resources/tile_manager.h" 5 #include "cc/resources/tile_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 10
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void Raster(PicturePileImpl* picture_pile) { 123 void Raster(PicturePileImpl* picture_pile) {
124 frame_viewer_instrumentation::ScopedRasterTask raster_task( 124 frame_viewer_instrumentation::ScopedRasterTask raster_task(
125 tile_id_, 125 tile_id_,
126 tile_resolution_, 126 tile_resolution_,
127 source_frame_number_, 127 source_frame_number_,
128 layer_id_, 128 layer_id_,
129 raster_mode_); 129 raster_mode_);
130 devtools_instrumentation::ScopedLayerTask layer_task( 130 devtools_instrumentation::ScopedLayerTask layer_task(
131 devtools_instrumentation::kRasterTask, layer_id_); 131 devtools_instrumentation::kRasterTask, layer_id_);
132 132
133 SkCanvas* canvas = raster_buffer_->AcquireSkCanvas(); 133 skia::RefPtr<SkCanvas> canvas = raster_buffer_->AcquireSkCanvas();
134 DCHECK(canvas); 134 DCHECK(canvas);
135 135
136 skia::RefPtr<SkDrawFilter> draw_filter; 136 skia::RefPtr<SkDrawFilter> draw_filter;
137 switch (raster_mode_) { 137 switch (raster_mode_) {
138 case LOW_QUALITY_RASTER_MODE: 138 case LOW_QUALITY_RASTER_MODE:
139 draw_filter = skia::AdoptRef(new skia::PaintSimplifier); 139 draw_filter = skia::AdoptRef(new skia::PaintSimplifier);
140 break; 140 break;
141 case HIGH_QUALITY_RASTER_MODE: 141 case HIGH_QUALITY_RASTER_MODE:
142 break; 142 break;
143 case NUM_RASTER_MODES: 143 case NUM_RASTER_MODES:
144 default: 144 default:
145 NOTREACHED(); 145 NOTREACHED();
146 } 146 }
147 canvas->setDrawFilter(draw_filter.get()); 147 canvas->setDrawFilter(draw_filter.get());
148 148
149 base::TimeDelta prev_rasterize_time = 149 base::TimeDelta prev_rasterize_time =
150 rendering_stats_->impl_thread_rendering_stats().rasterize_time; 150 rendering_stats_->impl_thread_rendering_stats().rasterize_time;
151 151
152 // Only record rasterization time for highres tiles, because 152 // Only record rasterization time for highres tiles, because
153 // lowres tiles are not required for activation and therefore 153 // lowres tiles are not required for activation and therefore
154 // introduce noise in the measurement (sometimes they get rasterized 154 // introduce noise in the measurement (sometimes they get rasterized
155 // before we draw and sometimes they aren't) 155 // before we draw and sometimes they aren't)
156 RenderingStatsInstrumentation* stats = 156 RenderingStatsInstrumentation* stats =
157 tile_resolution_ == HIGH_RESOLUTION ? rendering_stats_ : NULL; 157 tile_resolution_ == HIGH_RESOLUTION ? rendering_stats_ : NULL;
158 DCHECK(picture_pile); 158 DCHECK(picture_pile);
159 picture_pile->RasterToBitmap(canvas, content_rect_, contents_scale_, stats); 159 picture_pile->RasterToBitmap(
160 canvas.get(), content_rect_, contents_scale_, stats);
160 161
161 if (rendering_stats_->record_rendering_stats()) { 162 if (rendering_stats_->record_rendering_stats()) {
162 base::TimeDelta current_rasterize_time = 163 base::TimeDelta current_rasterize_time =
163 rendering_stats_->impl_thread_rendering_stats().rasterize_time; 164 rendering_stats_->impl_thread_rendering_stats().rasterize_time;
164 HISTOGRAM_CUSTOM_COUNTS( 165 HISTOGRAM_CUSTOM_COUNTS(
165 "Renderer4.PictureRasterTimeUS", 166 "Renderer4.PictureRasterTimeUS",
166 (current_rasterize_time - prev_rasterize_time).InMicroseconds(), 167 (current_rasterize_time - prev_rasterize_time).InMicroseconds(),
167 0, 168 0,
168 100000, 169 100000,
169 100); 170 100);
170 } 171 }
171 172
172 raster_buffer_->ReleaseSkCanvas(); 173 bool content_has_changed = raster_buffer_->ReleaseSkCanvas(canvas.get());
174 set_content_has_changed(content_has_changed);
173 } 175 }
174 176
175 PicturePileImpl::Analysis analysis_; 177 PicturePileImpl::Analysis analysis_;
176 scoped_refptr<PicturePileImpl> picture_pile_; 178 scoped_refptr<PicturePileImpl> picture_pile_;
177 gfx::Rect content_rect_; 179 gfx::Rect content_rect_;
178 float contents_scale_; 180 float contents_scale_;
179 RasterMode raster_mode_; 181 RasterMode raster_mode_;
180 TileResolution tile_resolution_; 182 TileResolution tile_resolution_;
181 int layer_id_; 183 int layer_id_;
182 const void* tile_id_; 184 const void* tile_id_;
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); 1187 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate");
1186 1188
1187 rasterizer_->CheckForCompletedTasks(); 1189 rasterizer_->CheckForCompletedTasks();
1188 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; 1190 did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
1189 1191
1190 if (IsReadyToActivate()) 1192 if (IsReadyToActivate())
1191 client_->NotifyReadyToActivate(); 1193 client_->NotifyReadyToActivate();
1192 } 1194 }
1193 1195
1194 } // namespace cc 1196 } // namespace cc
OLDNEW
« cc/resources/resource_provider.cc ('K') | « cc/resources/resource_provider_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698