OLD | NEW |
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/resources/display_item.h" | 7 #include "cc/resources/display_item.h" |
8 #include "cc/test/skia_common.h" | 8 #include "cc/test/skia_common.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 | 32 |
33 layer->SetBitmap(image_bitmap); | 33 layer->SetBitmap(image_bitmap); |
34 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height())); | 34 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height())); |
35 | 35 |
36 bool use_cached_picture = false; | 36 bool use_cached_picture = false; |
37 scoped_refptr<DisplayItemList> display_list = | 37 scoped_refptr<DisplayItemList> display_list = |
38 DisplayItemList::Create(layer_rect, use_cached_picture); | 38 DisplayItemList::Create(layer_rect, use_cached_picture); |
39 layer->PaintContentsToDisplayList( | 39 layer->PaintContentsToDisplayList( |
40 display_list.get(), layer_rect, | 40 display_list.get(), layer_rect, |
41 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); | 41 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); |
| 42 display_list->ProcessAppendedItems(); |
42 unsigned char actual_pixels[4 * 200 * 200] = {0}; | 43 unsigned char actual_pixels[4 * 200 * 200] = {0}; |
43 DrawDisplayList(actual_pixels, layer_rect, display_list); | 44 DrawDisplayList(actual_pixels, layer_rect, display_list); |
44 | 45 |
45 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200)); | 46 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200)); |
46 } | 47 } |
47 | 48 |
48 TEST(PictureImageLayerTest, PaintContentsToCachedDisplayList) { | 49 TEST(PictureImageLayerTest, PaintContentsToCachedDisplayList) { |
49 scoped_refptr<PictureImageLayer> layer = PictureImageLayer::Create(); | 50 scoped_refptr<PictureImageLayer> layer = PictureImageLayer::Create(); |
50 gfx::Rect layer_rect(200, 200); | 51 gfx::Rect layer_rect(200, 200); |
51 | 52 |
(...skipping 11 matching lines...) Expand all Loading... |
63 | 64 |
64 layer->SetBitmap(image_bitmap); | 65 layer->SetBitmap(image_bitmap); |
65 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height())); | 66 layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height())); |
66 | 67 |
67 bool use_cached_picture = true; | 68 bool use_cached_picture = true; |
68 scoped_refptr<DisplayItemList> display_list = | 69 scoped_refptr<DisplayItemList> display_list = |
69 DisplayItemList::Create(layer_rect, use_cached_picture); | 70 DisplayItemList::Create(layer_rect, use_cached_picture); |
70 layer->PaintContentsToDisplayList( | 71 layer->PaintContentsToDisplayList( |
71 display_list.get(), layer_rect, | 72 display_list.get(), layer_rect, |
72 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); | 73 ContentLayerClient::PAINTING_BEHAVIOR_NORMAL); |
| 74 display_list->ProcessAppendedItems(); |
73 display_list->CreateAndCacheSkPicture(); | 75 display_list->CreateAndCacheSkPicture(); |
74 unsigned char actual_pixels[4 * 200 * 200] = {0}; | 76 unsigned char actual_pixels[4 * 200 * 200] = {0}; |
75 DrawDisplayList(actual_pixels, layer_rect, display_list); | 77 DrawDisplayList(actual_pixels, layer_rect, display_list); |
76 | 78 |
77 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200)); | 79 EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200)); |
78 } | 80 } |
79 | 81 |
80 } // namespace | 82 } // namespace |
81 } // namespace cc | 83 } // namespace cc |
OLD | NEW |