| Index: cc/playback/raster_source.cc
|
| diff --git a/cc/playback/raster_source.cc b/cc/playback/raster_source.cc
|
| index d464779c3fef57ee577b1e2c3df8783826dea5dd..0f3e8c4fbe33cac06fac6718e4496da255d78f42 100644
|
| --- a/cc/playback/raster_source.cc
|
| +++ b/cc/playback/raster_source.cc
|
| @@ -20,28 +20,31 @@
|
|
|
| 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_),
|
|
|