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

Side by Side Diff: cc/playback/recording_source_unittest.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: 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 | « cc/playback/recording_source.h ('k') | cc/playback/transform_display_item.h » ('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 <vector> 5 #include <vector>
6 6
7 #include "base/memory/ptr_util.h"
7 #include "cc/base/region.h" 8 #include "cc/base/region.h"
8 #include "cc/playback/raster_source.h" 9 #include "cc/playback/raster_source.h"
9 #include "cc/proto/recording_source.pb.h" 10 #include "cc/proto/recording_source.pb.h"
10 #include "cc/test/fake_content_layer_client.h" 11 #include "cc/test/fake_content_layer_client.h"
11 #include "cc/test/fake_image_serialization_processor.h" 12 #include "cc/test/fake_image_serialization_processor.h"
12 #include "cc/test/fake_recording_source.h" 13 #include "cc/test/fake_recording_source.h"
13 #include "cc/test/skia_common.h" 14 #include "cc/test/skia_common.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
15 16
16 namespace cc { 17 namespace cc {
17 namespace { 18 namespace {
18 19
19 scoped_ptr<FakeRecordingSource> CreateRecordingSource( 20 std::unique_ptr<FakeRecordingSource> CreateRecordingSource(
20 const gfx::Rect& viewport) { 21 const gfx::Rect& viewport) {
21 gfx::Rect layer_rect(viewport.right(), viewport.bottom()); 22 gfx::Rect layer_rect(viewport.right(), viewport.bottom());
22 scoped_ptr<FakeRecordingSource> recording_source = 23 std::unique_ptr<FakeRecordingSource> recording_source =
23 FakeRecordingSource::CreateRecordingSource(viewport, layer_rect.size()); 24 FakeRecordingSource::CreateRecordingSource(viewport, layer_rect.size());
24 return recording_source; 25 return recording_source;
25 } 26 }
26 27
27 scoped_refptr<RasterSource> CreateRasterSource( 28 scoped_refptr<RasterSource> CreateRasterSource(
28 FakeRecordingSource* recording_source) { 29 FakeRecordingSource* recording_source) {
29 bool can_use_lcd_text = true; 30 bool can_use_lcd_text = true;
30 return RasterSource::CreateFromRecordingSource(recording_source, 31 return RasterSource::CreateFromRecordingSource(recording_source,
31 can_use_lcd_text); 32 can_use_lcd_text);
32 } 33 }
33 34
34 void ValidateRecordingSourceSerialization(FakeRecordingSource* source) { 35 void ValidateRecordingSourceSerialization(FakeRecordingSource* source) {
35 scoped_ptr<FakeImageSerializationProcessor> 36 std::unique_ptr<FakeImageSerializationProcessor>
36 fake_image_serialization_processor = 37 fake_image_serialization_processor =
37 make_scoped_ptr(new FakeImageSerializationProcessor); 38 base::WrapUnique(new FakeImageSerializationProcessor);
38 39
39 proto::RecordingSource proto; 40 proto::RecordingSource proto;
40 source->ToProtobuf(&proto, fake_image_serialization_processor.get()); 41 source->ToProtobuf(&proto, fake_image_serialization_processor.get());
41 42
42 FakeRecordingSource new_source; 43 FakeRecordingSource new_source;
43 new_source.FromProtobuf(proto, fake_image_serialization_processor.get()); 44 new_source.FromProtobuf(proto, fake_image_serialization_processor.get());
44 45
45 EXPECT_TRUE(source->EqualsTo(new_source)); 46 EXPECT_TRUE(source->EqualsTo(new_source));
46 } 47 }
47 48
48 TEST(RecordingSourceTest, TestNullDisplayListSerialization) { 49 TEST(RecordingSourceTest, TestNullDisplayListSerialization) {
49 gfx::Rect recorded_viewport(0, 0, 256, 256); 50 gfx::Rect recorded_viewport(0, 0, 256, 256);
50 51
51 scoped_ptr<FakeRecordingSource> recording_source = 52 std::unique_ptr<FakeRecordingSource> recording_source =
52 CreateRecordingSource(recorded_viewport); 53 CreateRecordingSource(recorded_viewport);
53 recording_source->SetDisplayListUsesCachedPicture(false); 54 recording_source->SetDisplayListUsesCachedPicture(false);
54 recording_source->SetGenerateDiscardableImagesMetadata(true); 55 recording_source->SetGenerateDiscardableImagesMetadata(true);
55 recording_source->Rerecord(); 56 recording_source->Rerecord();
56 recording_source->SetEmptyBounds(); 57 recording_source->SetEmptyBounds();
57 58
58 ValidateRecordingSourceSerialization(recording_source.get()); 59 ValidateRecordingSourceSerialization(recording_source.get());
59 } 60 }
60 61
61 TEST(RecordingSourceTest, TestEmptySerializationDeserialization) { 62 TEST(RecordingSourceTest, TestEmptySerializationDeserialization) {
62 gfx::Rect recorded_viewport(0, 0, 256, 256); 63 gfx::Rect recorded_viewport(0, 0, 256, 256);
63 64
64 scoped_ptr<FakeRecordingSource> recording_source = 65 std::unique_ptr<FakeRecordingSource> recording_source =
65 CreateRecordingSource(recorded_viewport); 66 CreateRecordingSource(recorded_viewport);
66 recording_source->SetDisplayListUsesCachedPicture(false); 67 recording_source->SetDisplayListUsesCachedPicture(false);
67 recording_source->SetGenerateDiscardableImagesMetadata(true); 68 recording_source->SetGenerateDiscardableImagesMetadata(true);
68 recording_source->Rerecord(); 69 recording_source->Rerecord();
69 70
70 ValidateRecordingSourceSerialization(recording_source.get()); 71 ValidateRecordingSourceSerialization(recording_source.get());
71 } 72 }
72 73
73 TEST(RecordingSourceTest, TestPopulatedSerializationDeserialization) { 74 TEST(RecordingSourceTest, TestPopulatedSerializationDeserialization) {
74 gfx::Rect recorded_viewport(0, 0, 256, 256); 75 gfx::Rect recorded_viewport(0, 0, 256, 256);
75 76
76 scoped_ptr<FakeRecordingSource> recording_source = 77 std::unique_ptr<FakeRecordingSource> recording_source =
77 CreateRecordingSource(recorded_viewport); 78 CreateRecordingSource(recorded_viewport);
78 recording_source->SetDisplayListUsesCachedPicture(false); 79 recording_source->SetDisplayListUsesCachedPicture(false);
79 80
80 SkPaint simple_paint; 81 SkPaint simple_paint;
81 simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34)); 82 simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
82 recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256), 83 recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256),
83 simple_paint); 84 simple_paint);
84 recording_source->add_draw_rect_with_paint(gfx::Rect(128, 128, 512, 512), 85 recording_source->add_draw_rect_with_paint(gfx::Rect(128, 128, 512, 512),
85 simple_paint); 86 simple_paint);
86 recording_source->add_draw_rect_with_paint(gfx::Rect(512, 0, 256, 256), 87 recording_source->add_draw_rect_with_paint(gfx::Rect(512, 0, 256, 256),
87 simple_paint); 88 simple_paint);
88 recording_source->add_draw_rect_with_paint(gfx::Rect(0, 512, 256, 256), 89 recording_source->add_draw_rect_with_paint(gfx::Rect(0, 512, 256, 256),
89 simple_paint); 90 simple_paint);
90 91
91 recording_source->SetGenerateDiscardableImagesMetadata(true); 92 recording_source->SetGenerateDiscardableImagesMetadata(true);
92 recording_source->Rerecord(); 93 recording_source->Rerecord();
93 94
94 ValidateRecordingSourceSerialization(recording_source.get()); 95 ValidateRecordingSourceSerialization(recording_source.get());
95 } 96 }
96 97
97 TEST(RecordingSourceTest, DiscardableImagesWithTransform) { 98 TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
98 gfx::Rect recorded_viewport(256, 256); 99 gfx::Rect recorded_viewport(256, 256);
99 100
100 scoped_ptr<FakeRecordingSource> recording_source = 101 std::unique_ptr<FakeRecordingSource> recording_source =
101 FakeRecordingSource::CreateFilledRecordingSource( 102 FakeRecordingSource::CreateFilledRecordingSource(
102 recorded_viewport.size()); 103 recorded_viewport.size());
103 skia::RefPtr<SkImage> discardable_image[2][2]; 104 skia::RefPtr<SkImage> discardable_image[2][2];
104 gfx::Transform identity_transform; 105 gfx::Transform identity_transform;
105 discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32)); 106 discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32));
106 // Translate transform is equivalent to moving using point. 107 // Translate transform is equivalent to moving using point.
107 gfx::Transform translate_transform; 108 gfx::Transform translate_transform;
108 translate_transform.Translate(0, 130); 109 translate_transform.Translate(0, 130);
109 discardable_image[1][0] = CreateDiscardableImage(gfx::Size(32, 32)); 110 discardable_image[1][0] = CreateDiscardableImage(gfx::Size(32, 32));
110 // This moves the bitmap to center of viewport and rotate, this would make 111 // This moves the bitmap to center of viewport and rotate, this would make
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 scale, &images); 182 scale, &images);
182 EXPECT_EQ(1u, images.size()); 183 EXPECT_EQ(1u, images.size());
183 EXPECT_FLOAT_EQ(scale, images[0].scale().width()); 184 EXPECT_FLOAT_EQ(scale, images[0].scale().width());
184 EXPECT_FLOAT_EQ(scale, images[0].scale().height()); 185 EXPECT_FLOAT_EQ(scale, images[0].scale().height());
185 } 186 }
186 } 187 }
187 188
188 TEST(RecordingSourceTest, NoGatherImageEmptyImages) { 189 TEST(RecordingSourceTest, NoGatherImageEmptyImages) {
189 gfx::Rect recorded_viewport(0, 0, 256, 256); 190 gfx::Rect recorded_viewport(0, 0, 256, 256);
190 191
191 scoped_ptr<FakeRecordingSource> recording_source = 192 std::unique_ptr<FakeRecordingSource> recording_source =
192 CreateRecordingSource(recorded_viewport); 193 CreateRecordingSource(recorded_viewport);
193 recording_source->SetGenerateDiscardableImagesMetadata(false); 194 recording_source->SetGenerateDiscardableImagesMetadata(false);
194 recording_source->Rerecord(); 195 recording_source->Rerecord();
195 196
196 scoped_refptr<RasterSource> raster_source = 197 scoped_refptr<RasterSource> raster_source =
197 CreateRasterSource(recording_source.get()); 198 CreateRasterSource(recording_source.get());
198 199
199 // If recording source do not gather images, raster source is not going to 200 // If recording source do not gather images, raster source is not going to
200 // get images. 201 // get images.
201 { 202 {
202 std::vector<DrawImage> images; 203 std::vector<DrawImage> images;
203 raster_source->GetDiscardableImagesInRect(recorded_viewport, 1.f, &images); 204 raster_source->GetDiscardableImagesInRect(recorded_viewport, 1.f, &images);
204 EXPECT_TRUE(images.empty()); 205 EXPECT_TRUE(images.empty());
205 } 206 }
206 } 207 }
207 208
208 TEST(RecordingSourceTest, EmptyImages) { 209 TEST(RecordingSourceTest, EmptyImages) {
209 gfx::Rect recorded_viewport(0, 0, 256, 256); 210 gfx::Rect recorded_viewport(0, 0, 256, 256);
210 211
211 scoped_ptr<FakeRecordingSource> recording_source = 212 std::unique_ptr<FakeRecordingSource> recording_source =
212 CreateRecordingSource(recorded_viewport); 213 CreateRecordingSource(recorded_viewport);
213 recording_source->SetGenerateDiscardableImagesMetadata(true); 214 recording_source->SetGenerateDiscardableImagesMetadata(true);
214 recording_source->Rerecord(); 215 recording_source->Rerecord();
215 216
216 scoped_refptr<RasterSource> raster_source = 217 scoped_refptr<RasterSource> raster_source =
217 CreateRasterSource(recording_source.get()); 218 CreateRasterSource(recording_source.get());
218 219
219 // Tile sized iterators. 220 // Tile sized iterators.
220 { 221 {
221 std::vector<DrawImage> images; 222 std::vector<DrawImage> images;
(...skipping 13 matching lines...) Expand all
235 std::vector<DrawImage> images; 236 std::vector<DrawImage> images;
236 raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f, 237 raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
237 &images); 238 &images);
238 EXPECT_TRUE(images.empty()); 239 EXPECT_TRUE(images.empty());
239 } 240 }
240 } 241 }
241 242
242 TEST(RecordingSourceTest, NoDiscardableImages) { 243 TEST(RecordingSourceTest, NoDiscardableImages) {
243 gfx::Rect recorded_viewport(0, 0, 256, 256); 244 gfx::Rect recorded_viewport(0, 0, 256, 256);
244 245
245 scoped_ptr<FakeRecordingSource> recording_source = 246 std::unique_ptr<FakeRecordingSource> recording_source =
246 CreateRecordingSource(recorded_viewport); 247 CreateRecordingSource(recorded_viewport);
247 248
248 SkPaint simple_paint; 249 SkPaint simple_paint;
249 simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34)); 250 simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
250 251
251 SkBitmap non_discardable_bitmap; 252 SkBitmap non_discardable_bitmap;
252 non_discardable_bitmap.allocN32Pixels(128, 128); 253 non_discardable_bitmap.allocN32Pixels(128, 128);
253 non_discardable_bitmap.setImmutable(); 254 non_discardable_bitmap.setImmutable();
254 skia::RefPtr<SkImage> non_discardable_image = 255 skia::RefPtr<SkImage> non_discardable_image =
255 skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap)); 256 skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap));
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 std::vector<DrawImage> images; 294 std::vector<DrawImage> images;
294 raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f, 295 raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
295 &images); 296 &images);
296 EXPECT_TRUE(images.empty()); 297 EXPECT_TRUE(images.empty());
297 } 298 }
298 } 299 }
299 300
300 TEST(RecordingSourceTest, DiscardableImages) { 301 TEST(RecordingSourceTest, DiscardableImages) {
301 gfx::Rect recorded_viewport(0, 0, 256, 256); 302 gfx::Rect recorded_viewport(0, 0, 256, 256);
302 303
303 scoped_ptr<FakeRecordingSource> recording_source = 304 std::unique_ptr<FakeRecordingSource> recording_source =
304 CreateRecordingSource(recorded_viewport); 305 CreateRecordingSource(recorded_viewport);
305 306
306 skia::RefPtr<SkImage> discardable_image[2][2]; 307 skia::RefPtr<SkImage> discardable_image[2][2];
307 discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32)); 308 discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32));
308 discardable_image[1][0] = CreateDiscardableImage(gfx::Size(32, 32)); 309 discardable_image[1][0] = CreateDiscardableImage(gfx::Size(32, 32));
309 discardable_image[1][1] = CreateDiscardableImage(gfx::Size(32, 32)); 310 discardable_image[1][1] = CreateDiscardableImage(gfx::Size(32, 32));
310 311
311 // Discardable images are found in the following cells: 312 // Discardable images are found in the following cells:
312 // |---|---| 313 // |---|---|
313 // | x | | 314 // | x | |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 EXPECT_EQ(3u, images.size()); 361 EXPECT_EQ(3u, images.size());
361 EXPECT_TRUE(images[0].image() == discardable_image[0][0].get()); 362 EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
362 EXPECT_TRUE(images[1].image() == discardable_image[1][0].get()); 363 EXPECT_TRUE(images[1].image() == discardable_image[1][0].get());
363 EXPECT_TRUE(images[2].image() == discardable_image[1][1].get()); 364 EXPECT_TRUE(images[2].image() == discardable_image[1][1].get());
364 } 365 }
365 } 366 }
366 367
367 TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) { 368 TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
368 gfx::Rect recorded_viewport(0, 0, 512, 512); 369 gfx::Rect recorded_viewport(0, 0, 512, 512);
369 370
370 scoped_ptr<FakeRecordingSource> recording_source = 371 std::unique_ptr<FakeRecordingSource> recording_source =
371 CreateRecordingSource(recorded_viewport); 372 CreateRecordingSource(recorded_viewport);
372 373
373 SkBitmap non_discardable_bitmap; 374 SkBitmap non_discardable_bitmap;
374 non_discardable_bitmap.allocN32Pixels(512, 512); 375 non_discardable_bitmap.allocN32Pixels(512, 512);
375 non_discardable_bitmap.setImmutable(); 376 non_discardable_bitmap.setImmutable();
376 skia::RefPtr<SkImage> non_discardable_image = 377 skia::RefPtr<SkImage> non_discardable_image =
377 skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap)); 378 skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap));
378 379
379 skia::RefPtr<SkImage> discardable_image[2][2]; 380 skia::RefPtr<SkImage> discardable_image[2][2];
380 discardable_image[0][0] = CreateDiscardableImage(gfx::Size(128, 128)); 381 discardable_image[0][0] = CreateDiscardableImage(gfx::Size(128, 128));
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 &images); 433 &images);
433 EXPECT_EQ(3u, images.size()); 434 EXPECT_EQ(3u, images.size());
434 EXPECT_TRUE(images[0].image() == discardable_image[0][0].get()); 435 EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
435 EXPECT_TRUE(images[1].image() == discardable_image[0][1].get()); 436 EXPECT_TRUE(images[1].image() == discardable_image[0][1].get());
436 EXPECT_TRUE(images[2].image() == discardable_image[1][1].get()); 437 EXPECT_TRUE(images[2].image() == discardable_image[1][1].get());
437 } 438 }
438 } 439 }
439 440
440 } // namespace 441 } // namespace
441 } // namespace cc 442 } // namespace cc
OLDNEW
« no previous file with comments | « cc/playback/recording_source.h ('k') | cc/playback/transform_display_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698