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

Side by Side Diff: cc/layers/picture_image_layer_unittest.cc

Issue 1869753003: Replace many skia::RefPtr with sk_sp<> in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/layers/picture_layer_unittest.cc » ('j') | cc/output/filter_operation.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/picture_image_layer.h" 5 #include "cc/layers/picture_image_layer.h"
6 6
7 #include "cc/playback/display_item.h" 7 #include "cc/playback/display_item.h"
8 #include "cc/test/fake_layer_tree_host.h" 8 #include "cc/test/fake_layer_tree_host.h"
9 #include "cc/test/skia_common.h" 9 #include "cc/test/skia_common.h"
10 #include "cc/test/test_task_graph_runner.h" 10 #include "cc/test/test_task_graph_runner.h"
(...skipping 20 matching lines...) Expand all
31 SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height()); 31 SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
32 sk_sp<SkSurface> image_surface = 32 sk_sp<SkSurface> image_surface =
33 SkSurface::MakeRasterDirect(info, image_pixels, info.minRowBytes()); 33 SkSurface::MakeRasterDirect(info, image_pixels, info.minRowBytes());
34 SkCanvas* image_canvas = image_surface->getCanvas(); 34 SkCanvas* image_canvas = image_surface->getCanvas();
35 image_canvas->clear(SK_ColorRED); 35 image_canvas->clear(SK_ColorRED);
36 SkPaint blue_paint; 36 SkPaint blue_paint;
37 blue_paint.setColor(SK_ColorBLUE); 37 blue_paint.setColor(SK_ColorBLUE);
38 image_canvas->drawRectCoords(0.f, 0.f, 100.f, 100.f, blue_paint); 38 image_canvas->drawRectCoords(0.f, 0.f, 100.f, 100.f, blue_paint);
39 image_canvas->drawRectCoords(100.f, 100.f, 200.f, 200.f, blue_paint); 39 image_canvas->drawRectCoords(100.f, 100.f, 200.f, 200.f, blue_paint);
40 40
41 skia::RefPtr<const SkImage> image = 41 sk_sp<const SkImage> image(image_surface->makeImageSnapshot());
42 skia::AdoptRef(image_surface->newImageSnapshot()); 42 layer->SetImage(skia::SharePtr(image));
43 layer->SetImage(std::move(image));
44 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height())); 43 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height()));
45 44
46 scoped_refptr<DisplayItemList> display_list = 45 scoped_refptr<DisplayItemList> display_list =
47 layer->PaintContentsToDisplayList( 46 layer->PaintContentsToDisplayList(
48 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); 47 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
49 unsigned char actual_pixels[4 * 200 * 200] = {0}; 48 unsigned char actual_pixels[4 * 200 * 200] = {0};
50 DrawDisplayList(actual_pixels, layer_rect, display_list); 49 DrawDisplayList(actual_pixels, layer_rect, display_list);
51 50
52 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200)); 51 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200));
53 52
54 layer->SetLayerTreeHost(nullptr); 53 layer->SetLayerTreeHost(nullptr);
55 } 54 }
56 55
57 } // namespace 56 } // namespace
58 } // namespace cc 57 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/layers/picture_layer_unittest.cc » ('j') | cc/output/filter_operation.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698