OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/client/core/compositor/blimp_compositor_manager.h" | 5 #include "blimp/client/core/compositor/blimp_compositor_manager.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h" | 8 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h" |
9 #include "blimp/client/core/compositor/blob_image_serialization_processor.h" | 9 #include "blimp/client/core/compositor/blob_image_serialization_processor.h" |
10 #include "blimp/client/support/compositor/mock_compositor_dependencies.h" | 10 #include "blimp/client/support/compositor/mock_compositor_dependencies.h" |
11 #include "cc/proto/compositor_message.pb.h" | 11 #include "cc/proto/compositor_message.pb.h" |
12 #include "cc/surfaces/surface_manager.h" | 12 #include "cc/surfaces/surface_manager.h" |
13 #include "testing/gmock/include/gmock/gmock.h" | 13 #include "testing/gmock/include/gmock/gmock.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
15 #include "ui/events/gesture_detection/motion_event_generic.h" | 15 #include "ui/events/gesture_detection/motion_event_generic.h" |
16 | 16 |
17 using testing::_; | 17 using testing::_; |
18 using testing::InSequence; | 18 using testing::InSequence; |
19 using testing::Sequence; | 19 using testing::Sequence; |
20 | 20 |
21 namespace blimp { | 21 namespace blimp { |
22 namespace client { | 22 namespace client { |
23 namespace { | 23 namespace { |
24 | 24 |
| 25 const int kDummyBlimpContentsId = 0; |
| 26 |
25 class MockRenderWidgetFeature : public RenderWidgetFeature { | 27 class MockRenderWidgetFeature : public RenderWidgetFeature { |
26 public: | 28 public: |
27 MOCK_METHOD3(SendCompositorMessage, | 29 MOCK_METHOD3(SendCompositorMessage, |
28 void(const int, const int, const cc::proto::CompositorMessage&)); | 30 void(const int, const int, const cc::proto::CompositorMessage&)); |
29 MOCK_METHOD3(SendInputEvent, | 31 MOCK_METHOD3(SendInputEvent, |
30 void(const int, const int, const blink::WebInputEvent&)); | 32 void(const int, const int, const blink::WebInputEvent&)); |
31 MOCK_METHOD2(SetDelegate, void(int, RenderWidgetFeatureDelegate*)); | 33 MOCK_METHOD2(SetDelegate, void(int, RenderWidgetFeatureDelegate*)); |
32 MOCK_METHOD1(RemoveDelegate, void(const int)); | 34 MOCK_METHOD1(RemoveDelegate, void(const int)); |
33 }; | 35 }; |
34 | 36 |
(...skipping 12 matching lines...) Expand all Loading... |
47 std::unique_ptr<cc::proto::CompositorMessage> message) override { | 49 std::unique_ptr<cc::proto::CompositorMessage> message) override { |
48 MockableOnCompositorMessageReceived(*message); | 50 MockableOnCompositorMessageReceived(*message); |
49 } | 51 } |
50 MOCK_METHOD1(MockableOnCompositorMessageReceived, | 52 MOCK_METHOD1(MockableOnCompositorMessageReceived, |
51 void(const cc::proto::CompositorMessage&)); | 53 void(const cc::proto::CompositorMessage&)); |
52 }; | 54 }; |
53 | 55 |
54 class BlimpCompositorManagerForTesting : public BlimpCompositorManager { | 56 class BlimpCompositorManagerForTesting : public BlimpCompositorManager { |
55 public: | 57 public: |
56 explicit BlimpCompositorManagerForTesting( | 58 explicit BlimpCompositorManagerForTesting( |
| 59 int blimp_contents_id, |
57 RenderWidgetFeature* render_widget_feature, | 60 RenderWidgetFeature* render_widget_feature, |
58 BlimpCompositorDependencies* compositor_dependencies) | 61 BlimpCompositorDependencies* compositor_dependencies) |
59 : BlimpCompositorManager(render_widget_feature, compositor_dependencies) { | 62 : BlimpCompositorManager(blimp_contents_id, |
60 } | 63 render_widget_feature, |
| 64 compositor_dependencies) {} |
61 | 65 |
62 using BlimpCompositorManager::GetCompositor; | 66 using BlimpCompositorManager::GetCompositor; |
63 | 67 |
64 std::unique_ptr<BlimpCompositor> CreateBlimpCompositor( | 68 std::unique_ptr<BlimpCompositor> CreateBlimpCompositor( |
65 int render_widget_id, | 69 int render_widget_id, |
66 BlimpCompositorDependencies* compositor_dependencies, | 70 BlimpCompositorDependencies* compositor_dependencies, |
67 BlimpCompositorClient* client) override { | 71 BlimpCompositorClient* client) override { |
68 return base::MakeUnique<MockBlimpCompositor>( | 72 return base::MakeUnique<MockBlimpCompositor>( |
69 render_widget_id, compositor_dependencies, client); | 73 render_widget_id, compositor_dependencies, client); |
70 } | 74 } |
71 }; | 75 }; |
72 | 76 |
73 class BlimpCompositorManagerTest : public testing::Test { | 77 class BlimpCompositorManagerTest : public testing::Test { |
74 public: | 78 public: |
75 void SetUp() override { | 79 void SetUp() override { |
76 EXPECT_CALL(render_widget_feature_, SetDelegate(_, _)).Times(1); | 80 EXPECT_CALL(render_widget_feature_, SetDelegate(_, _)).Times(1); |
77 EXPECT_CALL(render_widget_feature_, RemoveDelegate(_)).Times(1); | 81 EXPECT_CALL(render_widget_feature_, RemoveDelegate(_)).Times(1); |
78 | 82 |
79 compositor_dependencies_ = base::MakeUnique<BlimpCompositorDependencies>( | 83 compositor_dependencies_ = base::MakeUnique<BlimpCompositorDependencies>( |
80 base::MakeUnique<MockCompositorDependencies>()); | 84 base::MakeUnique<MockCompositorDependencies>()); |
81 | 85 |
82 compositor_manager_ = base::MakeUnique<BlimpCompositorManagerForTesting>( | 86 compositor_manager_ = base::MakeUnique<BlimpCompositorManagerForTesting>( |
83 &render_widget_feature_, compositor_dependencies_.get()); | 87 kDummyBlimpContentsId, &render_widget_feature_, |
| 88 compositor_dependencies_.get()); |
84 } | 89 } |
85 | 90 |
86 void TearDown() override { | 91 void TearDown() override { |
87 mock_compositor1_ = nullptr; | 92 mock_compositor1_ = nullptr; |
88 mock_compositor2_ = nullptr; | 93 mock_compositor2_ = nullptr; |
89 compositor_manager_.reset(); | 94 compositor_manager_.reset(); |
90 compositor_dependencies_.reset(); | 95 compositor_dependencies_.reset(); |
91 } | 96 } |
92 | 97 |
93 void SetUpCompositors() { | 98 void SetUpCompositors() { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 // events forwarded after this. | 182 // events forwarded after this. |
178 delegate()->OnRenderWidgetDeleted(1); | 183 delegate()->OnRenderWidgetDeleted(1); |
179 delegate()->OnRenderWidgetDeleted(2); | 184 delegate()->OnRenderWidgetDeleted(2); |
180 | 185 |
181 compositor_manager_->SetVisible(true); | 186 compositor_manager_->SetVisible(true); |
182 } | 187 } |
183 | 188 |
184 } // namespace | 189 } // namespace |
185 } // namespace client | 190 } // namespace client |
186 } // namespace blimp | 191 } // namespace blimp |
OLD | NEW |