| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "web/WebInputMethodControllerImpl.h" | 5 #include "web/WebInputMethodControllerImpl.h" |
| 6 | 6 |
| 7 #include "core/InputTypeNames.h" | 7 #include "core/InputTypeNames.h" |
| 8 #include "core/dom/DocumentUserGestureToken.h" | 8 #include "core/dom/DocumentUserGestureToken.h" |
| 9 #include "core/editing/EditingUtilities.h" | 9 #include "core/editing/EditingUtilities.h" |
| 10 #include "core/editing/Editor.h" | 10 #include "core/editing/Editor.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets | 140 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets |
| 141 // needs to be audited. See http://crbug.com/590369 for more details. | 141 // needs to be audited. See http://crbug.com/590369 for more details. |
| 142 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); | 142 frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
| 143 | 143 |
| 144 return inputMethodController().commitText( | 144 return inputMethodController().commitText( |
| 145 text, CompositionUnderlineVectorBuilder(underlines), | 145 text, CompositionUnderlineVectorBuilder(underlines), |
| 146 relativeCaretPosition); | 146 relativeCaretPosition); |
| 147 } | 147 } |
| 148 | 148 |
| 149 WebTextInputInfo WebInputMethodControllerImpl::textInputInfo() { | 149 WebTextInputInfo WebInputMethodControllerImpl::textInputInfo() { |
| 150 return frame()->inputMethodController().textInputInfo(); | 150 return inputMethodController().textInputInfo(); |
| 151 } | 151 } |
| 152 | 152 |
| 153 WebTextInputType WebInputMethodControllerImpl::textInputType() { | 153 WebTextInputType WebInputMethodControllerImpl::textInputType() { |
| 154 return frame()->inputMethodController().textInputType(); | 154 return inputMethodController().textInputType(); |
| 155 } | 155 } |
| 156 | 156 |
| 157 LocalFrame* WebInputMethodControllerImpl::frame() const { | 157 LocalFrame* WebInputMethodControllerImpl::frame() const { |
| 158 return m_webLocalFrame->frame(); | 158 return m_webLocalFrame->frame(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 InputMethodController& WebInputMethodControllerImpl::inputMethodController() | 161 InputMethodController& WebInputMethodControllerImpl::inputMethodController() |
| 162 const { | 162 const { |
| 163 return frame()->inputMethodController(); | 163 return frame()->inputMethodController(); |
| 164 } | 164 } |
| 165 | 165 |
| 166 WebPlugin* WebInputMethodControllerImpl::focusedPluginIfInputMethodSupported() | 166 WebPlugin* WebInputMethodControllerImpl::focusedPluginIfInputMethodSupported() |
| 167 const { | 167 const { |
| 168 WebPluginContainerImpl* container = | 168 WebPluginContainerImpl* container = |
| 169 WebLocalFrameImpl::currentPluginContainer(frame()); | 169 WebLocalFrameImpl::currentPluginContainer(frame()); |
| 170 if (container && container->supportsInputMethod()) | 170 if (container && container->supportsInputMethod()) |
| 171 return container->plugin(); | 171 return container->plugin(); |
| 172 return nullptr; | 172 return nullptr; |
| 173 } | 173 } |
| 174 | 174 |
| 175 } // namespace blink | 175 } // namespace blink |
| OLD | NEW |