Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Side by Side Diff: third_party/WebKit/Source/core/editing/InputMethodController.cpp

Issue 2561543003: Move call path for resetInputMethod (Closed)
Patch Set: rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 return WebTextInputTypeDateTimeField; 1186 return WebTextInputTypeDateTimeField;
1187 } 1187 }
1188 1188
1189 document().updateStyleAndLayoutTree(); 1189 document().updateStyleAndLayoutTree();
1190 if (hasEditableStyle(*element)) 1190 if (hasEditableStyle(*element))
1191 return WebTextInputTypeContentEditable; 1191 return WebTextInputTypeContentEditable;
1192 1192
1193 return WebTextInputTypeNone; 1193 return WebTextInputTypeNone;
1194 } 1194 }
1195 1195
1196 void InputMethodController::willChangeFocus() {
1197 if (!finishComposingText(DoNotKeepSelection))
1198 return;
1199 frame().chromeClient().resetInputMethod();
1200 }
1201
1196 DEFINE_TRACE(InputMethodController) { 1202 DEFINE_TRACE(InputMethodController) {
1197 visitor->trace(m_frame); 1203 visitor->trace(m_frame);
1198 visitor->trace(m_compositionRange); 1204 visitor->trace(m_compositionRange);
1199 SynchronousMutationObserver::trace(visitor); 1205 SynchronousMutationObserver::trace(visitor);
1200 } 1206 }
1201 1207
1202 } // namespace blink 1208 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/editing/InputMethodController.h ('k') | third_party/WebKit/Source/core/page/ChromeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698