Commit 986c1770 authored by Adrienne Walker's avatar Adrienne Walker Committed by Commit Bot

cc: Remove unused clear_canvas_before_raster setting

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ic1c231d599204a8592667793c4d016052c7ea031
Reviewed-on: https://chromium-review.googlesource.com/1097811Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Commit-Queue: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566665}
parent f36f8d73
...@@ -135,23 +135,21 @@ void RasterSource::PlaybackToCanvas( ...@@ -135,23 +135,21 @@ void RasterSource::PlaybackToCanvas(
} }
bool is_partial_raster = canvas_bitmap_rect != canvas_playback_rect; bool is_partial_raster = canvas_bitmap_rect != canvas_playback_rect;
if (settings.clear_canvas_before_raster) { if (!requires_clear_) {
if (!requires_clear_) { // Clear opaque raster sources. Opaque rasters sources guarantee that all
// Clear opaque raster sources. Opaque rasters sources guarantee that all // pixels inside the opaque region are painted. However, due to scaling
// pixels inside the opaque region are painted. However, due to scaling // it's possible that the last row and column might include pixels that
// it's possible that the last row and column might include pixels that // are not painted. Because this raster source is required to be opaque,
// are not painted. Because this raster source is required to be opaque, // we may need to do extra clearing outside of the clip. This needs to
// we may need to do extra clearing outside of the clip. This needs to // be done for both full and partial raster.
// be done for both full and partial raster. ClearForOpaqueRaster(raster_canvas, content_size, canvas_bitmap_rect,
ClearForOpaqueRaster(raster_canvas, content_size, canvas_bitmap_rect, canvas_playback_rect);
canvas_playback_rect); } else if (!is_partial_raster) {
} else if (!is_partial_raster) { // For non-opaque raster sources that are rastering the full tile,
// For non-opaque raster sources that are rastering the full tile, // just clear the entire canvas (even if stretches past the canvas
// just clear the entire canvas (even if stretches past the canvas // bitmap rect) as it's cheap to do so.
// bitmap rect) as it's cheap to do so. TrackRasterSourceNeededClear(RasterSourceClearType::kFull);
TrackRasterSourceNeededClear(RasterSourceClearType::kFull); raster_canvas->clear(SK_ColorTRANSPARENT);
raster_canvas->clear(SK_ColorTRANSPARENT);
}
} }
raster_canvas->save(); raster_canvas->save();
...@@ -162,8 +160,7 @@ void RasterSource::PlaybackToCanvas( ...@@ -162,8 +160,7 @@ void RasterSource::PlaybackToCanvas(
raster_canvas->scale(raster_transform.scale() / recording_scale_factor_, raster_canvas->scale(raster_transform.scale() / recording_scale_factor_,
raster_transform.scale() / recording_scale_factor_); raster_transform.scale() / recording_scale_factor_);
if (is_partial_raster && settings.clear_canvas_before_raster && if (is_partial_raster && requires_clear_) {
requires_clear_) {
// TODO(enne): Should this be considered a partial clear? // TODO(enne): Should this be considered a partial clear?
TrackRasterSourceNeededClear(RasterSourceClearType::kFull); TrackRasterSourceNeededClear(RasterSourceClearType::kFull);
// Because Skia treats painted regions as transparent by default, we don't // Because Skia treats painted regions as transparent by default, we don't
......
...@@ -38,7 +38,6 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> { ...@@ -38,7 +38,6 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
// If set to true, we should use LCD text. // If set to true, we should use LCD text.
bool use_lcd_text = true; bool use_lcd_text = true;
bool clear_canvas_before_raster = true;
// The ImageProvider used to replace images during playback. // The ImageProvider used to replace images during playback.
ImageProvider* image_provider = nullptr; ImageProvider* image_provider = nullptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment