Introduce VisibleSelection::CreateWithoutValidationDeprecated()

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 455 matching lines @@
 }
 
 // TODO(yosin) This function breaks the invariant of this class.
 // But because we use VisibleSelection to store values in editing commands for
 // use when undoing the command, we need to be able to create a selection that
 // while currently invalid, will be valid once the changes are undone. This is a
 // design problem. To fix it we either need to change the invariants of
 // |VisibleSelection| or create a new class for editing to use that can
 // manipulate selections that are not currently valid.
 template <typename Strategy>
-void VisibleSelectionTemplate<Strategy>::SetWithoutValidation(
+VisibleSelectionTemplate<Strategy>
+VisibleSelectionTemplate<Strategy>::CreateWithoutValidationDeprecated(
     const PositionTemplate<Strategy>& base,
-    const PositionTemplate<Strategy>& extent) {
-  if (base.IsNull() || extent.IsNull()) {
-    base_ = extent_ = start_ = end_ = PositionTemplate<Strategy>();
-    UpdateSelectionType();
-    return;
+    const PositionTemplate<Strategy>& extent,
+    TextAffinity affinity) {
+  DCHECK(base.IsNotNull());
+  DCHECK(extent.IsNotNull());
+
+  VisibleSelectionTemplate<Strategy> visible_selection;
+  visible_selection.base_ = base;
+  visible_selection.extent_ = extent;
+  visible_selection.base_is_first_ = base.CompareTo(extent) <= 0;
+  if (visible_selection.base_is_first_) {
+    visible_selection.start_ = base;
+    visible_selection.end_ = extent;
+  } else {
+    visible_selection.start_ = extent;
+    visible_selection.end_ = base;
   }
-
-  base_ = base;
-  extent_ = extent;
-  base_is_first_ = base.CompareTo(extent) <= 0;
-  if (base_is_first_) {
-    start_ = base;
-    end_ = extent;
-  } else {
-    start_ = extent;
-    end_ = base;
+  if (base == extent) {
+    visible_selection.selection_type_ = kCaretSelection;
+    visible_selection.affinity_ = affinity;
+    return visible_selection;
   }
-  selection_type_ = base == extent ? kCaretSelection : kRangeSelection;
-  if (selection_type_ != kCaretSelection) {
-    // Since |m_affinity| for non-|CaretSelection| is always |Downstream|,
-    // we should keep this invariant. Note: This function can be called with
-    // |m_affinity| is |TextAffinity::Upstream|.
-    affinity_ = TextAffinity::kDownstream;
-  }
+  // Since |affinity_| for non-|CaretSelection| is always |kDownstream|,
+  // we should keep this invariant. Note: This function can be called with
+  // |affinity_| is |kUpstream|.
+  visible_selection.selection_type_ = kRangeSelection;
+  visible_selection.affinity_ = TextAffinity::kDownstream;
+  return visible_selection;
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<
     Strategy>::AdjustSelectionToAvoidCrossingShadowBoundaries() {
   if (base_.IsNull() || start_.IsNull() || base_.IsNull())
     return;
   SelectionAdjuster::AdjustSelectionToAvoidCrossingShadowBoundaries(this);
 }
 
@@ skipping 260 matching lines @@
 
 void showTree(const blink::VisibleSelectionInFlatTree& sel) {
   sel.ShowTreeForThis();
 }
 
 void showTree(const blink::VisibleSelectionInFlatTree* sel) {
   if (sel)
     sel->ShowTreeForThis();
 }
 #endif