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 #ifndef CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ | 5 #ifndef CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ |
6 #define CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ | 6 #define CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/threading/thread_checker.h" | 9 #include "base/threading/thread_checker.h" |
10 #include "cc/output/output_surface.h" | 10 #include "cc/output/output_surface.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 // RenderWidgetInputHandlerDelegate implementation: | 40 // RenderWidgetInputHandlerDelegate implementation: |
41 void FocusChangeComplete() override; | 41 void FocusChangeComplete() override; |
42 bool HasTouchEventHandlersAt(const gfx::Point& point) const override; | 42 bool HasTouchEventHandlersAt(const gfx::Point& point) const override; |
43 void ObserveWheelEventAndResult(const blink::WebMouseWheelEvent& wheel_event, | 43 void ObserveWheelEventAndResult(const blink::WebMouseWheelEvent& wheel_event, |
44 const gfx::Vector2dF& wheel_unused_delta, | 44 const gfx::Vector2dF& wheel_unused_delta, |
45 bool event_processed) override; | 45 bool event_processed) override; |
46 void OnDidHandleKeyEvent() override; | 46 void OnDidHandleKeyEvent() override; |
47 void OnDidOverscroll(const DidOverscrollParams& params) override; | 47 void OnDidOverscroll(const DidOverscrollParams& params) override; |
48 void OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) override; | 48 void OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) override; |
| 49 void NonBlockingInputEventHandled( |
| 50 blink::WebInputEvent::Type handled_type) override; |
49 void SetInputHandler(RenderWidgetInputHandler* input_handler) override; | 51 void SetInputHandler(RenderWidgetInputHandler* input_handler) override; |
50 void UpdateTextInputState(ShowIme show_ime, | 52 void UpdateTextInputState(ShowIme show_ime, |
51 ChangeSource change_source) override; | 53 ChangeSource change_source) override; |
52 bool WillHandleGestureEvent(const blink::WebGestureEvent& event) override; | 54 bool WillHandleGestureEvent(const blink::WebGestureEvent& event) override; |
53 bool WillHandleMouseEvent(const blink::WebMouseEvent& event) override; | 55 bool WillHandleMouseEvent(const blink::WebMouseEvent& event) override; |
54 | 56 |
55 void OnConnectionLost(); | 57 void OnConnectionLost(); |
56 void OnWindowInputEvent(scoped_ptr<blink::WebInputEvent> input_event, | 58 void OnWindowInputEvent(scoped_ptr<blink::WebInputEvent> input_event, |
57 const base::Closure& ack); | 59 const base::Closure& ack); |
58 | 60 |
59 const int routing_id_; | 61 const int routing_id_; |
60 RenderWidgetInputHandler* input_handler_; | 62 RenderWidgetInputHandler* input_handler_; |
61 scoped_ptr<mus::WindowSurfaceBinding> window_surface_binding_; | 63 scoped_ptr<mus::WindowSurfaceBinding> window_surface_binding_; |
62 scoped_refptr<CompositorMusConnection> compositor_mus_connection_; | 64 scoped_refptr<CompositorMusConnection> compositor_mus_connection_; |
63 | 65 |
64 base::Closure pending_ack_; | 66 base::Closure pending_ack_; |
65 | 67 |
66 // Used to verify single threaded access. | 68 // Used to verify single threaded access. |
67 base::ThreadChecker thread_checker_; | 69 base::ThreadChecker thread_checker_; |
68 | 70 |
69 DISALLOW_COPY_AND_ASSIGN(RenderWidgetMusConnection); | 71 DISALLOW_COPY_AND_ASSIGN(RenderWidgetMusConnection); |
70 }; | 72 }; |
71 | 73 |
72 } // namespace content | 74 } // namespace content |
73 | 75 |
74 #endif // CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ | 76 #endif // CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ |
OLD | NEW |