| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 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 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1073 } | 1073 } |
| 1074 | 1074 |
| 1075 document().updateStyleAndLayoutTree(); | 1075 document().updateStyleAndLayoutTree(); |
| 1076 if (hasEditableStyle(*element)) | 1076 if (hasEditableStyle(*element)) |
| 1077 return WebTextInputTypeContentEditable; | 1077 return WebTextInputTypeContentEditable; |
| 1078 | 1078 |
| 1079 return WebTextInputTypeNone; | 1079 return WebTextInputTypeNone; |
| 1080 } | 1080 } |
| 1081 | 1081 |
| 1082 void InputMethodController::willChangeFocus() { | 1082 void InputMethodController::willChangeFocus() { |
| 1083 finishComposingText(KeepSelection); | 1083 if (!finishComposingText(KeepSelection)) |
| 1084 return; |
| 1085 frame().chromeClient().resetInputMethod(); |
| 1084 } | 1086 } |
| 1085 | 1087 |
| 1086 DEFINE_TRACE(InputMethodController) { | 1088 DEFINE_TRACE(InputMethodController) { |
| 1087 visitor->trace(m_frame); | 1089 visitor->trace(m_frame); |
| 1088 visitor->trace(m_compositionRange); | 1090 visitor->trace(m_compositionRange); |
| 1089 SynchronousMutationObserver::trace(visitor); | 1091 SynchronousMutationObserver::trace(visitor); |
| 1090 } | 1092 } |
| 1091 | 1093 |
| 1092 } // namespace blink | 1094 } // namespace blink |
| OLD | NEW |