diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/cc/layers/recording_source.cc | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/layers/recording_source.cc')
| -rw-r--r-- | chromium/cc/layers/recording_source.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chromium/cc/layers/recording_source.cc b/chromium/cc/layers/recording_source.cc index 9b1efbd7137..e3a477a5b83 100644 --- a/chromium/cc/layers/recording_source.cc +++ b/chromium/cc/layers/recording_source.cc @@ -29,7 +29,6 @@ namespace cc { RecordingSource::RecordingSource() : slow_down_raster_scale_factor_for_debug_(0), - generate_discardable_images_metadata_(false), requires_clear_(false), is_solid_color_(false), clear_canvas_with_debug_color_(kDefaultClearCanvasSetting), @@ -56,8 +55,7 @@ void RecordingSource::FinishDisplayItemListUpdate() { TRACE_EVENT0("cc", "RecordingSource::FinishDisplayItemListUpdate"); DetermineIfSolidColor(); display_list_->EmitTraceSnapshot(); - if (generate_discardable_images_metadata_) - display_list_->GenerateDiscardableImagesMetadata(); + display_list_->GenerateDiscardableImagesMetadata(); } void RecordingSource::SetNeedsDisplayRect(const gfx::Rect& layer_rect) { @@ -121,11 +119,6 @@ void RecordingSource::SetSlowdownRasterScaleFactor(int factor) { slow_down_raster_scale_factor_for_debug_ = factor; } -void RecordingSource::SetGenerateDiscardableImagesMetadata( - bool generate_metadata) { - generate_discardable_images_metadata_ = generate_metadata; -} - void RecordingSource::SetBackgroundColor(SkColor background_color) { background_color_ = background_color; } @@ -153,10 +146,10 @@ void RecordingSource::DetermineIfSolidColor() { return; TRACE_EVENT1("cc", "RecordingSource::DetermineIfSolidColor", "opcount", - display_list_->ApproximateOpCount()); + display_list_->OpCount()); gfx::Size layer_size = GetSize(); skia::AnalysisCanvas canvas(layer_size.width(), layer_size.height()); - display_list_->Raster(&canvas, nullptr, gfx::Rect(layer_size), 1.f); + display_list_->Raster(&canvas); is_solid_color_ = canvas.GetColorIfSolid(&solid_color_); } |