Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/layers/content_layer_client.h" | 5 #include "cc/layers/content_layer_client.h" |
| 6 #include "cc/layers/picture_layer.h" | 6 #include "cc/layers/picture_layer.h" |
| 7 #include "cc/output/copy_output_request.h" | 7 #include "cc/output/copy_output_request.h" |
| 8 #include "cc/playback/display_item_list.h" | 8 #include "cc/playback/display_item_list.h" |
| 9 #include "cc/playback/display_item_list_settings.h" | 9 #include "cc/playback/display_item_list_settings.h" |
| 10 #include "cc/playback/drawing_display_item.h" | 10 #include "cc/playback/drawing_display_item.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 paint.setStyle(SkPaint::kFill_Style); | 126 paint.setStyle(SkPaint::kFill_Style); |
| 127 | 127 |
| 128 paint.setColor(SK_ColorBLUE); | 128 paint.setColor(SK_ColorBLUE); |
| 129 canvas->drawRect(gfx::RectToSkRect(blue_rect), paint); | 129 canvas->drawRect(gfx::RectToSkRect(blue_rect), paint); |
| 130 paint.setColor(SK_ColorYELLOW); | 130 paint.setColor(SK_ColorYELLOW); |
| 131 canvas->drawRect(gfx::RectToSkRect(yellow_rect), paint); | 131 canvas->drawRect(gfx::RectToSkRect(yellow_rect), paint); |
| 132 | 132 |
| 133 skia::RefPtr<SkPicture> picture = | 133 skia::RefPtr<SkPicture> picture = |
| 134 skia::AdoptRef(recorder.endRecordingAsPicture()); | 134 skia::AdoptRef(recorder.endRecordingAsPicture()); |
| 135 | 135 |
| 136 auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>( | 136 display_list->CreateAndAppendItem<DrawingDisplayItem>(PaintableRegion(), |
| 137 PaintableRegion()); | 137 std::move(picture)); |
|
vmpstr
2015/12/04 00:43:09
For all these
skia::RefPtr<SkPicture> picture =
danakj
2015/12/04 00:53:54
When you get a pointer from skia APIs the first th
vmpstr
2015/12/04 01:24:28
"stuff" would include skia::AdoptRef()
danakj
2015/12/04 01:24:54
Ooh ok that'd be fine. :)
| |
| 138 item->SetNew(std::move(picture)); | |
| 139 | |
| 140 display_list->Finalize(); | 138 display_list->Finalize(); |
| 141 return display_list; | 139 return display_list; |
| 142 } | 140 } |
| 143 | 141 |
| 144 bool FillsBoundsCompletely() const override { return true; } | 142 bool FillsBoundsCompletely() const override { return true; } |
| 145 size_t GetApproximateUnsharedMemoryUsage() const override { return 0; } | 143 size_t GetApproximateUnsharedMemoryUsage() const override { return 0; } |
| 146 | 144 |
| 147 void set_blue_top(bool b) { blue_top_ = b; } | 145 void set_blue_top(bool b) { blue_top_ = b; } |
| 148 | 146 |
| 149 private: | 147 private: |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 FullRaster_SingleThread_GpuRaster) { | 235 FullRaster_SingleThread_GpuRaster) { |
| 238 RunRasterPixelTest( | 236 RunRasterPixelTest( |
| 239 false, FULL_GPU, picture_layer_, | 237 false, FULL_GPU, picture_layer_, |
| 240 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png"))); | 238 base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png"))); |
| 241 } | 239 } |
| 242 | 240 |
| 243 } // namespace | 241 } // namespace |
| 244 } // namespace cc | 242 } // namespace cc |
| 245 | 243 |
| 246 #endif // !defined(OS_ANDROID) | 244 #endif // !defined(OS_ANDROID) |
| OLD | NEW |