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

third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 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
@@ skipping 1933 matching lines @@
   // Set the selection based on visible positions, because the offsets in
   // accessibility nodes are based on visible indexes, which often skips
   // redundant whitespace, for example.
   VisiblePosition anchorVisiblePosition =
       toVisiblePosition(anchorObject, selection.anchorOffset);
   VisiblePosition focusVisiblePosition =
       toVisiblePosition(focusObject, selection.focusOffset);
   if (anchorVisiblePosition.isNull() || focusVisiblePosition.isNull())
     return;
 
-  frame->selection().setSelection(
-      createVisibleSelection(anchorVisiblePosition, focusVisiblePosition));
+  SelectionInDOMTree::Builder builder;
+  if (anchorVisiblePosition.isNotNull() && focusVisiblePosition.isNotNull()) {

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

No need for these branches as L1951 have ensured non-nullity for the two VPs.

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

I missed... :-<

+    builder.collapse(anchorVisiblePosition.toPositionWithAffinity());
+    builder.extend(focusVisiblePosition.deepEquivalent());
+  } else if (anchorVisiblePosition.isNotNull()) {
+    builder.collapse(anchorVisiblePosition.toPositionWithAffinity());
+  } else {
+    builder.collapse(focusVisiblePosition.toPositionWithAffinity());
+  }
+  frame->selection().setSelection(createVisibleSelection(builder.build()));

[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!
Done

 }
 
 bool AXLayoutObject::isValidSelectionBound(const AXObject* boundObject) const {
   return getLayoutObject() && boundObject && !boundObject->isDetached() &&
          boundObject->isAXLayoutObject() && boundObject->getLayoutObject() &&
          boundObject->getLayoutObject()->frame() ==
              getLayoutObject()->frame() &&
          &boundObject->axObjectCache() == &axObjectCache();
 }
 
@@ skipping 480 matching lines @@
 
 bool AXLayoutObject::elementAttributeValue(
     const QualifiedName& attributeName) const {
   if (!m_layoutObject)
     return false;
 
   return equalIgnoringCase(getAttribute(attributeName), "true");
 }
 
 }  // namespace blink