WebRange-ify WebWidget::compositionRange.

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 551 matching lines @@
     LocalFrame* focused = focusedLocalFrameAvailableForIme();
     if (!focused)
         return false;
 
     if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
         return plugin->confirmComposition(text, selectionBehavior);
 
     return focused->inputMethodController().confirmCompositionOrInsertText(text, selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection);
 }
 
-bool WebFrameWidgetImpl::compositionRange(size_t* location, size_t* length)
+WebRange WebFrameWidgetImpl::compositionRange()
 {
     LocalFrame* focused = focusedLocalFrameAvailableForIme();
     if (!focused)
-        return false;
+        return WebRange();
 
     const EphemeralRange range = focused->inputMethodController().compositionEphemeralRange();
     if (range.isNull())
-        return false;
+        return WebRange();
 
     Element* editable = focused->selection().rootEditableElementOrDocumentElement();
     DCHECK(editable);
-    PlainTextRange plainTextRange(PlainTextRange::create(*editable, range));
-    if (plainTextRange.isNull())
-        return false;
-    *location = plainTextRange.start();
-    *length = plainTextRange.length();
-    return true;
+    return PlainTextRange::create(*editable, range);
 }
 
 WebTextInputInfo WebFrameWidgetImpl::textInputInfo()
 {
     WebTextInputInfo info;
 
     LocalFrame* focused = focusedLocalFrameInWidget();
     if (!focused)
         return info;
 
@@ skipping 246 matching lines @@
     page()->pointerLockController().didNotAcquirePointerLock();
 }
 
 void WebFrameWidgetImpl::didLosePointerLock()
 {
     page()->pointerLockController().didLosePointerLock();
 }
 
 bool WebFrameWidgetImpl::getCompositionCharacterBounds(WebVector<WebRect>& bounds)
 {
-    size_t offset = 0;
-    size_t characterCount = 0;
-    if (!compositionRange(&offset, &characterCount))
+    WebRange range = compositionRange();
+    if (range.isNull())
         return false;
 
-    if (characterCount == 0)
+    if (range.length() == 0)
         return false;
 
     LocalFrame* frame = focusedLocalFrameInWidget();
     if (!frame)
         return false;
 
     WebLocalFrameImpl* webLocalFrame = WebLocalFrameImpl::fromFrame(frame);
+    size_t characterCount = range.length();
+    size_t offset = range.startOffset();
     WebVector<WebRect> result(characterCount);
     WebRect webrect;
     for (size_t i = 0; i < characterCount; ++i) {
         if (!webLocalFrame->firstRectForCharacterRange(offset + i, 1, webrect)) {
             DLOG(ERROR) << "Could not retrieve character rectangle at " << i;
             return false;
         }
         result[i] = webrect;
     }
+
     bounds.swap(result);
     return true;
 }
 
 void WebFrameWidgetImpl::applyReplacementRange(int start, int length)
 {
     if (LocalFrame* frame = focusedLocalFrameInWidget()) {
         // TODO(dglazkov): Going from LocalFrame to WebLocalFrameImpl seems
         // silly. What is going on here?
         WebLocalFrameImpl::fromFrame(frame)->selectRange(WebRange(start, length));
@@ skipping 550 matching lines @@
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const
 {
     if (!m_imeAcceptEvents)
         return nullptr;
     return focusedLocalFrameInWidget();
 }
 
 } // namespace blink