| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/playback/display_item_list.h" | 5 #include "cc/playback/display_item_list.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "cc/output/filter_operation.h" | 9 #include "cc/output/filter_operation.h" |
| 10 #include "cc/output/filter_operations.h" | 10 #include "cc/output/filter_operations.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 blue_paint.setColor(SK_ColorBLUE); | 37 blue_paint.setColor(SK_ColorBLUE); |
| 38 SkPaint red_paint; | 38 SkPaint red_paint; |
| 39 red_paint.setColor(SK_ColorRED); | 39 red_paint.setColor(SK_ColorRED); |
| 40 unsigned char pixels[4 * 100 * 100] = {0}; | 40 unsigned char pixels[4 * 100 * 100] = {0}; |
| 41 DisplayItemListSettings settings; | 41 DisplayItemListSettings settings; |
| 42 settings.use_cached_picture = true; | 42 settings.use_cached_picture = true; |
| 43 scoped_refptr<DisplayItemList> list = | 43 scoped_refptr<DisplayItemList> list = |
| 44 DisplayItemList::Create(layer_rect, settings); | 44 DisplayItemList::Create(layer_rect, settings); |
| 45 | 45 |
| 46 gfx::PointF offset(8.f, 9.f); | 46 gfx::PointF offset(8.f, 9.f); |
| 47 gfx::RectF recording_rect(offset, layer_rect.size()); | 47 gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size())); |
| 48 canvas = skia::SharePtr( | 48 canvas = skia::SharePtr( |
| 49 recorder.beginRecording(gfx::RectFToSkRect(recording_rect))); | 49 recorder.beginRecording(gfx::RectFToSkRect(recording_rect))); |
| 50 canvas->translate(offset.x(), offset.y()); | 50 canvas->translate(offset.x(), offset.y()); |
| 51 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); | 51 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); |
| 52 canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); | 52 canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); |
| 53 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 53 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 54 auto* item = list->CreateAndAppendItem<DrawingDisplayItem>(); | 54 auto* item = list->CreateAndAppendItem<DrawingDisplayItem>(); |
| 55 item->SetNew(picture); | 55 item->SetNew(picture); |
| 56 list->Finalize(); | 56 list->Finalize(); |
| 57 DrawDisplayList(pixels, layer_rect, list); | 57 DrawDisplayList(pixels, layer_rect, list); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 82 blue_paint.setColor(SK_ColorBLUE); | 82 blue_paint.setColor(SK_ColorBLUE); |
| 83 SkPaint red_paint; | 83 SkPaint red_paint; |
| 84 red_paint.setColor(SK_ColorRED); | 84 red_paint.setColor(SK_ColorRED); |
| 85 unsigned char pixels[4 * 100 * 100] = {0}; | 85 unsigned char pixels[4 * 100 * 100] = {0}; |
| 86 DisplayItemListSettings settings; | 86 DisplayItemListSettings settings; |
| 87 settings.use_cached_picture = true; | 87 settings.use_cached_picture = true; |
| 88 scoped_refptr<DisplayItemList> list = | 88 scoped_refptr<DisplayItemList> list = |
| 89 DisplayItemList::Create(layer_rect, settings); | 89 DisplayItemList::Create(layer_rect, settings); |
| 90 | 90 |
| 91 gfx::PointF first_offset(8.f, 9.f); | 91 gfx::PointF first_offset(8.f, 9.f); |
| 92 gfx::RectF first_recording_rect(first_offset, layer_rect.size()); | 92 gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size())); |
| 93 canvas = skia::SharePtr( | 93 canvas = skia::SharePtr( |
| 94 recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect))); | 94 recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect))); |
| 95 canvas->translate(first_offset.x(), first_offset.y()); | 95 canvas->translate(first_offset.x(), first_offset.y()); |
| 96 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); | 96 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); |
| 97 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 97 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 98 auto* item1 = list->CreateAndAppendItem<DrawingDisplayItem>(); | 98 auto* item1 = list->CreateAndAppendItem<DrawingDisplayItem>(); |
| 99 item1->SetNew(picture.Pass()); | 99 item1->SetNew(picture.Pass()); |
| 100 | 100 |
| 101 gfx::Rect clip_rect(60, 60, 10, 10); | 101 gfx::Rect clip_rect(60, 60, 10, 10); |
| 102 auto* item2 = list->CreateAndAppendItem<ClipDisplayItem>(); | 102 auto* item2 = list->CreateAndAppendItem<ClipDisplayItem>(); |
| 103 item2->SetNew(clip_rect, std::vector<SkRRect>()); | 103 item2->SetNew(clip_rect, std::vector<SkRRect>()); |
| 104 | 104 |
| 105 gfx::PointF second_offset(2.f, 3.f); | 105 gfx::PointF second_offset(2.f, 3.f); |
| 106 gfx::RectF second_recording_rect(second_offset, layer_rect.size()); | 106 gfx::RectF second_recording_rect(second_offset, |
| 107 gfx::SizeF(layer_rect.size())); |
| 107 canvas = skia::SharePtr( | 108 canvas = skia::SharePtr( |
| 108 recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect))); | 109 recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect))); |
| 109 canvas->translate(second_offset.x(), second_offset.y()); | 110 canvas->translate(second_offset.x(), second_offset.y()); |
| 110 canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); | 111 canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); |
| 111 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 112 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 112 auto* item3 = list->CreateAndAppendItem<DrawingDisplayItem>(); | 113 auto* item3 = list->CreateAndAppendItem<DrawingDisplayItem>(); |
| 113 item3->SetNew(picture.Pass()); | 114 item3->SetNew(picture.Pass()); |
| 114 | 115 |
| 115 list->CreateAndAppendItem<EndClipDisplayItem>(); | 116 list->CreateAndAppendItem<EndClipDisplayItem>(); |
| 116 list->Finalize(); | 117 list->Finalize(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 144 blue_paint.setColor(SK_ColorBLUE); | 145 blue_paint.setColor(SK_ColorBLUE); |
| 145 SkPaint red_paint; | 146 SkPaint red_paint; |
| 146 red_paint.setColor(SK_ColorRED); | 147 red_paint.setColor(SK_ColorRED); |
| 147 unsigned char pixels[4 * 100 * 100] = {0}; | 148 unsigned char pixels[4 * 100 * 100] = {0}; |
| 148 DisplayItemListSettings settings; | 149 DisplayItemListSettings settings; |
| 149 settings.use_cached_picture = true; | 150 settings.use_cached_picture = true; |
| 150 scoped_refptr<DisplayItemList> list = | 151 scoped_refptr<DisplayItemList> list = |
| 151 DisplayItemList::Create(layer_rect, settings); | 152 DisplayItemList::Create(layer_rect, settings); |
| 152 | 153 |
| 153 gfx::PointF first_offset(8.f, 9.f); | 154 gfx::PointF first_offset(8.f, 9.f); |
| 154 gfx::RectF first_recording_rect(first_offset, layer_rect.size()); | 155 gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size())); |
| 155 canvas = skia::SharePtr( | 156 canvas = skia::SharePtr( |
| 156 recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect))); | 157 recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect))); |
| 157 canvas->translate(first_offset.x(), first_offset.y()); | 158 canvas->translate(first_offset.x(), first_offset.y()); |
| 158 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); | 159 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); |
| 159 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 160 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 160 auto* item1 = list->CreateAndAppendItem<DrawingDisplayItem>(); | 161 auto* item1 = list->CreateAndAppendItem<DrawingDisplayItem>(); |
| 161 item1->SetNew(picture); | 162 item1->SetNew(picture); |
| 162 | 163 |
| 163 gfx::Transform transform; | 164 gfx::Transform transform; |
| 164 transform.Rotate(45.0); | 165 transform.Rotate(45.0); |
| 165 auto* item2 = list->CreateAndAppendItem<TransformDisplayItem>(); | 166 auto* item2 = list->CreateAndAppendItem<TransformDisplayItem>(); |
| 166 item2->SetNew(transform); | 167 item2->SetNew(transform); |
| 167 | 168 |
| 168 gfx::PointF second_offset(2.f, 3.f); | 169 gfx::PointF second_offset(2.f, 3.f); |
| 169 gfx::RectF second_recording_rect(second_offset, layer_rect.size()); | 170 gfx::RectF second_recording_rect(second_offset, |
| 171 gfx::SizeF(layer_rect.size())); |
| 170 canvas = skia::SharePtr( | 172 canvas = skia::SharePtr( |
| 171 recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect))); | 173 recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect))); |
| 172 canvas->translate(second_offset.x(), second_offset.y()); | 174 canvas->translate(second_offset.x(), second_offset.y()); |
| 173 canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); | 175 canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint); |
| 174 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); | 176 picture = skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 175 auto* item3 = list->CreateAndAppendItem<DrawingDisplayItem>(); | 177 auto* item3 = list->CreateAndAppendItem<DrawingDisplayItem>(); |
| 176 item3->SetNew(picture); | 178 item3->SetNew(picture); |
| 177 | 179 |
| 178 list->CreateAndAppendItem<EndTransformDisplayItem>(); | 180 list->CreateAndAppendItem<EndTransformDisplayItem>(); |
| 179 list->Finalize(); | 181 list->Finalize(); |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 SkPictureRecorder recorder; | 257 SkPictureRecorder recorder; |
| 256 skia::RefPtr<SkCanvas> canvas; | 258 skia::RefPtr<SkCanvas> canvas; |
| 257 skia::RefPtr<SkPicture> picture; | 259 skia::RefPtr<SkPicture> picture; |
| 258 SkPaint blue_paint; | 260 SkPaint blue_paint; |
| 259 blue_paint.setColor(SK_ColorBLUE); | 261 blue_paint.setColor(SK_ColorBLUE); |
| 260 SkPaint red_paint; | 262 SkPaint red_paint; |
| 261 red_paint.setColor(SK_ColorRED); | 263 red_paint.setColor(SK_ColorRED); |
| 262 unsigned char pixels[4 * 100 * 100] = {0}; | 264 unsigned char pixels[4 * 100 * 100] = {0}; |
| 263 | 265 |
| 264 gfx::PointF offset(8.f, 9.f); | 266 gfx::PointF offset(8.f, 9.f); |
| 265 gfx::RectF recording_rect(offset, layer_rect.size()); | 267 gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size())); |
| 266 | 268 |
| 267 DisplayItemListSettings no_caching_settings; | 269 DisplayItemListSettings no_caching_settings; |
| 268 no_caching_settings.use_cached_picture = false; | 270 no_caching_settings.use_cached_picture = false; |
| 269 scoped_refptr<DisplayItemList> list_without_caching = | 271 scoped_refptr<DisplayItemList> list_without_caching = |
| 270 DisplayItemList::Create(layer_rect, no_caching_settings); | 272 DisplayItemList::Create(layer_rect, no_caching_settings); |
| 271 | 273 |
| 272 canvas = skia::SharePtr( | 274 canvas = skia::SharePtr( |
| 273 recorder.beginRecording(gfx::RectFToSkRect(recording_rect))); | 275 recorder.beginRecording(gfx::RectFToSkRect(recording_rect))); |
| 274 canvas->translate(offset.x(), offset.y()); | 276 canvas->translate(offset.x(), offset.y()); |
| 275 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); | 277 canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint); |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 // categories being traced). | 469 // categories being traced). |
| 468 list = new DisplayItemList(layer_rect, caching_settings, true); | 470 list = new DisplayItemList(layer_rect, caching_settings, true); |
| 469 item = list->CreateAndAppendItem<DrawingDisplayItem>(); | 471 item = list->CreateAndAppendItem<DrawingDisplayItem>(); |
| 470 item->SetNew(picture); | 472 item->SetNew(picture); |
| 471 list->Finalize(); | 473 list->Finalize(); |
| 472 memory_usage = list->ApproximateMemoryUsage(); | 474 memory_usage = list->ApproximateMemoryUsage(); |
| 473 EXPECT_EQ(static_cast<size_t>(0), memory_usage); | 475 EXPECT_EQ(static_cast<size_t>(0), memory_usage); |
| 474 } | 476 } |
| 475 | 477 |
| 476 } // namespace cc | 478 } // namespace cc |
| OLD | NEW |