Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 2054193002: Android mouse events shouldn't appear as TouchEvents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed a test, etc. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 14 matching lines...) Expand all
25 #include "content/browser/renderer_host/delegated_frame_evictor.h" 25 #include "content/browser/renderer_host/delegated_frame_evictor.h"
26 #include "content/browser/renderer_host/ime_adapter_android.h" 26 #include "content/browser/renderer_host/ime_adapter_android.h"
27 #include "content/browser/renderer_host/input/stylus_text_selector.h" 27 #include "content/browser/renderer_host/input/stylus_text_selector.h"
28 #include "content/browser/renderer_host/render_widget_host_view_base.h" 28 #include "content/browser/renderer_host/render_widget_host_view_base.h"
29 #include "content/common/content_export.h" 29 #include "content/common/content_export.h"
30 #include "content/public/browser/readback_types.h" 30 #include "content/public/browser/readback_types.h"
31 #include "gpu/command_buffer/common/mailbox.h" 31 #include "gpu/command_buffer/common/mailbox.h"
32 #include "third_party/skia/include/core/SkColor.h" 32 #include "third_party/skia/include/core/SkColor.h"
33 #include "ui/android/view_android.h" 33 #include "ui/android/view_android.h"
34 #include "ui/android/window_android_observer.h" 34 #include "ui/android/window_android_observer.h"
35 #include "ui/events/android/motion_event_android.h"
35 #include "ui/events/gesture_detection/filtered_gesture_provider.h" 36 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
36 #include "ui/gfx/geometry/size.h" 37 #include "ui/gfx/geometry/size.h"
37 #include "ui/gfx/geometry/vector2d_f.h" 38 #include "ui/gfx/geometry/vector2d_f.h"
38 #include "ui/gfx/selection_bound.h" 39 #include "ui/gfx/selection_bound.h"
39 #include "ui/touch_selection/touch_selection_controller.h" 40 #include "ui/touch_selection/touch_selection_controller.h"
40 41
41 class GURL; 42 class GURL;
42 43
43 namespace cc { 44 namespace cc {
44 class Layer; 45 class Layer;
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 void MoveRangeSelectionExtent(const gfx::PointF& extent) override; 198 void MoveRangeSelectionExtent(const gfx::PointF& extent) override;
198 void SelectBetweenCoordinates(const gfx::PointF& base, 199 void SelectBetweenCoordinates(const gfx::PointF& base,
199 const gfx::PointF& extent) override; 200 const gfx::PointF& extent) override;
200 void OnSelectionEvent(ui::SelectionEventType event) override; 201 void OnSelectionEvent(ui::SelectionEventType event) override;
201 std::unique_ptr<ui::TouchHandleDrawable> CreateDrawable() override; 202 std::unique_ptr<ui::TouchHandleDrawable> CreateDrawable() override;
202 203
203 // Non-virtual methods 204 // Non-virtual methods
204 void SetContentViewCore(ContentViewCoreImpl* content_view_core); 205 void SetContentViewCore(ContentViewCoreImpl* content_view_core);
205 SkColor GetCachedBackgroundColor() const; 206 SkColor GetCachedBackgroundColor() const;
206 void SendKeyEvent(const NativeWebKeyboardEvent& event); 207 void SendKeyEvent(const NativeWebKeyboardEvent& event);
207 void SendMouseEvent(const blink::WebMouseEvent& event); 208 void SendMouseEvent(const ui::MotionEventAndroid&, int changed_button);
208 void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event); 209 void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event);
209 void SendGestureEvent(const blink::WebGestureEvent& event); 210 void SendGestureEvent(const blink::WebGestureEvent& event);
210 211
211 void OnStartContentIntent(const GURL& content_url, bool is_main_frame); 212 void OnStartContentIntent(const GURL& content_url, bool is_main_frame);
212 void OnSmartClipDataExtracted(const base::string16& text, 213 void OnSmartClipDataExtracted(const base::string16& text,
213 const base::string16& html, 214 const base::string16& html,
214 const gfx::Rect rect); 215 const gfx::Rect rect);
215 216
216 bool OnTouchEvent(const ui::MotionEvent& event); 217 bool OnTouchEvent(const ui::MotionEvent& event);
217 bool OnTouchHandleEvent(const ui::MotionEvent& event); 218 bool OnTouchHandleEvent(const ui::MotionEvent& event);
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 gfx::Vector2dF last_scroll_offset_; 371 gfx::Vector2dF last_scroll_offset_;
371 372
372 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; 373 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
373 374
374 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 375 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
375 }; 376 };
376 377
377 } // namespace content 378 } // namespace content
378 379
379 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 380 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698