DO NOT SUBMIT

Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

 /*
  * Copyright (C) 2010, 2011 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 142 matching lines @@
     }
 }
 
 void WebPage::getMarkedRange(uint64_t& location, uint64_t& length)
 {
     location = NSNotFound;
     length = 0;
     Frame* frame = m_page->focusController()->focusedOrMainFrame();
     if (!frame)
         return;
-    
-    getLocationAndLengthFromRange(frame->editor()->compositionRange().get(), location, length);
-}
 
-static PassRefPtr<Range> characterRangeAtPoint(Frame* frame, const IntPoint& point)
-{
-    VisiblePosition position = frame->visiblePositionForPoint(point);
-    if (position.isNull())
-        return 0;
-    
-    VisiblePosition previous = position.previous();
-    if (previous.isNotNull()) {
-        RefPtr<Range> previousCharacterRange = makeRange(previous, position);
-        IntRect rect = frame->editor()->firstRectForRange(previousCharacterRange.get());
-        if (rect.contains(point))
-            return previousCharacterRange.release();
-    }
-    
-    VisiblePosition next = position.next();
-    if (next.isNotNull()) {
-        RefPtr<Range> nextCharacterRange = makeRange(position, next);
-        IntRect rect = frame->editor()->firstRectForRange(nextCharacterRange.get());
-        if (rect.contains(point))
-            return nextCharacterRange.release();
-    }
-    
-    return 0;
+    Range* range = frame->editor()->compositionRange().get();
+    if (range)
+        range->getLocationAndLength(location, length);
 }
     
 void WebPage::characterIndexForPoint(IntPoint point, uint64_t& index)
 {
     index = NSNotFound;
     Frame* frame = m_page->mainFrame();
     if (!frame)
         return;
 
     HitTestResult result = frame->eventHandler()->hitTestResultAtPoint(point, false);
     frame = result.innerNonSharedNode() ? result.innerNonSharedNode()->document()->frame() : m_page->focusController()->focusedOrMainFrame();
     
-    RefPtr<Range> range = characterRangeAtPoint(frame, result.point());
+    RefPtr<Range> range = frame->rangeForPoint(frame, result.point());
     if (!range)
         return;
 
     uint64_t length;
-    getLocationAndLengthFromRange(range.get(), index, length);
+    range->getLocationAndLength(index, length);
 }
 
 static PassRefPtr<Range> convertToRange(Frame* frame, NSRange nsrange)
 {
     if (nsrange.location > INT_MAX)
         return 0;
     if (nsrange.length > INT_MAX || nsrange.location + nsrange.length > INT_MAX)
         nsrange.length = INT_MAX - nsrange.location;
         
     // our critical assumption is that we are only called by input methods that
@@ skipping 30 matching lines @@
     if (!frame)
         return;
 
     // Find the frame the point is over.
     IntPoint point = roundedIntPoint(floatPoint);
 
     HitTestResult result = frame->eventHandler()->hitTestResultAtPoint(point, false);
     frame = result.innerNonSharedNode() ? result.innerNonSharedNode()->document()->frame() : m_page->focusController()->focusedOrMainFrame();
 
     // Figure out if there are any characters under the point.
-    RefPtr<Range> characterRange = characterRangeAtPoint(frame, frame->view()->windowToContents(point));
+    RefPtr<Range> characterRange = frame->rangeForPoint(frame, frame->view()->windowToContents(point));
     if (!characterRange)
         return;
 
     // Grab the currently selected text.
     RefPtr<Range> selectedRange = m_page->focusController()->focusedOrMainFrame()->selection()->selection().toNormalizedRange();
 
     // Use the selected text if the point was anywhere in it. Assertain this by seeing if either character range
     // the mouse is over is contained by the selection range.
     if (characterRange && selectedRange) {
         ExceptionCode ec = 0;
@@ skipping 219 matching lines @@
 
 void WebPage::platformDragEnded()
 {
     // The drag source we care about here is NSFilePromiseDragSource, which doesn't look at
     // the arguments. It's OK to just pass arbitrary constant values, so we just pass all zeroes.
     [m_dragSource.get() draggedImage:nil endedAt:NSZeroPoint operation:NSDragOperationNone];
     m_dragSource = nullptr;
 }
 
 } // namespace WebKit