diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 04:18:43 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 04:18:43 +0000 |
| commit | 543ef7baeea4ba92bb13e54c8dd54180a5fcb18a (patch) | |
| tree | db90d87739594bc600ddabd13c36b49d37afcce6 | |
| parent | d5ba62903e21848106b4ae33343fe1b0ac08b68e (diff) | |
| download | chromium_src-543ef7baeea4ba92bb13e54c8dd54180a5fcb18a.zip chromium_src-543ef7baeea4ba92bb13e54c8dd54180a5fcb18a.tar.gz chromium_src-543ef7baeea4ba92bb13e54c8dd54180a5fcb18a.tar.bz2 | |
Merge 108214 - 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
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/8438029
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108243 0039d316-1c4b-4281-b951-d872f2087c98
| -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 82f36de..5845e3b 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -4275,10 +4275,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); |