CONTINUED Make FrameSelection to hold non-canonicalized positions

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

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 462 matching lines @@
     m_affinity = TextAffinity::Downstream;
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::validate(TextGranularity granularity) {
   DCHECK(!needsLayoutTreeUpdate(m_base));
   DCHECK(!needsLayoutTreeUpdate(m_extent));
   // TODO(xiaochengh): Add a DocumentLifecycle::DisallowTransitionScope here.
 
   m_granularity = granularity;
-  m_hasTrailingWhitespace = false;
+  if (m_granularity != WordGranularity)
+    m_hasTrailingWhitespace = false;
   setBaseAndExtentToDeepEquivalents();
   if (m_base.isNull() || m_extent.isNull()) {
     m_base = m_extent = m_start = m_end = PositionTemplate<Strategy>();
     updateSelectionType();
     return;
   }
 
   const PositionTemplate<Strategy> start = m_baseIsFirst ? m_base : m_extent;
   const PositionTemplate<Strategy> newStart = computeStartRespectingGranularity(
       PositionWithAffinityTemplate<Strategy>(start, m_affinity), granularity);
@@ skipping 15 matching lines @@
     // it is useful to make to make the selection "canonical" (if only for
     // purposes of comparing selections). This is an ideal point of the code
     // to do this operation, since all selection changes that result in a
     // RANGE come through here before anyone uses it.
     // TODO(yosin) Canonicalizing is good, but haven't we already done it
     // (when we set these two positions to |VisiblePosition|
     // |deepEquivalent()|s above)?
     m_start = mostForwardCaretPosition(m_start);
     m_end = mostBackwardCaretPosition(m_end);
   }
+  if (!m_hasTrailingWhitespace)
+    return;
+  appendTrailingWhitespace();
 }
 
 template <typename Strategy>
 bool VisibleSelectionTemplate<Strategy>::isValidFor(
     const Document& document) const {
   if (isNone())
     return true;
 
   return m_base.document() == &document && !m_base.isOrphan() &&
          !m_extent.isOrphan() && !m_start.isOrphan() && !m_end.isOrphan();
@@ skipping 314 matching lines @@
 
 void showTree(const blink::VisibleSelectionInFlatTree& sel) {
   sel.showTreeForThis();
 }
 
 void showTree(const blink::VisibleSelectionInFlatTree* sel) {
   if (sel)
     sel->showTreeForThis();
 }
 #endif