| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index c1e525df3201f43431f8694e925d732a434178db..d09609673fb21f1f65e5d78a9d17031dc3377101 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -163,12 +163,12 @@ TileManager::TileManager(
|
| bytes_pending_upload_(0),
|
| has_performed_uploads_since_last_flush_(false),
|
| ever_exceeded_memory_budget_(false),
|
| + rendering_stats_instrumentation_(rendering_stats_instrumentation),
|
| use_cheapness_estimator_(use_cheapness_estimator),
|
| use_color_estimator_(use_color_estimator),
|
| prediction_benchmarking_(prediction_benchmarking),
|
| pending_tasks_(0),
|
| - max_pending_tasks_(kMaxNumPendingTasksPerThread * num_raster_threads),
|
| - rendering_stats_instrumentation_(rendering_stats_instrumentation) {
|
| + max_pending_tasks_(kMaxNumPendingTasksPerThread * num_raster_threads) {
|
| for (int i = 0; i < NUM_STATES; ++i) {
|
| for (int j = 0; j < NUM_TREES; ++j) {
|
| for (int k = 0; k < NUM_BINS; ++k)
|
| @@ -186,9 +186,9 @@ TileManager::~TileManager() {
|
| // resources.
|
| raster_worker_pool_.reset();
|
| AbortPendingTileUploads();
|
| - DCHECK_EQ(tiles_with_pending_upload_.size(), 0);
|
| - DCHECK_EQ(all_tiles_.size(), 0);
|
| - DCHECK_EQ(live_or_allocated_tiles_.size(), 0);
|
| + DCHECK(tiles_with_pending_upload_.empty());
|
| + DCHECK(all_tiles_.empty());
|
| + DCHECK(live_or_allocated_tiles_.empty());
|
| }
|
|
|
| void TileManager::SetGlobalState(
|
| @@ -1010,7 +1010,7 @@ void TileManager::RunRasterTask(
|
| RecordCheapnessPredictorResults(is_predicted_cheap, is_actually_cheap);
|
|
|
| DCHECK_EQ(bitmap.rowBytes(),
|
| - bitmap.width() * bitmap.bytesPerPixel());
|
| + static_cast<size_t>(bitmap.width() * bitmap.bytesPerPixel()));
|
|
|
| RecordSolidColorPredictorResults(
|
| reinterpret_cast<SkColor*>(bitmap.getPixels()),
|
|
|