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

Unified Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 12233004: Merge 141540 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebViewImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 142009)
+++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy)
@@ -2430,6 +2430,8 @@
String text = editor->selectedText();
focused->document()->execCommand("delete", true);
editor->setComposition(text, CompositionUnderlineVectorBuilder(underlines), 0, 0);
+ // Need to set setIgnoreCompositionSelectionChange(true) again because setComposition resets it to false.
+ editor->setIgnoreCompositionSelectionChange(true);
editor->setSelectionOffsets(location, location + length);
editor->setIgnoreCompositionSelectionChange(false);
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698