diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 00:54:01 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 00:54:01 +0000 |
| commit | 13a8aa1a2529d531305885cca052b818841693d1 (patch) | |
| tree | 2e1eade96e4f2b7dd2e26c01a967a3fbb7d1bd81 /content/renderer/render_view_impl.cc | |
| parent | 66bf19eb05d57100cd62197ab03ae820809da2e5 (diff) | |
| download | chromium_src-13a8aa1a2529d531305885cca052b818841693d1.zip chromium_src-13a8aa1a2529d531305885cca052b818841693d1.tar.gz chromium_src-13a8aa1a2529d531305885cca052b818841693d1.tar.bz2 | |
Try to fix a renderer crash.
WebRange::fromDocumentRange() can return a null range. I don't
know when this happens in practice, but there are crash reports
for it.
BUG=100884
TEST=none
Review URL: http://codereview.chromium.org/8423022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index cdc40c6..95d89fc 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -4304,10 +4304,10 @@ void RenderViewImpl::OnImeConfirmComposition( // Select the text in |replacement_range|, it will then be replaced by // text added by the call to RenderWidget::OnImeConfirmComposition(). if (WebFrame* frame = webview()->focusedFrame()) { - frame->setSelectionToRange( - WebRange::fromDocumentRange(frame, - replacement_range.start(), - replacement_range.length())); + WebRange webrange = WebRange::fromDocumentRange( + frame, replacement_range.start(), replacement_range.length()); + if (!webrange.isNull()) + frame->setSelectionToRange(webrange); } } RenderWidget::OnImeConfirmComposition(text, replacement_range); |