diff options
author | pdr <pdr@chromium.org> | 2015-09-16 11:34:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 18:35:58 +0000 |
commit | b42dfda3dd350ddac88a682cc094d816ab054090 (patch) | |
tree | 8f8e49fdbcb36415495c9cd2f2b46ba8beafadfd /cc/debug | |
parent | c9d5f8671ddfbc4d8a6c2988e4818517c19f7de2 (diff) | |
download | chromium_src-b42dfda3dd350ddac88a682cc094d816ab054090.zip chromium_src-b42dfda3dd350ddac88a682cc094d816ab054090.tar.gz chromium_src-b42dfda3dd350ddac88a682cc094d816ab054090.tar.bz2 |
Remove non-slimming-paint codepaths in chrome
Slimming paint has shipped so the non-sp codepaths are rapidly rotting.
This patch removes the slimming paint codepaths in chrome while leaving
the removal of PicturePile and ContentLayerClient::PaintContents to a
followup.
BUG=524314
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1343493003
Cr-Commit-Position: refs/heads/master@{#349168}
Diffstat (limited to 'cc/debug')
-rw-r--r-- | cc/debug/rasterize_and_record_benchmark.cc | 68 | ||||
-rw-r--r-- | cc/debug/rasterize_and_record_benchmark.h | 2 |
2 files changed, 1 insertions, 69 deletions
diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc index b253436..0f47cd8 100644 --- a/cc/debug/rasterize_and_record_benchmark.cc +++ b/cc/debug/rasterize_and_record_benchmark.cc @@ -114,71 +114,7 @@ void RasterizeAndRecordBenchmark::RunOnLayer(PictureLayer* layer) { if (visible_layer_rect.IsEmpty()) return; - if (host_->settings().use_display_lists) { - RunOnDisplayListLayer(layer, visible_layer_rect); - } else { - RunOnPictureLayer(layer, visible_layer_rect); - } -} - -void RasterizeAndRecordBenchmark::RunOnPictureLayer( - PictureLayer* layer, - const gfx::Rect& visible_layer_rect) { - ContentLayerClient* painter = layer->client(); - - DCHECK(host_ && !host_->settings().use_display_lists); - - gfx::Size tile_grid_size = host_->settings().default_tile_size; - - for (int mode_index = 0; mode_index < RecordingSource::RECORDING_MODE_COUNT; - mode_index++) { - RecordingSource::RecordingMode mode = - static_cast<RecordingSource::RecordingMode>(mode_index); - - // Not supported for SkPicture recording. - if (mode == RecordingSource::RECORD_WITH_CONSTRUCTION_DISABLED) - continue; - - base::TimeDelta min_time = base::TimeDelta::Max(); - size_t memory_used = 0; - - for (int i = 0; i < record_repeat_count_; ++i) { - // Run for a minimum amount of time to avoid problems with timer - // quantization when the layer is very small. - LapTimer timer(kWarmupRuns, - base::TimeDelta::FromMilliseconds(kTimeLimitMillis), - kTimeCheckInterval); - scoped_refptr<Picture> picture; - do { - picture = Picture::Create(visible_layer_rect, painter, tile_grid_size, - false, mode); - if (picture->ShouldBeAnalyzedForSolidColor()) { - gfx::Size layer_size = layer->paint_properties().bounds; - skia::AnalysisCanvas canvas(layer_size.width(), layer_size.height()); - picture->Raster(&canvas, nullptr, gfx::Rect(), 1.f); - } - if (memory_used) { - // Verify we are recording the same thing each time. - DCHECK(memory_used == picture->ApproximateMemoryUsage()); - } else { - memory_used = picture->ApproximateMemoryUsage(); - } - - timer.NextLap(); - } while (!timer.HasTimeLimitExpired()); - base::TimeDelta duration = - base::TimeDelta::FromMillisecondsD(timer.MsPerLap()); - if (duration < min_time) - min_time = duration; - } - - if (mode == RecordingSource::RECORD_NORMALLY) { - record_results_.bytes_used += memory_used; - record_results_.pixels_recorded += - visible_layer_rect.width() * visible_layer_rect.height(); - } - record_results_.total_best_time[mode_index] += min_time; - } + RunOnDisplayListLayer(layer, visible_layer_rect); } void RasterizeAndRecordBenchmark::RunOnDisplayListLayer( @@ -186,8 +122,6 @@ void RasterizeAndRecordBenchmark::RunOnDisplayListLayer( const gfx::Rect& visible_layer_rect) { ContentLayerClient* painter = layer->client(); - DCHECK(host_ && host_->settings().use_display_lists); - for (int mode_index = 0; mode_index < RecordingSource::RECORDING_MODE_COUNT; mode_index++) { ContentLayerClient::PaintingControlSetting painting_control = diff --git a/cc/debug/rasterize_and_record_benchmark.h b/cc/debug/rasterize_and_record_benchmark.h index 207254f..3e873ce 100644 --- a/cc/debug/rasterize_and_record_benchmark.h +++ b/cc/debug/rasterize_and_record_benchmark.h @@ -40,8 +40,6 @@ class RasterizeAndRecordBenchmark : public MicroBenchmark { private: void RunOnDisplayListLayer(PictureLayer* layer, const gfx::Rect& visible_layer_rect); - void RunOnPictureLayer(PictureLayer* layer, - const gfx::Rect& visible_layer_rect); void RecordRasterResults(scoped_ptr<base::Value> results); |