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/skia_common.h" | 5 #include "cc/test/skia_common.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "cc/paint/paint_canvas.h" | 10 #include "cc/paint/paint_canvas.h" |
10 #include "cc/playback/display_item_list.h" | 11 #include "cc/playback/display_item_list.h" |
11 #include "third_party/skia/include/core/SkImageGenerator.h" | 12 #include "third_party/skia/include/core/SkImageGenerator.h" |
12 #include "third_party/skia/include/core/SkPixmap.h" | 13 #include "third_party/skia/include/core/SkPixmap.h" |
13 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
14 #include "ui/gfx/skia_util.h" | 15 #include "ui/gfx/skia_util.h" |
15 | 16 |
16 namespace cc { | 17 namespace cc { |
17 | 18 |
18 namespace { | 19 namespace { |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 std::unique_ptr<unsigned char[]> pixels_b(new unsigned char[pixel_size]); | 62 std::unique_ptr<unsigned char[]> pixels_b(new unsigned char[pixel_size]); |
62 memset(pixels_a.get(), 0, pixel_size); | 63 memset(pixels_a.get(), 0, pixel_size); |
63 memset(pixels_b.get(), 0, pixel_size); | 64 memset(pixels_b.get(), 0, pixel_size); |
64 DrawDisplayList(pixels_a.get(), layer_rect, list_a); | 65 DrawDisplayList(pixels_a.get(), layer_rect, list_a); |
65 DrawDisplayList(pixels_b.get(), layer_rect, list_b); | 66 DrawDisplayList(pixels_b.get(), layer_rect, list_b); |
66 | 67 |
67 return !memcmp(pixels_a.get(), pixels_b.get(), pixel_size); | 68 return !memcmp(pixels_a.get(), pixels_b.get(), pixel_size); |
68 } | 69 } |
69 | 70 |
70 sk_sp<SkImage> CreateDiscardableImage(const gfx::Size& size) { | 71 sk_sp<SkImage> CreateDiscardableImage(const gfx::Size& size) { |
71 return SkImage::MakeFromGenerator(new TestImageGenerator( | 72 return SkImage::MakeFromGenerator(base::MakeUnique<TestImageGenerator>( |
72 SkImageInfo::MakeN32Premul(size.width(), size.height()))); | 73 SkImageInfo::MakeN32Premul(size.width(), size.height()))); |
73 } | 74 } |
74 | 75 |
75 } // namespace cc | 76 } // namespace cc |
OLD | NEW |