Rename paint data structures

cc/playback/raster_source.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/playback/raster_source.h"
 
 #include <stddef.h>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
+#include "cc/paint/paint_recorder.h"
 #include "cc/playback/display_item_list.h"
 #include "cc/playback/image_hijack_canvas.h"
 #include "cc/playback/skip_image_canvas.h"
 #include "skia/ext/analysis_canvas.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkClipStack.h"

[danakj, 2017/01/20 23:34:13]

is used?

-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
 
 scoped_refptr<RasterSource> RasterSource::CreateFromRecordingSource(
     const RecordingSource* other,
     bool can_use_lcd_text) {
   return make_scoped_refptr(new RasterSource(other, can_use_lcd_text));
 }
 
@@ skipping 23 matching lines @@
       recorded_viewport_(other->recorded_viewport_),
       size_(other->size_),
       clear_canvas_with_debug_color_(other->clear_canvas_with_debug_color_),
       slow_down_raster_scale_factor_for_debug_(
           other->slow_down_raster_scale_factor_for_debug_),
       image_decode_cache_(other->image_decode_cache_) {}
 
 RasterSource::~RasterSource() {
 }
 
-void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
+void RasterSource::PlaybackToCanvas(PaintCanvas* raster_canvas,
                                     const gfx::Rect& canvas_bitmap_rect,
                                     const gfx::Rect& canvas_playback_rect,
                                     float raster_scale,
                                     const PlaybackSettings& settings) const {
   SkIRect raster_bounds = gfx::RectToSkIRect(canvas_bitmap_rect);
   if (!canvas_playback_rect.IsEmpty() &&
       !raster_bounds.intersect(gfx::RectToSkIRect(canvas_playback_rect)))
     return;
   // Treat all subnormal values as zero for performance.
   ScopedSubnormalFloatDisabler disabler;
 
   raster_canvas->save();
   raster_canvas->translate(-canvas_bitmap_rect.x(), -canvas_bitmap_rect.y());
   raster_canvas->clipRect(SkRect::MakeFromIRect(raster_bounds));
   raster_canvas->scale(raster_scale, raster_scale);
   PlaybackToCanvas(raster_canvas, settings);
   raster_canvas->restore();
 }
 
-void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
+void RasterSource::PlaybackToCanvas(PaintCanvas* raster_canvas,
                                     const PlaybackSettings& settings) const {
   if (!settings.playback_to_shared_canvas)
     PrepareForPlaybackToCanvas(raster_canvas);
 
   if (settings.skip_images) {
     SkipImageCanvas canvas(raster_canvas);
     RasterCommon(&canvas, nullptr);
   } else if (settings.use_image_hijack_canvas) {
     const SkImageInfo& info = raster_canvas->imageInfo();
 
     ImageHijackCanvas canvas(info.width(), info.height(), image_decode_cache_);
     // Before adding the canvas, make sure that the ImageHijackCanvas is aware
     // of the current transform and clip, which may affect the clip bounds.
     // Since we query the clip bounds of the current canvas to get the list of
     // draw commands to process, this is important to produce correct content.
     SkIRect raster_bounds;
     raster_canvas->getClipDeviceBounds(&raster_bounds);
     canvas.clipRect(SkRect::MakeFromIRect(raster_bounds));
     canvas.setMatrix(raster_canvas->getTotalMatrix());
     canvas.addCanvas(raster_canvas);
 
     RasterCommon(&canvas, nullptr);
   } else {
     RasterCommon(raster_canvas, nullptr);
   }
 }
 
 namespace {
 
-bool CanvasIsUnclipped(const SkCanvas* canvas) {
+bool CanvasIsUnclipped(const PaintCanvas* canvas) {
   if (!canvas->isClipRect())
     return false;
 
   SkIRect bounds;
   if (!canvas->getClipDeviceBounds(&bounds))
     return false;
 
   SkISize size = canvas->getBaseLayerSize();
   return bounds.contains(0, 0, size.width(), size.height());
 }
 
 }  // namespace
 
-void RasterSource::PrepareForPlaybackToCanvas(SkCanvas* canvas) const {
+void RasterSource::PrepareForPlaybackToCanvas(PaintCanvas* canvas) const {
   // TODO(hendrikw): See if we can split this up into separate functions.
 
   if (CanvasIsUnclipped(canvas))
     canvas->discard();
 
   // If this raster source has opaque contents, it is guaranteeing that it will
   // draw an opaque rect the size of the layer.  If it is not, then we must
   // clear this canvas ourselves.
   if (requires_clear_) {
     canvas->clear(SK_ColorTRANSPARENT);
@@ skipping 55 matching lines @@
   canvas->save();
   // Use clipRegion to bypass CTM because the rects are device rects.
   SkRegion interest_region;
   interest_region.setRect(interest_rect);
   interest_region.op(opaque_rect, SkRegion::kDifference_Op);
   canvas->clipRegion(interest_region);
   canvas->clear(background_color_);
   canvas->restore();
 }
 
-void RasterSource::RasterCommon(SkCanvas* canvas,
-                                SkPicture::AbortCallback* callback) const {
+void RasterSource::RasterCommon(PaintCanvas* canvas,
+                                PaintRecord::AbortCallback* callback) const {
   DCHECK(display_list_.get());
   int repeat_count = std::max(1, slow_down_raster_scale_factor_for_debug_);
   for (int i = 0; i < repeat_count; ++i)
     display_list_->Raster(canvas, callback);
 }
 
-sk_sp<SkPicture> RasterSource::GetFlattenedPicture() {
+sk_sp<PaintRecord> RasterSource::GetFlattenedPicture() {
   TRACE_EVENT0("cc", "RasterSource::GetFlattenedPicture");
 
-  SkPictureRecorder recorder;
-  SkCanvas* canvas = recorder.beginRecording(size_.width(), size_.height());
+  PaintRecorder recorder;
+  PaintCanvas* canvas = recorder.beginRecording(size_.width(), size_.height());
   if (!size_.IsEmpty()) {
     PrepareForPlaybackToCanvas(canvas);
     RasterCommon(canvas, nullptr);
   }
 
   return recorder.finishRecordingAsPicture();
 }
 
 size_t RasterSource::GetPictureMemoryUsage() const {
   if (!display_list_)
@@ skipping 80 matching lines @@
   bool can_use_lcd_text = false;
   return scoped_refptr<RasterSource>(new RasterSource(this, can_use_lcd_text));
 }
 
 RasterSource::PlaybackSettings::PlaybackSettings()
     : playback_to_shared_canvas(false),
       skip_images(false),
       use_image_hijack_canvas(true) {}
 
 }  // namespace cc