WebRange-ify WebWidget::compositionRange.

content/renderer/render_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1860 matching lines @@
     convertViewportToWindow(&bounds_from_blink[i]);
     bounds->push_back(bounds_from_blink[i]);
   }
 }
 
 void RenderWidget::GetCompositionRange(gfx::Range* range) {
 #if defined(ENABLE_PLUGINS)
   if (focused_pepper_plugin_)
     return;
 #endif
-  size_t location, length;
-  if (webwidget_->compositionRange(&location, &length)) {
-    range->set_start(location);
-    range->set_end(location + length);
+  WebRange web_range = webwidget_->compositionRange();
+  if (!web_range.isNull()) {
+    range->set_start(web_range.startOffset());
+    range->set_end(web_range.endOffset());
   } else {
-    WebRange web_range = webwidget_->caretOrSelectionRange();
+    web_range = webwidget_->caretOrSelectionRange();
     range->set_start(web_range.startOffset());
     range->set_end(web_range.endOffset());
   }
 }
 
 bool RenderWidget::ShouldUpdateCompositionInfo(
     const gfx::Range& range,
     const std::vector<gfx::Rect>& bounds) {
   if (composition_range_ != range)
     return true;
@@ skipping 190 matching lines @@
 void RenderWidget::requestPointerUnlock() {
   mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get());
 }
 
 bool RenderWidget::isPointerLocked() {
   return mouse_lock_dispatcher_->IsMouseLockedTo(
       webwidget_mouse_lock_target_.get());
 }
 
 }  // namespace content