| OLD | NEW |
| 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 <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 // The cursor for the page. This is passed up from the renderer. | 558 // The cursor for the page. This is passed up from the renderer. |
| 559 WebCursor current_cursor_; | 559 WebCursor current_cursor_; |
| 560 | 560 |
| 561 // The touch-event. Its touch-points are updated as necessary. A new | 561 // The touch-event. Its touch-points are updated as necessary. A new |
| 562 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is | 562 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is |
| 563 // removed from the list on an ET_TOUCH_RELEASED event. | 563 // removed from the list on an ET_TOUCH_RELEASED event. |
| 564 WebKit::WebTouchEvent touch_event_; | 564 WebKit::WebTouchEvent touch_event_; |
| 565 | 565 |
| 566 // The current text input type. | 566 // The current text input type. |
| 567 ui::TextInputType text_input_type_; | 567 ui::TextInputType text_input_type_; |
| 568 // The current text input mode corresponding to HTML5 inputmode attribute. |
| 569 ui::TextInputMode text_input_mode_; |
| 568 bool can_compose_inline_; | 570 bool can_compose_inline_; |
| 569 | 571 |
| 570 // Rectangles for the selection anchor and focus. | 572 // Rectangles for the selection anchor and focus. |
| 571 gfx::Rect selection_anchor_rect_; | 573 gfx::Rect selection_anchor_rect_; |
| 572 gfx::Rect selection_focus_rect_; | 574 gfx::Rect selection_focus_rect_; |
| 573 | 575 |
| 574 // The current composition character bounds. | 576 // The current composition character bounds. |
| 575 std::vector<gfx::Rect> composition_character_bounds_; | 577 std::vector<gfx::Rect> composition_character_bounds_; |
| 576 | 578 |
| 577 // Indicates if there is onging composition text. | 579 // Indicates if there is onging composition text. |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 699 TouchEditingClient* touch_editing_client_; | 701 TouchEditingClient* touch_editing_client_; |
| 700 | 702 |
| 701 ui::LatencyInfo software_latency_info_; | 703 ui::LatencyInfo software_latency_info_; |
| 702 | 704 |
| 703 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 705 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 704 }; | 706 }; |
| 705 | 707 |
| 706 } // namespace content | 708 } // namespace content |
| 707 | 709 |
| 708 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 710 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |