| 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 | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
|  36  |  36  | 
|  37 bool Editor::handleEditingKeyboardEvent(KeyboardEvent* evt) { |  37 bool Editor::handleEditingKeyboardEvent(KeyboardEvent* evt) { | 
|  38   const WebKeyboardEvent* keyEvent = evt->keyEvent(); |  38   const WebKeyboardEvent* keyEvent = evt->keyEvent(); | 
|  39   // do not treat this as text input if it's a system key event |  39   // do not treat this as text input if it's a system key event | 
|  40   if (!keyEvent || keyEvent->isSystemKey) |  40   if (!keyEvent || keyEvent->isSystemKey) | 
|  41     return false; |  41     return false; | 
|  42  |  42  | 
|  43   String commandName = behavior().interpretKeyEvent(*evt); |  43   String commandName = behavior().interpretKeyEvent(*evt); | 
|  44   Command command = this->createCommand(commandName); |  44   Command command = this->createCommand(commandName); | 
|  45  |  45  | 
|  46   if (keyEvent->type == WebInputEvent::RawKeyDown) { |  46   if (keyEvent->type() == WebInputEvent::RawKeyDown) { | 
|  47     // WebKit doesn't have enough information about mode to decide how |  47     // WebKit doesn't have enough information about mode to decide how | 
|  48     // commands that just insert text if executed via Editor should be treated, |  48     // commands that just insert text if executed via Editor should be treated, | 
|  49     // so we leave it upon WebCore to either handle them immediately |  49     // so we leave it upon WebCore to either handle them immediately | 
|  50     // (e.g. Tab that changes focus) or let a keypress event be generated |  50     // (e.g. Tab that changes focus) or let a keypress event be generated | 
|  51     // (e.g. Tab that inserts a Tab character, or Enter). |  51     // (e.g. Tab that inserts a Tab character, or Enter). | 
|  52     if (command.isTextInsertion() || commandName.isEmpty()) |  52     if (command.isTextInsertion() || commandName.isEmpty()) | 
|  53       return false; |  53       return false; | 
|  54     return command.execute(evt); |  54     return command.execute(evt); | 
|  55   } |  55   } | 
|  56  |  56  | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
|  80   return insertText(keyEvent->text, evt); |  80   return insertText(keyEvent->text, evt); | 
|  81 } |  81 } | 
|  82  |  82  | 
|  83 void Editor::handleKeyboardEvent(KeyboardEvent* evt) { |  83 void Editor::handleKeyboardEvent(KeyboardEvent* evt) { | 
|  84   // Give the embedder a chance to handle the keyboard event. |  84   // Give the embedder a chance to handle the keyboard event. | 
|  85   if (client().handleKeyboardEvent(m_frame) || handleEditingKeyboardEvent(evt)) |  85   if (client().handleKeyboardEvent(m_frame) || handleEditingKeyboardEvent(evt)) | 
|  86     evt->setDefaultHandled(); |  86     evt->setDefaultHandled(); | 
|  87 } |  87 } | 
|  88  |  88  | 
|  89 }  // namespace blink |  89 }  // namespace blink | 
| OLD | NEW |