CANCELLED Merge SelectionAdjuster into VisibleSelection part 1

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 517 matching lines @@
     // |m_affinity| is |TextAffinity::Upstream|.
     m_affinity = TextAffinity::Downstream;
   }
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<
     Strategy>::adjustSelectionToAvoidCrossingShadowBoundaries() {
   if (m_base.isNull() || m_start.isNull() || m_base.isNull())
     return;
-  SelectionAdjuster::adjustSelectionToAvoidCrossingShadowBoundaries(this);
+  std::pair<AdjustDirection, PositionTemplate<Strategy>> adjustment =
+      adjustmentToAvoidCrossingShadowBoundaries(*this);
+  if (adjustment.first == AdjustDirection::kAdjustNone)
+    return;
+  if (adjustment.first == AdjustDirection::kAdjustStart)
+    m_start = adjustment.second;
+  else
+    m_end = adjustment.second;
+  m_extent = adjustment.second;
 }
 
 static Element* lowestEditableAncestor(Node* node) {
   while (node) {
     if (hasEditableStyle(*node))
       return rootEditableElement(*node);
     if (isHTMLBodyElement(*node))
       break;
     node = node->parentNode();
   }
@@ skipping 251 matching lines @@
 
 void showTree(const blink::VisibleSelectionInFlatTree& sel) {
   sel.showTreeForThis();
 }
 
 void showTree(const blink::VisibleSelectionInFlatTree* sel) {
   if (sel)
     sel->showTreeForThis();
 }
 #endif