| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ui_resource_layer.h" | 5 #include "cc/layers/ui_resource_layer.h" |
| 6 | 6 |
| 7 #include "cc/resources/prioritized_resource_manager.h" | 7 #include "cc/resources/prioritized_resource_manager.h" |
| 8 #include "cc/resources/resource_provider.h" | 8 #include "cc/resources/resource_provider.h" |
| 9 #include "cc/resources/resource_update_queue.h" | 9 #include "cc/resources/resource_update_queue.h" |
| 10 #include "cc/resources/scoped_ui_resource.h" | 10 #include "cc/resources/scoped_ui_resource.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 ResourceUpdateQueue queue; | 59 ResourceUpdateQueue queue; |
| 60 gfx::Rect screen_space_clip_rect; | 60 gfx::Rect screen_space_clip_rect; |
| 61 OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect); | 61 OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect); |
| 62 test_layer->SavePaintProperties(); | 62 test_layer->SavePaintProperties(); |
| 63 test_layer->Update(&queue, &occlusion_tracker); | 63 test_layer->Update(&queue, &occlusion_tracker); |
| 64 | 64 |
| 65 EXPECT_FALSE(test_layer->DrawsContent()); | 65 EXPECT_FALSE(test_layer->DrawsContent()); |
| 66 | 66 |
| 67 SkBitmap bitmap; | 67 SkBitmap bitmap; |
| 68 bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10); | 68 bitmap.allocN32Pixels(10, 10); |
| 69 bitmap.allocPixels(); | |
| 70 bitmap.setImmutable(); | 69 bitmap.setImmutable(); |
| 71 | 70 |
| 72 test_layer->SetBitmap(bitmap); | 71 test_layer->SetBitmap(bitmap); |
| 73 test_layer->Update(&queue, &occlusion_tracker); | 72 test_layer->Update(&queue, &occlusion_tracker); |
| 74 | 73 |
| 75 EXPECT_TRUE(test_layer->DrawsContent()); | 74 EXPECT_TRUE(test_layer->DrawsContent()); |
| 76 } | 75 } |
| 77 | 76 |
| 78 TEST_F(UIResourceLayerTest, SetUIResourceId) { | 77 TEST_F(UIResourceLayerTest, SetUIResourceId) { |
| 79 scoped_refptr<UIResourceLayer> test_layer = UIResourceLayer::Create(); | 78 scoped_refptr<UIResourceLayer> test_layer = UIResourceLayer::Create(); |
| 80 ASSERT_TRUE(test_layer.get()); | 79 ASSERT_TRUE(test_layer.get()); |
| 81 test_layer->SetIsDrawable(true); | 80 test_layer->SetIsDrawable(true); |
| 82 test_layer->SetBounds(gfx::Size(100, 100)); | 81 test_layer->SetBounds(gfx::Size(100, 100)); |
| 83 | 82 |
| 84 layer_tree_host_->SetRootLayer(test_layer); | 83 layer_tree_host_->SetRootLayer(test_layer); |
| 85 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); | 84 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); |
| 86 EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get()); | 85 EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get()); |
| 87 | 86 |
| 88 ResourceUpdateQueue queue; | 87 ResourceUpdateQueue queue; |
| 89 gfx::Rect screen_space_clip_rect; | 88 gfx::Rect screen_space_clip_rect; |
| 90 OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect); | 89 OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect); |
| 91 test_layer->SavePaintProperties(); | 90 test_layer->SavePaintProperties(); |
| 92 test_layer->Update(&queue, &occlusion_tracker); | 91 test_layer->Update(&queue, &occlusion_tracker); |
| 93 | 92 |
| 94 EXPECT_FALSE(test_layer->DrawsContent()); | 93 EXPECT_FALSE(test_layer->DrawsContent()); |
| 95 | 94 |
| 96 SkBitmap bitmap; | |
| 97 bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10); | |
| 98 bitmap.allocPixels(); | |
| 99 bitmap.setImmutable(); | |
| 100 | |
| 101 scoped_ptr<ScopedUIResource> resource = ScopedUIResource::Create( | 95 scoped_ptr<ScopedUIResource> resource = ScopedUIResource::Create( |
| 102 layer_tree_host_.get(), UIResourceBitmap(bitmap)); | 96 layer_tree_host_.get(), UIResourceBitmap(10, 10)); |
| 103 test_layer->SetUIResourceId(resource->id()); | 97 test_layer->SetUIResourceId(resource->id()); |
| 104 test_layer->Update(&queue, &occlusion_tracker); | 98 test_layer->Update(&queue, &occlusion_tracker); |
| 105 | 99 |
| 106 EXPECT_TRUE(test_layer->DrawsContent()); | 100 EXPECT_TRUE(test_layer->DrawsContent()); |
| 107 } | 101 } |
| 108 | 102 |
| 109 } // namespace | 103 } // namespace |
| 110 } // namespace cc | 104 } // namespace cc |
| OLD | NEW |