diff options
| author | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 10:57:47 +0000 |
|---|---|---|
| committer | glotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 10:57:47 +0000 |
| commit | bd428e8a9d63c6ca1b1e691fc24091355584b0d8 (patch) | |
| tree | 5573d64f90717cfc81f33de3d1eb04e943e8ab45 /content/renderer/render_view_impl.cc | |
| parent | 7257c89a32ff192fd40541e0e86d8945346c808e (diff) | |
| download | chromium_src-bd428e8a9d63c6ca1b1e691fc24091355584b0d8.zip chromium_src-bd428e8a9d63c6ca1b1e691fc24091355584b0d8.tar.gz chromium_src-bd428e8a9d63c6ca1b1e691fc24091355584b0d8.tar.bz2 | |
Revert 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/8438035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108268 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 b1b1598..6192272 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -4306,10 +4306,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()) { - WebRange webrange = WebRange::fromDocumentRange( - frame, replacement_range.start(), replacement_range.length()); - if (!webrange.isNull()) - frame->setSelectionToRange(webrange); + frame->setSelectionToRange( + WebRange::fromDocumentRange(frame, + replacement_range.start(), + replacement_range.length())); } } RenderWidget::OnImeConfirmComposition(text, replacement_range); |