CONTINUED Make FrameSelection to hold non-canonicalized positions

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
  * reserved.
  *
  * 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.
  *
@@ skipping 92 matching lines @@
   SelectionInFlatTree::Builder builder;
   builder.collapse(visibleStart.toPositionWithAffinity());
   builder.extend(visibleEnd.deepEquivalent());
   return createVisibleSelection(builder.build());
 }
 
 void PendingSelection::commit(LayoutView& layoutView) {
   if (!hasPendingSelection())
     return;
   DCHECK(!layoutView.needsLayout());
+  // We should check have |DCHECK(!document().m_needsLayout()); but,
+  // media/track/track-model.html and others don't satisfied.
+  // m_frameSelection->document().assertLayoutTreeIsUpToDate();
   m_hasPendingSelection = false;
 
   const VisibleSelectionInFlatTree& originalSelection =
-      m_frameSelection->visibleSelection<EditingInFlatTreeStrategy>();
+      m_frameSelection->computeVisibleSelectionInFlatTree();
 
   // Skip if pending VisibilePositions became invalid before we reach here.
   if (!isSelectionInDocument(originalSelection, layoutView.document()))
     return;
 
   // Construct a new VisibleSolution, since visibleSelection() is not
   // necessarily valid, and the following steps assume a valid selection. See
   // <https://bugs.webkit.org/show_bug.cgi?id=69563> and
   // <rdar://problem/10232866>.
   const VisibleSelectionInFlatTree& selection =
@@ skipping 34 matching lines @@
   DCHECK(layoutView == endLayoutObject->view());
   layoutView.setSelection(startLayoutObject, startPos.computeEditingOffset(),
                           endLayoutObject, endPos.computeEditingOffset());
 }
 
 DEFINE_TRACE(PendingSelection) {
   visitor->trace(m_frameSelection);
 }
 
 }  // namespace blink