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

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

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month 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 | « cc/layers/picture_image_layer_impl_unittest.cc ('k') | cc/layers/picture_layer.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/playback/display_item.h" 7 #include "cc/playback/display_item.h"
8 #include "cc/test/skia_common.h" 8 #include "cc/test/skia_common.h"
9 #include "cc/trees/layer_tree_settings.h" 9 #include "cc/trees/layer_tree_settings.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 17 matching lines...) Expand all
28 SkSurface::NewRasterDirect(info, image_pixels, info.minRowBytes())); 28 SkSurface::NewRasterDirect(info, image_pixels, info.minRowBytes()));
29 SkCanvas* image_canvas = image_surface->getCanvas(); 29 SkCanvas* image_canvas = image_surface->getCanvas();
30 image_canvas->clear(SK_ColorRED); 30 image_canvas->clear(SK_ColorRED);
31 SkPaint blue_paint; 31 SkPaint blue_paint;
32 blue_paint.setColor(SK_ColorBLUE); 32 blue_paint.setColor(SK_ColorBLUE);
33 image_canvas->drawRectCoords(0.f, 0.f, 100.f, 100.f, blue_paint); 33 image_canvas->drawRectCoords(0.f, 0.f, 100.f, 100.f, blue_paint);
34 image_canvas->drawRectCoords(100.f, 100.f, 200.f, 200.f, blue_paint); 34 image_canvas->drawRectCoords(100.f, 100.f, 200.f, 200.f, blue_paint);
35 35
36 skia::RefPtr<const SkImage> image = 36 skia::RefPtr<const SkImage> image =
37 skia::AdoptRef(image_surface->newImageSnapshot()); 37 skia::AdoptRef(image_surface->newImageSnapshot());
38 layer->SetImage(image.Pass()); 38 layer->SetImage(std::move(image));
39 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height())); 39 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height()));
40 40
41 scoped_refptr<DisplayItemList> display_list = 41 scoped_refptr<DisplayItemList> display_list =
42 layer->PaintContentsToDisplayList( 42 layer->PaintContentsToDisplayList(
43 layer_rect, ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); 43 layer_rect, ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
44 unsigned char actual_pixels[4 * 200 * 200] = {0}; 44 unsigned char actual_pixels[4 * 200 * 200] = {0};
45 DrawDisplayList(actual_pixels, layer_rect, display_list); 45 DrawDisplayList(actual_pixels, layer_rect, display_list);
46 46
47 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200)); 47 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200));
48 } 48 }
49 49
50 } // namespace 50 } // namespace
51 } // namespace cc 51 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_image_layer_impl_unittest.cc ('k') | cc/layers/picture_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698