CONTINUED Make FrameSelection to hold non-canonicalized positions

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

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * 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 1050 matching lines @@
 static void clearSelectionIfNeeded(LocalFrame* oldFocusedFrame,
                                    LocalFrame* newFocusedFrame,
                                    Element* newFocusedElement) {
   if (!oldFocusedFrame || !newFocusedFrame)
     return;
 
   if (oldFocusedFrame->document() != newFocusedFrame->document())
     return;
 
   FrameSelection& selection = oldFocusedFrame->selection();
-  if (selection.isNone())
+  const SelectionInDOMTree& selectionInDOMTree = selection.selectionInDOMTree();
+  if (selectionInDOMTree.isNone())
     return;
 
-  Node* selectionStartNode = selection.selection().start().anchorNode();
+  Node* selectionStartNode = selectionInDOMTree.base().anchorNode();
   if (selectionStartNode == newFocusedElement ||
       selectionStartNode->isDescendantOf(newFocusedElement))
     return;
 
   if (!enclosingTextControl(selectionStartNode))
     return;
 
   if (selectionStartNode->isInShadowTree() &&
       selectionStartNode->ownerShadowHost() == newFocusedElement)
     return;
@@ skipping 308 matching lines @@
 
   return consumed;
 }
 
 DEFINE_TRACE(FocusController) {
   visitor->trace(m_page);
   visitor->trace(m_focusedFrame);
 }
 
 }  // namespace blink