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

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

Issue 510793003: Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 11 matching lines...) Expand all
22 #include "content/browser/compositor/owned_mailbox.h" 22 #include "content/browser/compositor/owned_mailbox.h"
23 #include "content/browser/renderer_host/render_widget_host_view_base.h" 23 #include "content/browser/renderer_host/render_widget_host_view_base.h"
24 #include "content/common/content_export.h" 24 #include "content/common/content_export.h"
25 #include "content/common/cursors/webcursor.h" 25 #include "content/common/cursors/webcursor.h"
26 #include "third_party/skia/include/core/SkRegion.h" 26 #include "third_party/skia/include/core/SkRegion.h"
27 #include "ui/aura/client/cursor_client_observer.h" 27 #include "ui/aura/client/cursor_client_observer.h"
28 #include "ui/aura/client/focus_change_observer.h" 28 #include "ui/aura/client/focus_change_observer.h"
29 #include "ui/aura/window_delegate.h" 29 #include "ui/aura/window_delegate.h"
30 #include "ui/aura/window_tree_host_observer.h" 30 #include "ui/aura/window_tree_host_observer.h"
31 #include "ui/base/ime/text_input_client.h" 31 #include "ui/base/ime/text_input_client.h"
32 #include "ui/events/gestures/motion_event_aura.h"
32 #include "ui/gfx/display_observer.h" 33 #include "ui/gfx/display_observer.h"
33 #include "ui/gfx/insets.h" 34 #include "ui/gfx/insets.h"
34 #include "ui/gfx/rect.h" 35 #include "ui/gfx/rect.h"
35 #include "ui/wm/public/activation_change_observer.h" 36 #include "ui/wm/public/activation_change_observer.h"
36 #include "ui/wm/public/activation_delegate.h" 37 #include "ui/wm/public/activation_delegate.h"
37 38
38 struct ViewHostMsg_TextInputState_Params; 39 struct ViewHostMsg_TextInputState_Params;
39 40
40 namespace aura { 41 namespace aura {
41 class WindowTracker; 42 class WindowTracker;
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 bool is_loading_; 497 bool is_loading_;
497 498
498 // The cursor for the page. This is passed up from the renderer. 499 // The cursor for the page. This is passed up from the renderer.
499 WebCursor current_cursor_; 500 WebCursor current_cursor_;
500 501
501 // The touch-event. Its touch-points are updated as necessary. A new 502 // The touch-event. Its touch-points are updated as necessary. A new
502 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is 503 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is
503 // removed from the list on an ET_TOUCH_RELEASED event. 504 // removed from the list on an ET_TOUCH_RELEASED event.
504 blink::WebTouchEvent touch_event_; 505 blink::WebTouchEvent touch_event_;
505 506
507 // Used to produce |touch_event_|.
508 ui::MotionEventAura pointer_state_;
509
506 // The current text input type. 510 // The current text input type.
507 ui::TextInputType text_input_type_; 511 ui::TextInputType text_input_type_;
508 // The current text input mode corresponding to HTML5 inputmode attribute. 512 // The current text input mode corresponding to HTML5 inputmode attribute.
509 ui::TextInputMode text_input_mode_; 513 ui::TextInputMode text_input_mode_;
510 bool can_compose_inline_; 514 bool can_compose_inline_;
511 515
512 // Rectangles for the selection anchor and focus. 516 // Rectangles for the selection anchor and focus.
513 gfx::Rect selection_anchor_rect_; 517 gfx::Rect selection_anchor_rect_;
514 gfx::Rect selection_focus_rect_; 518 gfx::Rect selection_focus_rect_;
515 519
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; 606 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
603 607
604 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 608 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
605 609
606 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 610 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
607 }; 611 };
608 612
609 } // namespace content 613 } // namespace content
610 614
611 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 615 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698