Return EphemeralRange instead of Range in DOMSelection::createRangeFromSelectionEditor

third_party/WebKit/Source/core/editing/DOMSelection.cpp

 /*
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 206 matching lines @@
     return 1;
   if (frame()
           ->selection()
           .computeVisibleSelectionInDOMTreeDeprecated()
           .isNone())
     return 0;
   // Any selection can be adjusted to Range for Document.
   if (isSelectionOfDocument())
     return 1;
   // In ShadowRoot, we need to try adjustment.
-  return createRangeFromSelectionEditor() ? 1 : 0;
+  if (createRangeFromSelectionEditor().isNotNull())

[yosin_UTC9, 2017/03/28 07:04:31]

nit: I prefer using "?:" as original

return createRangeFromSelectionEditor().isNotNull() ? 1 : 0;

[yoichio, 2017/03/28 09:32:51]

New early-return follows above early returns of 1 or 0.

+    return 1;
+  return 0;
 }
 
 // https://www.w3.org/TR/selection-api/#dom-selection-collapse
 void DOMSelection::collapse(Node* node,
                             unsigned offset,
                             ExceptionState& exceptionState) {
   if (!isAvailable())
     return;
 
   // 1. If node is null, this method must behave identically as
@@ skipping 285 matching lines @@
         IndexSizeError, String::number(index) + " is not a valid index.");
     return nullptr;
   }
 
   // If you're hitting this, you've added broken multi-range selection support
   DCHECK_EQ(rangeCount(), 1u);
 
   if (Range* cachedRange = documentCachedRange())
     return cachedRange;
 
-  Range* range = createRangeFromSelectionEditor();
+  Range* range = createRange(createRangeFromSelectionEditor());
   cacheRangeIfSelectionOfDocument(range);
   return range;
 }
 
 Range* DOMSelection::primaryRangeOrNull() const {
   return rangeCount() > 0 ? getRangeAt(0, ASSERT_NO_EXCEPTION) : nullptr;
 }
 
-Range* DOMSelection::createRangeFromSelectionEditor() const {
+EphemeralRange DOMSelection::createRangeFromSelectionEditor() const {
   const VisibleSelection& selection = visibleSelection();
   const Position& anchor = blink::anchorPosition(selection);
   if (isSelectionOfDocument() && !anchor.anchorNode()->isInShadowTree())
-    return createRange(firstEphemeralRangeOf(selection));
+    return firstEphemeralRangeOf(selection);
 
-  Node* const node = shadowAdjustedNode(anchor);
-  if (!node)  // crbug.com/595100
-    return nullptr;
+  Node* const anchorNode = shadowAdjustedNode(anchor);
+  if (!anchorNode)  // crbug.com/595100
+    return EphemeralRange();
+
   const Position& focus = focusPosition(selection);
-  if (!selection.isBaseFirst()) {
-    return Range::create(*anchor.document(), shadowAdjustedNode(focus),
-                         shadowAdjustedOffset(focus), node,
-                         shadowAdjustedOffset(anchor));
-  }
-  return Range::create(*anchor.document(), node, shadowAdjustedOffset(anchor),
-                       shadowAdjustedNode(focus), shadowAdjustedOffset(focus));
+  const Position shadowAdjustedFocus =
+      Position(shadowAdjustedNode(focus), shadowAdjustedOffset(focus));
+  const Position shadowAdjustedAnchor =
+      Position(anchorNode, shadowAdjustedOffset(anchor));
+  if (selection.isBaseFirst())
+    return EphemeralRange(shadowAdjustedAnchor, shadowAdjustedFocus);
+  return EphemeralRange(shadowAdjustedFocus, shadowAdjustedAnchor);
 }
 
 bool DOMSelection::isSelectionOfDocument() const {
   return m_treeScope == m_treeScope->document();
 }
 
 void DOMSelection::cacheRangeIfSelectionOfDocument(Range* range) const {
   if (!isSelectionOfDocument())
     return;
   if (!frame())
@@ skipping 250 matching lines @@
     m_treeScope->document().addConsoleMessage(
         ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->trace(m_treeScope);
   ContextClient::trace(visitor);
 }
 
 }  // namespace blink