Get rid of flat tree version of createVisibleSelection() taking two VisiblePosition

third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 207 matching lines @@
   VisiblePosition start = VisiblePosition::firstPositionInNode(
       const_cast<SVGTextContentElement*>(this));
   for (unsigned i = 0; i < charnum; ++i)
     start = nextPositionOf(start);
 
   // Find selection end
   VisiblePosition end(start);
   for (unsigned i = 0; i < nchars; ++i)
     end = nextPositionOf(end);
 
+  SelectionInDOMTree::Builder builder;

[Xiaocheng, 2016/10/21 11:18:36]

How about just setBaseAndExtentDeprecated?

Since |start| and |end| are converted from offsets, there should be something
wrong if they are null. Let's use the deprecated function to indicate this.

[yosin_UTC9, 2016/10/24 06:19:44]

Done.

+  if (start.isNotNull() && end.isNotNull()) {
+    builder.collapse(start.toPositionWithAffinity())
+        .extend(end.deepEquivalent());
+  } else if (start.isNotNull()) {
+    builder.collapse(start.toPositionWithAffinity());
+  } else if (end.isNotNull()) {
+    builder.collapse(end.toPositionWithAffinity());
+  }
+
   document().frame()->selection().setSelection(

[Xiaocheng, 2016/10/21 11:18:36]

We should use the FrameSelection::setSelection(SelectionInDOMTree) overload.

[yosin_UTC9, 2016/10/24 06:19:44]

Good catch!

-      createVisibleSelection(start, end));
+      createVisibleSelection(builder.build()));
 }
 
 bool SVGTextContentElement::isPresentationAttribute(
     const QualifiedName& name) const {
   if (name.matches(XMLNames::spaceAttr))
     return true;
   return SVGGraphicsElement::isPresentationAttribute(name);
 }
 
 void SVGTextContentElement::collectStyleForPresentationAttribute(
@@ skipping 49 matching lines @@
       (!lineLayoutItem.isSVGText() && !lineLayoutItem.isSVGInline()))
     return nullptr;
 
   SVGElement* element = toSVGElement(lineLayoutItem.node());
   ASSERT(element);
   return isSVGTextContentElement(*element) ? toSVGTextContentElement(element)
                                            : 0;
 }
 
 }  // namespace blink