cc: Clean up RecordingSource API

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/region.h"
 #include "cc/debug/debug_colors.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"
 #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,
+scoped_refptr<RasterSource> RasterSource::CreateFromDataStruct(
+    const PictureLayerData& layer_data,
+    const ContentLayerClientData& client_data,
     bool can_use_lcd_text) {
-  return make_scoped_refptr(new RasterSource(other, can_use_lcd_text));
+  return make_scoped_refptr(
+      new RasterSource(layer_data, client_data, can_use_lcd_text));
 }
 
-RasterSource::RasterSource(const RecordingSource* other, bool can_use_lcd_text)
-    : display_list_(other->display_list_),
-      painter_reported_memory_usage_(other->painter_reported_memory_usage_),
-      background_color_(other->background_color_),
-      requires_clear_(other->requires_clear_),
+RasterSource::RasterSource(const PictureLayerData& layer_data,
+                           const ContentLayerClientData& client_data,
+                           bool can_use_lcd_text)
+    : display_list_(client_data.display_list),
+      painter_reported_memory_usage_(client_data.painter_reported_memory_usage),
+      background_color_(layer_data.background_color),
+      requires_clear_(layer_data.requires_clear),
       can_use_lcd_text_(can_use_lcd_text),
-      is_solid_color_(other->is_solid_color_),
-      solid_color_(other->solid_color_),
-      recorded_viewport_(other->recorded_viewport_),
-      size_(other->size_),
-      clear_canvas_with_debug_color_(other->clear_canvas_with_debug_color_),
+      is_solid_color_(layer_data.is_solid_color),
+      solid_color_(layer_data.solid_color),
+      recorded_viewport_(client_data.recorded_viewport),
+      size_(layer_data.size),
+      clear_canvas_with_debug_color_(layer_data.clear_canvas_with_debug_color),
       slow_down_raster_scale_factor_for_debug_(
-          other->slow_down_raster_scale_factor_for_debug_),
+          layer_data.slow_down_raster_scale_factor_for_debug),
       should_attempt_to_use_distance_field_text_(false),
-      image_decode_controller_(nullptr) {
-}
+      image_decode_controller_(nullptr) {}
 
 RasterSource::RasterSource(const RasterSource* other, bool can_use_lcd_text)
     : display_list_(other->display_list_),
       painter_reported_memory_usage_(other->painter_reported_memory_usage_),
       background_color_(other->background_color_),
       requires_clear_(other->requires_clear_),
       can_use_lcd_text_(can_use_lcd_text),
       is_solid_color_(other->is_solid_color_),
       solid_color_(other->solid_color_),
       recorded_viewport_(other->recorded_viewport_),
@@ skipping 246 matching lines @@
   DCHECK(image_decode_controller);
   image_decode_controller_ = image_decode_controller;
 }
 
 RasterSource::PlaybackSettings::PlaybackSettings()
     : playback_to_shared_canvas(false),
       skip_images(false),
       use_image_hijack_canvas(true) {}
 
 }  // namespace cc