Make WebSubstringUtil to use EphemeralRange instead of Range

Source/web/mac/WebSubstringUtil.mm

 /*
  * Copyright (C) 2005, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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.
@@ skipping 41 matching lines @@
 #include "platform/mac/ColorMac.h"
 #include "public/platform/WebRect.h"
 #include "public/web/WebHitTestResult.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebView.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 
 using namespace blink;
 
-static NSAttributedString* attributedSubstringFromRange(const Range* range)
+static NSAttributedString* attributedSubstringFromRange(const EphemeralRange& range)
 {
     NSMutableAttributedString* string = [[NSMutableAttributedString alloc] init];
     NSMutableDictionary* attrs = [NSMutableDictionary dictionary];
-    size_t length = range->endOffset() - range->startOffset();
+    size_t length = range.endPosition().computeOffsetInContainerNode() - range.startPosition().computeOffsetInContainerNode();
 
     unsigned position = 0;
-    for (TextIterator it(range->startPosition(), range->endPosition()); !it.atEnd() && [string length] < length; it.advance()) {
+    for (TextIterator it(range.startPosition(), range.endPosition()); !it.atEnd() && [string length] < length; it.advance()) {
         unsigned numCharacters = it.length();
         if (!numCharacters)
             continue;
 
         Node* container = it.currentContainer();
         LayoutObject* layoutObject = container->layoutObject();
         ASSERT(layoutObject);
         if (!layoutObject)
             continue;
 
@@ skipping 40 matching lines @@
     LocalFrame* frame = result.innerNode()->document().frame();
     FrameView* frameView = frame->view();
 
     EphemeralRange range = frame->rangeForPoint(result.roundedPointInInnerNodeFrame());
     if (range.isNull())
         return nil;
 
     // Expand to word under point.
     VisibleSelection selection(range);
     selection.expandUsingGranularity(WordGranularity);
-    RefPtrWillBeRawPtr<Range> wordRange = selection.toNormalizedRange();
+    const EphemeralRange wordRange = selection.toNormalizedEphemeralRange();
 
     // Convert to NSAttributedString.
-    NSAttributedString* string = attributedSubstringFromRange(wordRange.get());
+    NSAttributedString* string = attributedSubstringFromRange(wordRange);
 
     // Compute bottom left corner and convert to AppKit coordinates.
-    IntRect stringRect = enclosingIntRect(wordRange->boundingRect());
+    // TODO(yosin) We shold avoid to create |Range| object.
+    IntRect stringRect = enclosingIntRect(createRange(wordRange)->boundingRect());
     IntPoint stringPoint = stringRect.minXMaxYCorner();
     stringPoint.setY(frameView->height() - stringPoint.y());
 
     // Adjust for the font's descender. AppKit wants the baseline point.
     if ([string length]) {
         NSDictionary* attributes = [string attributesAtIndex:0 effectiveRange:NULL];
         NSFont* font = [attributes objectForKey:NSFontAttributeName];
         if (font)
             stringPoint.move(0, ceil(-[font descender]));
     }
 
     baselinePoint = stringPoint;
     return string;
 }
 
 NSAttributedString* WebSubstringUtil::attributedSubstringInRange(WebLocalFrame* webFrame, size_t location, size_t length)
 {
     LocalFrame* frame = toWebLocalFrameImpl(webFrame)->frame();
     if (frame->view()->needsLayout())
         frame->view()->layout();
 
     Element* editable = frame->selection().rootEditableElementOrDocumentElement();
     if (!editable)
         return nil;
     const EphemeralRange ephemeralRange(PlainTextRange(location, location + length).createRange(*editable));
     if (ephemeralRange.isNull())
         return nil;
 
-    RefPtrWillBeRawPtr<Range> range = Range::create(ephemeralRange.document(), ephemeralRange.startPosition(), ephemeralRange.endPosition());
-    return attributedSubstringFromRange(range.get());
+    return attributedSubstringFromRange(ephemeralRange);
 }
 
 } // namespace blink