diff options
| author | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 09:11:57 +0000 |
|---|---|---|
| committer | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 09:11:57 +0000 |
| commit | bb953fdae04e514c4f989e644256f9416e096b64 (patch) | |
| tree | 7a342994708efd705c9724b210feb7a91247062f /content/renderer | |
| parent | 1a771269be8885389b4269e14714759f0fcf8660 (diff) | |
| download | chromium_src-bb953fdae04e514c4f989e644256f9416e096b64.zip chromium_src-bb953fdae04e514c4f989e644256f9416e096b64.tar.gz chromium_src-bb953fdae04e514c4f989e644256f9416e096b64.tar.bz2 | |
Support IMM32 reconversion on Windows.
BUG=45605
TEST=Tested it with Google Japanese Input method on Win7
Review URL: http://codereview.chromium.org/8294026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 4 | ||||
| -rw-r--r-- | content/renderer/render_widget.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 6f5ba0b..79d2a40 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -1520,15 +1520,11 @@ bool RenderViewImpl::isSelectTrailingWhitespaceEnabled() { } void RenderViewImpl::didChangeSelection(bool is_empty_selection) { - // TODO(penghuang): Enable this on Window to support IME reconversion. - // http://crbug.com/100220 -#if defined(OS_POSIX) if (!handling_input_event_ && !handling_select_range_) return; handling_select_range_ = false; SyncSelectionIfRequired(); -#endif // defined(OS_POSIX) } void RenderViewImpl::didExecuteCommand(const WebString& command_name) { diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 49d3b9e..6b869cf 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -1155,7 +1155,9 @@ void RenderWidget::OnImeSetComposition( void RenderWidget::OnImeConfirmComposition( const string16& text, const ui::Range& replacement_range) { if (webwidget_) { + handling_input_event_ = true; webwidget_->confirmComposition(text); + handling_input_event_ = false; } // Send an updated IME range with just the caret range. ui::Range range(ui::Range::InvalidRange()); |