Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007 Apple, Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007 Apple, Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Google, Inc. All rights reserved. | 3 * Copyright (C) 2012 Google, Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "core/editing/Editor.h" | 27 #include "core/editing/Editor.h" |
| 28 | 28 |
| 29 #include "core/events/InputEvent.h" | |
| 29 #include "core/events/KeyboardEvent.h" | 30 #include "core/events/KeyboardEvent.h" |
| 30 #include "core/frame/LocalFrame.h" | 31 #include "core/frame/LocalFrame.h" |
| 31 #include "core/page/EditorClient.h" | 32 #include "core/page/EditorClient.h" |
| 32 #include "platform/PlatformKeyboardEvent.h" | 33 #include "platform/PlatformKeyboardEvent.h" |
| 33 | 34 |
| 34 namespace blink { | 35 namespace blink { |
| 35 | 36 |
| 36 bool Editor::handleEditingKeyboardEvent(KeyboardEvent* evt) | 37 bool Editor::handleEditingKeyboardEvent(KeyboardEvent* evt) |
| 37 { | 38 { |
| 38 const PlatformKeyboardEvent* keyEvent = evt->keyEvent(); | 39 const PlatformKeyboardEvent* keyEvent = evt->keyEvent(); |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 53 return false; | 54 return false; |
| 54 return command.execute(evt); | 55 return command.execute(evt); |
| 55 } | 56 } |
| 56 | 57 |
| 57 if (command.execute(evt)) | 58 if (command.execute(evt)) |
| 58 return true; | 59 return true; |
| 59 | 60 |
| 60 if (!behavior().shouldInsertCharacter(*evt) || !canEdit()) | 61 if (!behavior().shouldInsertCharacter(*evt) || !canEdit()) |
| 61 return false; | 62 return false; |
| 62 | 63 |
| 64 if (RuntimeEnabledFeatures::inputEventEnabled()) { | |
| 65 if (EventTarget* target = evt->target()) { | |
| 66 RefPtrWillBeRawPtr<InputEvent> beforeInputEvent = InputEvent::create BeforeInput("insertText", evt->keyEvent()->text()); | |
|
chongz
2016/03/01 20:41:10
Will replace "insertText" with constant command na
dtapuska
2016/03/01 21:49:51
you can likely store the atomic string in a static
| |
| 67 DispatchEventResult dispatchResult = target->dispatchEvent(beforeInp utEvent); | |
| 68 if (dispatchResult != DispatchEventResult::NotCanceled) | |
| 69 return true; | |
|
dtapuska
2016/03/01 21:49:51
I'm not certain returning true here is correct. As
chongz
2016/03/04 19:46:50
To my understanding the return value here should b
| |
| 70 } | |
| 71 } | |
| 72 | |
| 63 return insertText(evt->keyEvent()->text(), evt); | 73 return insertText(evt->keyEvent()->text(), evt); |
| 64 } | 74 } |
| 65 | 75 |
| 66 void Editor::handleKeyboardEvent(KeyboardEvent* evt) | 76 void Editor::handleKeyboardEvent(KeyboardEvent* evt) |
| 67 { | 77 { |
| 68 // Give the embedder a chance to handle the keyboard event. | 78 // Give the embedder a chance to handle the keyboard event. |
| 69 if (client().handleKeyboardEvent() || handleEditingKeyboardEvent(evt)) | 79 if (client().handleKeyboardEvent() || handleEditingKeyboardEvent(evt)) |
| 70 evt->setDefaultHandled(); | 80 evt->setDefaultHandled(); |
| 71 } | 81 } |
| 72 | 82 |
| 73 } // namespace blink | 83 } // namespace blink |
| OLD | NEW |