| Index: cc/test/fake_recording_source.h
|
| diff --git a/cc/test/fake_recording_source.h b/cc/test/fake_recording_source.h
|
| index 20f9538dad5dc5b85c824373aa77a401d940ac6e..a8f4c00289eb6852820fd99a83cc22c25b0a02b4 100644
|
| --- a/cc/test/fake_recording_source.h
|
| +++ b/cc/test/fake_recording_source.h
|
| @@ -57,22 +57,22 @@ class FakeRecordingSource : public RecordingSource {
|
| }
|
|
|
| void SetRecordedViewport(const gfx::Rect& recorded_viewport) {
|
| - recorded_viewport_ = recorded_viewport;
|
| + clc_data_.recorded_viewport = recorded_viewport;
|
| }
|
|
|
| void SetLayerBounds(const gfx::Size& layer_bounds) {
|
| - size_ = layer_bounds;
|
| + pl_data_.size = layer_bounds;
|
| client_.set_bounds(layer_bounds);
|
| }
|
|
|
| void SetClearCanvasWithDebugColor(bool clear) {
|
| - clear_canvas_with_debug_color_ = clear;
|
| + pl_data_.clear_canvas_with_debug_color = clear;
|
| }
|
|
|
| void Rerecord() {
|
| - SetNeedsDisplayRect(recorded_viewport_);
|
| + SetNeedsDisplayRect(clc_data_.recorded_viewport);
|
| Region invalidation;
|
| - UpdateAndExpandInvalidation(&client_, &invalidation, size_, 0,
|
| + UpdateAndExpandInvalidation(&client_, &invalidation, pl_data_.size,
|
| RECORD_NORMALLY);
|
| }
|
|
|
| @@ -116,7 +116,7 @@ class FakeRecordingSource : public RecordingSource {
|
|
|
| void reset_draws() {
|
| client_ = FakeContentLayerClient();
|
| - client_.set_bounds(size_);
|
| + client_.set_bounds(pl_data_.size);
|
| }
|
|
|
| void SetUnsuitableForGpuRasterization() {
|
| @@ -127,7 +127,7 @@ class FakeRecordingSource : public RecordingSource {
|
| playback_allowed_event_ = event;
|
| }
|
|
|
| - DisplayItemList* display_list() const { return display_list_.get(); }
|
| + DisplayItemList* display_list() const { return clc_data_.display_list.get(); }
|
|
|
| // Checks that the basic properties of the |other| match |this|. For the
|
| // DisplayItemList, it checks that the painted result matches the painted
|
|
|