| 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" |
| 11 #include "core/editing/EphemeralRange.h" | 11 #include "core/editing/EphemeralRange.h" |
| 12 #include "core/editing/FrameSelection.h" | 12 #include "core/editing/FrameSelection.h" |
| 13 #include "core/editing/InputMethodController.h" | 13 #include "core/editing/InputMethodController.h" |
| 14 #include "core/editing/PlainTextRange.h" | 14 #include "core/editing/PlainTextRange.h" |
| 15 #include "core/frame/LocalFrame.h" | 15 #include "core/frame/LocalFrame.h" |
| 16 #include "core/page/FocusController.h" | 16 #include "core/page/FocusController.h" |
| 17 #include "core/page/Page.h" | 17 #include "core/page/Page.h" |
| 18 #include "platform/UserGestureIndicator.h" | 18 #include "platform/UserGestureIndicator.h" |
| 19 #include "public/platform/WebString.h" | 19 #include "public/platform/WebString.h" |
| 20 #include "public/web/WebPlugin.h" | 20 #include "public/web/WebPlugin.h" |
| 21 #include "public/web/WebRange.h" | 21 #include "public/web/WebRange.h" |
| 22 #include "web/CompositionUnderlineVectorBuilder.h" | 22 #include "web/CompositionUnderlineVectorBuilder.h" |
| 23 #include "web/WebLocalFrameImpl.h" | 23 #include "web/WebLocalFrameImpl.h" |
| 24 #include "web/WebPluginContainerImpl.h" | 24 #include "web/WebPluginContainerImpl.h" |
| 25 | 25 |
| 26 namespace blink { | 26 namespace blink { |
| 27 | 27 |
| 28 WebInputMethodControllerImpl::WebInputMethodControllerImpl( | 28 WebInputMethodControllerImpl::WebInputMethodControllerImpl( |
| 29 WebLocalFrameImpl* web_local_frame) | 29 WebLocalFrameImpl* web_local_frame) |
| 30 : web_local_frame_(web_local_frame), suppress_next_keypress_event_(false) {} | 30 : web_local_frame_(web_local_frame) {} |
| 31 | 31 |
| 32 WebInputMethodControllerImpl::~WebInputMethodControllerImpl() {} | 32 WebInputMethodControllerImpl::~WebInputMethodControllerImpl() {} |
| 33 | 33 |
| 34 // static | 34 // static |
| 35 WebInputMethodControllerImpl* WebInputMethodControllerImpl::FromFrame( | 35 WebInputMethodControllerImpl* WebInputMethodControllerImpl::FromFrame( |
| 36 LocalFrame* frame) { | 36 LocalFrame* frame) { |
| 37 WebLocalFrameImpl* web_local_frame_impl = WebLocalFrameImpl::FromFrame(frame); | 37 WebLocalFrameImpl* web_local_frame_impl = WebLocalFrameImpl::FromFrame(frame); |
| 38 return web_local_frame_impl ? web_local_frame_impl->GetInputMethodController() | 38 return web_local_frame_impl ? web_local_frame_impl->GetInputMethodController() |
| 39 : nullptr; | 39 : nullptr; |
| 40 } | 40 } |
| (...skipping 29 matching lines...) Expand all Loading... |
| 70 // node, which doesn't exist any longer. | 70 // node, which doesn't exist any longer. |
| 71 const EphemeralRange range = | 71 const EphemeralRange range = |
| 72 GetInputMethodController().CompositionEphemeralRange(); | 72 GetInputMethodController().CompositionEphemeralRange(); |
| 73 if (range.IsNotNull()) { | 73 if (range.IsNotNull()) { |
| 74 Node* node = range.StartPosition().ComputeContainerNode(); | 74 Node* node = range.StartPosition().ComputeContainerNode(); |
| 75 GetFrame()->GetDocument()->UpdateStyleAndLayoutTree(); | 75 GetFrame()->GetDocument()->UpdateStyleAndLayoutTree(); |
| 76 if (!node || !HasEditableStyle(*node)) | 76 if (!node || !HasEditableStyle(*node)) |
| 77 return false; | 77 return false; |
| 78 } | 78 } |
| 79 | 79 |
| 80 // A keypress event is canceled. If an ongoing composition exists, then the | |
| 81 // keydown event should have arisen from a handled key (e.g., backspace). | |
| 82 // In this case we ignore the cancellation and continue; otherwise (no | |
| 83 // ongoing composition) we exit and signal success only for attempts to | |
| 84 // clear the composition. | |
| 85 if (suppress_next_keypress_event_ && | |
| 86 !GetInputMethodController().HasComposition()) | |
| 87 return text.IsEmpty(); | |
| 88 | |
| 89 UserGestureIndicator gesture_indicator(DocumentUserGestureToken::Create( | 80 UserGestureIndicator gesture_indicator(DocumentUserGestureToken::Create( |
| 90 GetFrame()->GetDocument(), UserGestureToken::kNewGesture)); | 81 GetFrame()->GetDocument(), UserGestureToken::kNewGesture)); |
| 91 | 82 |
| 92 // When the range of composition underlines overlap with the range between | 83 // When the range of composition underlines overlap with the range between |
| 93 // selectionStart and selectionEnd, WebKit somehow won't paint the selection | 84 // selectionStart and selectionEnd, WebKit somehow won't paint the selection |
| 94 // at all (see InlineTextBox::paint() function in InlineTextBox.cpp). | 85 // at all (see InlineTextBox::paint() function in InlineTextBox.cpp). |
| 95 // But the selection range actually takes effect. | 86 // But the selection range actually takes effect. |
| 96 GetInputMethodController().SetComposition( | 87 GetInputMethodController().SetComposition( |
| 97 String(text), CompositionUnderlineVectorBuilder(underlines), | 88 String(text), CompositionUnderlineVectorBuilder(underlines), |
| 98 selection_start, selection_end); | 89 selection_start, selection_end); |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 WebPlugin* WebInputMethodControllerImpl::FocusedPluginIfInputMethodSupported() | 159 WebPlugin* WebInputMethodControllerImpl::FocusedPluginIfInputMethodSupported() |
| 169 const { | 160 const { |
| 170 WebPluginContainerImpl* container = | 161 WebPluginContainerImpl* container = |
| 171 WebLocalFrameImpl::CurrentPluginContainer(GetFrame()); | 162 WebLocalFrameImpl::CurrentPluginContainer(GetFrame()); |
| 172 if (container && container->SupportsInputMethod()) | 163 if (container && container->SupportsInputMethod()) |
| 173 return container->Plugin(); | 164 return container->Plugin(); |
| 174 return nullptr; | 165 return nullptr; |
| 175 } | 166 } |
| 176 | 167 |
| 177 } // namespace blink | 168 } // namespace blink |
| OLD | NEW |