| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 11 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 12 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" |
| 13 #include "content/common/cursors/webcursor.h" | 13 #include "content/common/cursors/webcursor.h" |
| 14 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 14 #include "ui/events/event.h" | 15 #include "ui/events/event.h" |
| 15 #include "ui/events/gestures/gesture_recognizer.h" | 16 #include "ui/events/gestures/gesture_recognizer.h" |
| 16 #include "ui/events/gestures/gesture_types.h" | 17 #include "ui/events/gestures/gesture_types.h" |
| 17 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
| 18 #include "ui/gfx/geometry/vector2d_f.h" | 19 #include "ui/gfx/geometry/vector2d_f.h" |
| 19 #include "ui/gfx/native_widget_types.h" | 20 #include "ui/gfx/native_widget_types.h" |
| 20 | 21 |
| 21 struct ViewHostMsg_TextInputState_Params; | 22 struct ViewHostMsg_TextInputState_Params; |
| 22 | 23 |
| 23 namespace content { | 24 namespace content { |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 void LockCompositingSurface() override; | 129 void LockCompositingSurface() override; |
| 129 void UnlockCompositingSurface() override; | 130 void UnlockCompositingSurface() override; |
| 130 #endif // defined(OS_ANDROID) | 131 #endif // defined(OS_ANDROID) |
| 131 | 132 |
| 132 #if defined(OS_WIN) | 133 #if defined(OS_WIN) |
| 133 void SetParentNativeViewAccessible( | 134 void SetParentNativeViewAccessible( |
| 134 gfx::NativeViewAccessible accessible_parent) override; | 135 gfx::NativeViewAccessible accessible_parent) override; |
| 135 gfx::NativeViewId GetParentForWindowlessPlugin() const override; | 136 gfx::NativeViewId GetParentForWindowlessPlugin() const override; |
| 136 #endif | 137 #endif |
| 137 | 138 |
| 139 void WheelEventAck(const blink::WebMouseWheelEvent& event, |
| 140 InputEventAckState ack_result) override; |
| 141 |
| 142 void GestureEventAck(const blink::WebGestureEvent& event, |
| 143 InputEventAckState ack_result) override; |
| 144 |
| 138 // Overridden from ui::GestureEventHelper. | 145 // Overridden from ui::GestureEventHelper. |
| 139 bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override; | 146 bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override; |
| 140 void DispatchGestureEvent(ui::GestureEvent* event) override; | 147 void DispatchGestureEvent(ui::GestureEvent* event) override; |
| 141 void DispatchCancelTouchEvent(ui::TouchEvent* event) override; | 148 void DispatchCancelTouchEvent(ui::TouchEvent* event) override; |
| 142 | 149 |
| 143 protected: | 150 protected: |
| 144 friend class RenderWidgetHostView; | 151 friend class RenderWidgetHostView; |
| 145 | 152 |
| 146 private: | 153 private: |
| 147 // Destroys this view without calling |Destroy| on |platform_view_|. | 154 // Destroys this view without calling |Destroy| on |platform_view_|. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 170 base::WeakPtr<RenderWidgetHostViewBase> platform_view_; | 177 base::WeakPtr<RenderWidgetHostViewBase> platform_view_; |
| 171 #if defined(USE_AURA) | 178 #if defined(USE_AURA) |
| 172 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; | 179 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; |
| 173 #endif | 180 #endif |
| 174 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); | 181 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); |
| 175 }; | 182 }; |
| 176 | 183 |
| 177 } // namespace content | 184 } // namespace content |
| 178 | 185 |
| 179 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ | 186 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ |
| OLD | NEW |