Source/WebKit/chromium/src/WebViewImpl.cpp - Issue 12233004: Merge 141540

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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 »