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

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

Issue 578843002: cc: Return a NullCanvas instead of NULL in context lost situations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update unit test Created 6 years, 3 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
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 frame_viewer_instrumentation::ScopedRasterTask raster_task( 116 frame_viewer_instrumentation::ScopedRasterTask raster_task(
117 tile_id_, 117 tile_id_,
118 tile_resolution_, 118 tile_resolution_,
119 source_frame_number_, 119 source_frame_number_,
120 layer_id_, 120 layer_id_,
121 raster_mode_); 121 raster_mode_);
122 devtools_instrumentation::ScopedLayerTask layer_task( 122 devtools_instrumentation::ScopedLayerTask layer_task(
123 devtools_instrumentation::kRasterTask, layer_id_); 123 devtools_instrumentation::kRasterTask, layer_id_);
124 124
125 skia::RefPtr<SkCanvas> canvas = raster_buffer_->AcquireSkCanvas(); 125 skia::RefPtr<SkCanvas> canvas = raster_buffer_->AcquireSkCanvas();
126 if (!canvas) 126 DCHECK(canvas);
127 return;
128 canvas->save();
129 127
130 skia::RefPtr<SkDrawFilter> draw_filter; 128 skia::RefPtr<SkDrawFilter> draw_filter;
131 switch (raster_mode_) { 129 switch (raster_mode_) {
132 case LOW_QUALITY_RASTER_MODE: 130 case LOW_QUALITY_RASTER_MODE:
133 draw_filter = skia::AdoptRef(new skia::PaintSimplifier); 131 draw_filter = skia::AdoptRef(new skia::PaintSimplifier);
134 break; 132 break;
135 case HIGH_QUALITY_RASTER_MODE: 133 case HIGH_QUALITY_RASTER_MODE:
136 break; 134 break;
137 case NUM_RASTER_MODES: 135 case NUM_RASTER_MODES:
138 default: 136 default:
(...skipping 18 matching lines...) Expand all
157 base::TimeDelta current_rasterize_time = 155 base::TimeDelta current_rasterize_time =
158 rendering_stats_->impl_thread_rendering_stats().rasterize_time; 156 rendering_stats_->impl_thread_rendering_stats().rasterize_time;
159 LOCAL_HISTOGRAM_CUSTOM_COUNTS( 157 LOCAL_HISTOGRAM_CUSTOM_COUNTS(
160 "Renderer4.PictureRasterTimeUS", 158 "Renderer4.PictureRasterTimeUS",
161 (current_rasterize_time - prev_rasterize_time).InMicroseconds(), 159 (current_rasterize_time - prev_rasterize_time).InMicroseconds(),
162 0, 160 0,
163 100000, 161 100000,
164 100); 162 100);
165 } 163 }
166 164
167 canvas->restore();
168 raster_buffer_->ReleaseSkCanvas(canvas); 165 raster_buffer_->ReleaseSkCanvas(canvas);
169 } 166 }
170 167
171 PicturePileImpl::Analysis analysis_; 168 PicturePileImpl::Analysis analysis_;
172 scoped_refptr<PicturePileImpl> picture_pile_; 169 scoped_refptr<PicturePileImpl> picture_pile_;
173 gfx::Rect content_rect_; 170 gfx::Rect content_rect_;
174 float contents_scale_; 171 float contents_scale_;
175 RasterMode raster_mode_; 172 RasterMode raster_mode_;
176 TileResolution tile_resolution_; 173 TileResolution tile_resolution_;
177 int layer_id_; 174 int layer_id_;
(...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); 1168 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate");
1172 1169
1173 rasterizer_->CheckForCompletedTasks(); 1170 rasterizer_->CheckForCompletedTasks();
1174 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; 1171 did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
1175 1172
1176 if (IsReadyToActivate()) 1173 if (IsReadyToActivate())
1177 client_->NotifyReadyToActivate(); 1174 client_->NotifyReadyToActivate();
1178 } 1175 }
1179 1176
1180 } // namespace cc 1177 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698