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 "content/renderer/mus/compositor_mus_connection.h" | 5 #include "content/renderer/mus/compositor_mus_connection.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 ~TestInputHandlerManagerClient() override{}; | 122 ~TestInputHandlerManagerClient() override{}; |
123 | 123 |
124 // content::InputHandlerManagerClient: | 124 // content::InputHandlerManagerClient: |
125 void SetBoundHandler(const Handler& handler) override {} | 125 void SetBoundHandler(const Handler& handler) override {} |
126 void RegisterRoutingID(int routing_id) override {} | 126 void RegisterRoutingID(int routing_id) override {} |
127 void UnregisterRoutingID(int routing_id) override {} | 127 void UnregisterRoutingID(int routing_id) override {} |
128 void DidOverscroll(int routing_id, | 128 void DidOverscroll(int routing_id, |
129 const content::DidOverscrollParams& params) override {} | 129 const content::DidOverscrollParams& params) override {} |
130 void DidStartFlinging(int routing_id) override {} | 130 void DidStartFlinging(int routing_id) override {} |
131 void DidStopFlinging(int routing_id) override {} | 131 void DidStopFlinging(int routing_id) override {} |
132 void NotifyInputEventHandled(int routing_id, | 132 void NotifyInputEventHandled( |
133 blink::WebInputEvent::Type type) override {} | 133 int routing_id, |
| 134 blink::WebInputEvent::Type type, |
| 135 content::InputEventAckState ack_result) override {} |
134 | 136 |
135 private: | 137 private: |
136 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManagerClient); | 138 DISALLOW_COPY_AND_ASSIGN(TestInputHandlerManagerClient); |
137 }; | 139 }; |
138 | 140 |
139 // Implementation of RenderWidget for testing, performs no initialization. | 141 // Implementation of RenderWidget for testing, performs no initialization. |
140 class TestRenderWidget : public content::RenderWidget { | 142 class TestRenderWidget : public content::RenderWidget { |
141 public: | 143 public: |
142 explicit TestRenderWidget(content::CompositorDependencies* compositor_deps) | 144 explicit TestRenderWidget(content::CompositorDependencies* compositor_deps) |
143 : content::RenderWidget(compositor_deps, | 145 : content::RenderWidget(compositor_deps, |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 EXPECT_FALSE(ack_callback.get()); | 483 EXPECT_FALSE(ack_callback.get()); |
482 | 484 |
483 VerifyAndRunQueues(true, true); | 485 VerifyAndRunQueues(true, true); |
484 | 486 |
485 // The ack callback should have been called | 487 // The ack callback should have been called |
486 EXPECT_TRUE(test_callback->called()); | 488 EXPECT_TRUE(test_callback->called()); |
487 EXPECT_EQ(EventResult::HANDLED, test_callback->result()); | 489 EXPECT_EQ(EventResult::HANDLED, test_callback->result()); |
488 } | 490 } |
489 | 491 |
490 } // namespace content | 492 } // namespace content |
OLD | NEW |