Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: cc/test/skia_common.cc

Issue 2706453003: switch to new ImageGenerator API (Closed)
Patch Set: fix new site in tile_manager_unittest.cc Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « no previous file | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698