Prune ComputeVisibleSelectionInDOMTreeDeprecated from DOMSelection::deleteFromDocument

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

 /*
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google 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.
@@ skipping 653 matching lines @@
     return;
 
   // The method must invoke deleteContents() ([DOM4]) on the context object's
   // range if the context object is not empty. Otherwise the method must do
   // nothing.
   if (Range* range = DocumentCachedRange()) {
     range->deleteContents(ASSERT_NO_EXCEPTION);
     return;
   }
 
+  // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
+
   // The following code is necessary for
   // editing/selection/deleteFromDocument-crash.html, which assumes
   // deleteFromDocument() for text selection in a TEXTAREA deletes the TEXTAREA
   // value.
 
   FrameSelection& selection = GetFrame()->Selection();
 
-  if (selection.ComputeVisibleSelectionInDOMTreeDeprecated().IsNone())
+  if (selection.ComputeVisibleSelectionInDOMTree().IsNone())
     return;
 
-  // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
-  // needs to be audited.  See http://crbug.com/590369 for more details.
-  // |VisibleSelection::toNormalizedEphemeralRange| requires clean layout.
-  GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
-
   Range* selected_range =
-      CreateRange(selection.ComputeVisibleSelectionInDOMTreeDeprecated()
+      CreateRange(selection.ComputeVisibleSelectionInDOMTree()
                       .ToNormalizedEphemeralRange());
   if (!selected_range)
     return;
 
   // |selectedRange| may point nodes in a different root.
   selected_range->deleteContents(ASSERT_NO_EXCEPTION);
 }
 
 bool DOMSelection::containsNode(const Node* n, bool allow_partial) const {
   DCHECK(n);
@@ skipping 129 matching lines @@
     tree_scope_->GetDocument().AddConsoleMessage(
         ConsoleMessage::Create(kJSMessageSource, kErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->Trace(tree_scope_);
   ContextClient::Trace(visitor);
 }
 
 }  // namespace blink