Revert of Make FrameSelection to hold non-canonicalized positions

third_party/WebKit/Source/core/page/FocusController.cpp

Index: third_party/WebKit/Source/core/page/FocusController.cpp
diff --git a/third_party/WebKit/Source/core/page/FocusController.cpp b/third_party/WebKit/Source/core/page/FocusController.cpp
index 110d8bf12a8de8c3fa4cf6a7c0088d3b2008b582..c75f524ac1ac4de629c2045c739a8667a6e8457c 100644
--- a/third_party/WebKit/Source/core/page/FocusController.cpp
+++ b/third_party/WebKit/Source/core/page/FocusController.cpp
@@ -1076,11 +1076,10 @@ static void clearSelectionIfNeeded(LocalFrame* oldFocusedFrame,
     return;
 
   FrameSelection& selection = oldFocusedFrame->selection();
-  const SelectionInDOMTree& selectionInDOMTree = selection.selectionInDOMTree();
-  if (selectionInDOMTree.isNone())
+  if (selection.isNone())
     return;
 
-  Node* selectionStartNode = selectionInDOMTree.base().anchorNode();
+  Node* selectionStartNode = selection.selection().start().anchorNode();
   if (selectionStartNode == newFocusedElement ||
       selectionStartNode->isDescendantOf(newFocusedElement))
     return;