| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/test/fake_content_layer_client.h" | 5 #include "cc/test/fake_content_layer_client.h" |
| 6 | 6 |
| 7 #include "cc/playback/clip_display_item.h" | 7 #include "cc/playback/clip_display_item.h" |
| 8 #include "cc/playback/display_item_list_settings.h" | 8 #include "cc/playback/display_item_list_settings.h" |
| 9 #include "cc/playback/drawing_display_item.h" | 9 #include "cc/playback/drawing_display_item.h" |
| 10 #include "cc/playback/transform_display_item.h" | 10 #include "cc/playback/transform_display_item.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 skia::RefPtr<SkPicture> picture; | 55 skia::RefPtr<SkPicture> picture; |
| 56 | 56 |
| 57 for (RectPaintVector::const_iterator it = draw_rects_.begin(); | 57 for (RectPaintVector::const_iterator it = draw_rects_.begin(); |
| 58 it != draw_rects_.end(); ++it) { | 58 it != draw_rects_.end(); ++it) { |
| 59 const gfx::RectF& draw_rect = it->first; | 59 const gfx::RectF& draw_rect = it->first; |
| 60 const SkPaint& paint = it->second; | 60 const SkPaint& paint = it->second; |
| 61 canvas = | 61 canvas = |
| 62 skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect))); | 62 skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect))); |
| 63 canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint); | 63 canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint); |
| 64 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 64 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 65 auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>( | 65 display_list->CreateAndAppendItem<DrawingDisplayItem>( |
| 66 ToEnclosingRect(draw_rect)); | 66 ToEnclosingRect(draw_rect), std::move(picture)); |
| 67 item->SetNew(std::move(picture)); | |
| 68 } | 67 } |
| 69 | 68 |
| 70 for (ImageVector::const_iterator it = draw_images_.begin(); | 69 for (ImageVector::const_iterator it = draw_images_.begin(); |
| 71 it != draw_images_.end(); ++it) { | 70 it != draw_images_.end(); ++it) { |
| 72 if (!it->transform.IsIdentity()) { | 71 if (!it->transform.IsIdentity()) { |
| 73 auto* item = display_list->CreateAndAppendItem<TransformDisplayItem>( | 72 display_list->CreateAndAppendItem<TransformDisplayItem>(PaintableRegion(), |
| 74 PaintableRegion()); | 73 it->transform); |
| 75 item->SetNew(it->transform); | |
| 76 } | 74 } |
| 77 canvas = skia::SharePtr( | 75 canvas = skia::SharePtr( |
| 78 recorder.beginRecording(it->image->width(), it->image->height())); | 76 recorder.beginRecording(it->image->width(), it->image->height())); |
| 79 canvas->drawImage(it->image.get(), it->point.x(), it->point.y(), | 77 canvas->drawImage(it->image.get(), it->point.x(), it->point.y(), |
| 80 &it->paint); | 78 &it->paint); |
| 81 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 79 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 82 auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>( | 80 display_list->CreateAndAppendItem<DrawingDisplayItem>(PaintableRegion(), |
| 83 PaintableRegion()); | 81 std::move(picture)); |
| 84 item->SetNew(std::move(picture)); | |
| 85 if (!it->transform.IsIdentity()) { | 82 if (!it->transform.IsIdentity()) { |
| 86 display_list->CreateAndAppendItem<EndTransformDisplayItem>( | 83 display_list->CreateAndAppendItem<EndTransformDisplayItem>( |
| 87 PaintableRegion()); | 84 PaintableRegion()); |
| 88 } | 85 } |
| 89 } | 86 } |
| 90 | 87 |
| 91 if (fill_with_nonsolid_color_) { | 88 if (fill_with_nonsolid_color_) { |
| 92 gfx::Rect draw_rect = PaintableRegion(); | 89 gfx::Rect draw_rect = PaintableRegion(); |
| 93 bool red = true; | 90 bool red = true; |
| 94 while (!draw_rect.IsEmpty()) { | 91 while (!draw_rect.IsEmpty()) { |
| 95 SkPaint paint; | 92 SkPaint paint; |
| 96 paint.setColor(red ? SK_ColorRED : SK_ColorBLUE); | 93 paint.setColor(red ? SK_ColorRED : SK_ColorBLUE); |
| 97 canvas = | 94 canvas = |
| 98 skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(draw_rect))); | 95 skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(draw_rect))); |
| 99 canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint); | 96 canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint); |
| 100 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 97 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 101 auto* item = | 98 display_list->CreateAndAppendItem<DrawingDisplayItem>(draw_rect, |
| 102 display_list->CreateAndAppendItem<DrawingDisplayItem>(draw_rect); | 99 std::move(picture)); |
| 103 item->SetNew(std::move(picture)); | |
| 104 draw_rect.Inset(1, 1); | 100 draw_rect.Inset(1, 1); |
| 105 } | 101 } |
| 106 } | 102 } |
| 107 | 103 |
| 108 | 104 |
| 109 display_list->Finalize(); | 105 display_list->Finalize(); |
| 110 return display_list; | 106 return display_list; |
| 111 } | 107 } |
| 112 | 108 |
| 113 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; } | 109 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; } |
| 114 | 110 |
| 115 size_t FakeContentLayerClient::GetApproximateUnsharedMemoryUsage() const { | 111 size_t FakeContentLayerClient::GetApproximateUnsharedMemoryUsage() const { |
| 116 return reported_memory_usage_; | 112 return reported_memory_usage_; |
| 117 } | 113 } |
| 118 | 114 |
| 119 } // namespace cc | 115 } // namespace cc |
| OLD | NEW |