| 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 #include "content/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 973 can_compose_inline_ != new_can_compose_inline) | 973 can_compose_inline_ != new_can_compose_inline) |
| 974 #if defined(OS_ANDROID) | 974 #if defined(OS_ANDROID) |
| 975 || text_field_is_dirty_ | 975 || text_field_is_dirty_ |
| 976 #endif | 976 #endif |
| 977 ) { | 977 ) { |
| 978 TextInputState params; | 978 TextInputState params; |
| 979 params.type = WebKitToUiTextInputType(new_info.type); | 979 params.type = WebKitToUiTextInputType(new_info.type); |
| 980 params.mode = new_mode; | 980 params.mode = new_mode; |
| 981 params.flags = new_info.flags; | 981 params.flags = new_info.flags; |
| 982 params.value = new_info.value.utf8(); | 982 params.value = new_info.value.utf8(); |
| 983 params.placeholder = new_info.placeholder.utf8(); |
| 983 params.selection_start = new_info.selectionStart; | 984 params.selection_start = new_info.selectionStart; |
| 984 params.selection_end = new_info.selectionEnd; | 985 params.selection_end = new_info.selectionEnd; |
| 985 params.composition_start = new_info.compositionStart; | 986 params.composition_start = new_info.compositionStart; |
| 986 params.composition_end = new_info.compositionEnd; | 987 params.composition_end = new_info.compositionEnd; |
| 987 params.can_compose_inline = new_can_compose_inline; | 988 params.can_compose_inline = new_can_compose_inline; |
| 988 params.show_ime_if_needed = (show_ime == ShowIme::IF_NEEDED); | 989 params.show_ime_if_needed = (show_ime == ShowIme::IF_NEEDED); |
| 989 #if defined(USE_AURA) | 990 #if defined(USE_AURA) |
| 990 params.is_non_ime_change = true; | 991 params.is_non_ime_change = true; |
| 991 #endif | 992 #endif |
| 992 #if defined(OS_ANDROID) | 993 #if defined(OS_ANDROID) |
| (...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2166 bool RenderWidget::isPointerLocked() { | 2167 bool RenderWidget::isPointerLocked() { |
| 2167 return mouse_lock_dispatcher_->IsMouseLockedTo( | 2168 return mouse_lock_dispatcher_->IsMouseLockedTo( |
| 2168 webwidget_mouse_lock_target_.get()); | 2169 webwidget_mouse_lock_target_.get()); |
| 2169 } | 2170 } |
| 2170 | 2171 |
| 2171 blink::WebWidget* RenderWidget::GetWebWidget() const { | 2172 blink::WebWidget* RenderWidget::GetWebWidget() const { |
| 2172 return webwidget_internal_; | 2173 return webwidget_internal_; |
| 2173 } | 2174 } |
| 2174 | 2175 |
| 2175 } // namespace content | 2176 } // namespace content |
| OLD | NEW |