OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/layer.h" | 5 #include "cc/layers/layer.h" |
6 | 6 |
7 #include "cc/animation/keyframed_animation_curve.h" | 7 #include "cc/animation/keyframed_animation_curve.h" |
8 #include "cc/base/math_util.h" | 8 #include "cc/base/math_util.h" |
9 #include "cc/layers/layer_impl.h" | 9 #include "cc/layers/layer_impl.h" |
10 #include "cc/resources/layer_painter.h" | 10 #include "cc/resources/layer_painter.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \ | 35 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \ |
36 } while (false) | 36 } while (false) |
37 | 37 |
38 namespace cc { | 38 namespace cc { |
39 namespace { | 39 namespace { |
40 | 40 |
41 class MockLayerTreeHost : public LayerTreeHost { | 41 class MockLayerTreeHost : public LayerTreeHost { |
42 public: | 42 public: |
43 explicit MockLayerTreeHost(FakeLayerTreeHostClient* client) | 43 explicit MockLayerTreeHost(FakeLayerTreeHostClient* client) |
44 : LayerTreeHost(client, nullptr, nullptr, LayerTreeSettings()) { | 44 : LayerTreeHost(client, nullptr, nullptr, LayerTreeSettings()) { |
45 InitializeSingleThreaded(client, base::MessageLoopProxy::current()); | 45 InitializeSingleThreaded(client, |
| 46 base::MessageLoopProxy::current(), |
| 47 nullptr); |
46 } | 48 } |
47 | 49 |
48 MOCK_METHOD0(SetNeedsCommit, void()); | 50 MOCK_METHOD0(SetNeedsCommit, void()); |
49 MOCK_METHOD0(SetNeedsUpdateLayers, void()); | 51 MOCK_METHOD0(SetNeedsUpdateLayers, void()); |
50 MOCK_METHOD0(SetNeedsFullTreeSync, void()); | 52 MOCK_METHOD0(SetNeedsFullTreeSync, void()); |
51 }; | 53 }; |
52 | 54 |
53 class MockLayerPainter : public LayerPainter { | 55 class MockLayerPainter : public LayerPainter { |
54 public: | 56 public: |
55 virtual void Paint(SkCanvas* canvas, const gfx::Rect& content_rect) override { | 57 virtual void Paint(SkCanvas* canvas, const gfx::Rect& content_rect) override { |
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
929 shared_bitmap_manager_(new TestSharedBitmapManager), | 931 shared_bitmap_manager_(new TestSharedBitmapManager), |
930 gpu_memory_buffer_manager_(new TestGpuMemoryBufferManager) {} | 932 gpu_memory_buffer_manager_(new TestGpuMemoryBufferManager) {} |
931 | 933 |
932 scoped_ptr<LayerTreeHost> Create() { | 934 scoped_ptr<LayerTreeHost> Create() { |
933 return LayerTreeHost::CreateSingleThreaded( | 935 return LayerTreeHost::CreateSingleThreaded( |
934 &client_, | 936 &client_, |
935 &client_, | 937 &client_, |
936 shared_bitmap_manager_.get(), | 938 shared_bitmap_manager_.get(), |
937 gpu_memory_buffer_manager_.get(), | 939 gpu_memory_buffer_manager_.get(), |
938 LayerTreeSettings(), | 940 LayerTreeSettings(), |
939 base::MessageLoopProxy::current()).Pass(); | 941 base::MessageLoopProxy::current(), |
| 942 nullptr).Pass(); |
940 } | 943 } |
941 | 944 |
942 scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { | 945 scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { |
943 return LayerTreeHost::CreateSingleThreaded( | 946 return LayerTreeHost::CreateSingleThreaded( |
944 &client_, | 947 &client_, |
945 &client_, | 948 &client_, |
946 shared_bitmap_manager_.get(), | 949 shared_bitmap_manager_.get(), |
947 gpu_memory_buffer_manager_.get(), | 950 gpu_memory_buffer_manager_.get(), |
948 settings, | 951 settings, |
949 base::MessageLoopProxy::current()).Pass(); | 952 base::MessageLoopProxy::current(), |
| 953 nullptr).Pass(); |
950 } | 954 } |
951 | 955 |
952 private: | 956 private: |
953 FakeLayerTreeHostClient client_; | 957 FakeLayerTreeHostClient client_; |
954 scoped_ptr<TestSharedBitmapManager> shared_bitmap_manager_; | 958 scoped_ptr<TestSharedBitmapManager> shared_bitmap_manager_; |
955 scoped_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_; | 959 scoped_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_; |
956 }; | 960 }; |
957 | 961 |
958 void AssertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host) { | 962 void AssertLayerTreeHostMatchesForSubtree(Layer* layer, LayerTreeHost* host) { |
959 EXPECT_EQ(host, layer->layer_tree_host()); | 963 EXPECT_EQ(host, layer->layer_tree_host()); |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1245 root_layer->AddChild(becomes_not_draws_content); | 1249 root_layer->AddChild(becomes_not_draws_content); |
1246 EXPECT_EQ(0, root_layer->NumDescendantsThatDrawContent()); | 1250 EXPECT_EQ(0, root_layer->NumDescendantsThatDrawContent()); |
1247 | 1251 |
1248 becomes_draws_content->SetIsDrawable(true); | 1252 becomes_draws_content->SetIsDrawable(true); |
1249 root_layer->AddChild(becomes_draws_content); | 1253 root_layer->AddChild(becomes_draws_content); |
1250 EXPECT_EQ(1, root_layer->NumDescendantsThatDrawContent()); | 1254 EXPECT_EQ(1, root_layer->NumDescendantsThatDrawContent()); |
1251 } | 1255 } |
1252 | 1256 |
1253 } // namespace | 1257 } // namespace |
1254 } // namespace cc | 1258 } // namespace cc |
OLD | NEW |