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

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

Issue 2716013002: don't use deprecated helper methods on SkCanvas (Closed)
Patch Set: rebase 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/output/renderer_pixeltest.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 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/animation/animation_host.h" 7 #include "cc/animation/animation_host.h"
8 #include "cc/playback/display_item.h" 8 #include "cc/playback/display_item.h"
9 #include "cc/test/fake_layer_tree_host.h" 9 #include "cc/test/fake_layer_tree_host.h"
10 #include "cc/test/skia_common.h" 10 #include "cc/test/skia_common.h"
(...skipping 19 matching lines...) Expand all
30 30
31 unsigned char image_pixels[4 * 200 * 200] = {0}; 31 unsigned char image_pixels[4 * 200 * 200] = {0};
32 SkImageInfo info = 32 SkImageInfo info =
33 SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height()); 33 SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
34 sk_sp<SkSurface> image_surface = 34 sk_sp<SkSurface> image_surface =
35 SkSurface::MakeRasterDirect(info, image_pixels, info.minRowBytes()); 35 SkSurface::MakeRasterDirect(info, image_pixels, info.minRowBytes());
36 SkCanvas* image_canvas = image_surface->getCanvas(); 36 SkCanvas* image_canvas = image_surface->getCanvas();
37 image_canvas->clear(SK_ColorRED); 37 image_canvas->clear(SK_ColorRED);
38 SkPaint blue_paint; 38 SkPaint blue_paint;
39 blue_paint.setColor(SK_ColorBLUE); 39 blue_paint.setColor(SK_ColorBLUE);
40 image_canvas->drawRectCoords(0.f, 0.f, 100.f, 100.f, blue_paint); 40 image_canvas->drawRect(SkRect::MakeWH(100, 100), blue_paint);
41 image_canvas->drawRectCoords(100.f, 100.f, 200.f, 200.f, blue_paint); 41 image_canvas->drawRect(SkRect::MakeLTRB(100, 100, 200, 200), blue_paint);
42 42
43 layer->SetImage(image_surface->makeImageSnapshot()); 43 layer->SetImage(image_surface->makeImageSnapshot());
44 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height())); 44 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height()));
45 45
46 scoped_refptr<DisplayItemList> display_list = 46 scoped_refptr<DisplayItemList> display_list =
47 layer->PaintContentsToDisplayList( 47 layer->PaintContentsToDisplayList(
48 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); 48 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
49 unsigned char actual_pixels[4 * 200 * 200] = {0}; 49 unsigned char actual_pixels[4 * 200 * 200] = {0};
50 DrawDisplayList(actual_pixels, layer_rect, display_list); 50 DrawDisplayList(actual_pixels, layer_rect, display_list);
51 51
52 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200)); 52 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200));
53 53
54 layer->SetLayerTreeHost(nullptr); 54 layer->SetLayerTreeHost(nullptr);
55 } 55 }
56 56
57 } // namespace 57 } // namespace
58 } // namespace cc 58 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/output/renderer_pixeltest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698