Revert 108268 - 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

TBR=glotov@google.com
Review URL: http://codereview.chromium.org/8372066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108294 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6192272..b1b1598 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()) {
-        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);