Prune CreateVisibleSelectionDeprecated from DOMSelection

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 191 matching lines @@
     exceptionState.throwDOMException(
         IndexSizeError, String::number(offset) + " is not a valid offset.");
     return;
   }
 
   if (!isValidForPosition(node))
     return;
   Range::checkNodeWOffset(node, offset, exceptionState);
   if (exceptionState.hadException())
     return;
-  frame()->selection().setSelection(createVisibleSelectionDeprecated(
+
+  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  // In the long term, we should change FrameSelection::setSelection to take a
+  // parameter that does not require clean layout, so that modifying selection
+  // no longer performs synchronous layout by itself.
+  frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+  frame()->selection().setSelection(createVisibleSelection(
       Position(node, offset), frame()->selection().isDirectional()));
 }
 
 void DOMSelection::collapseToEnd(ExceptionState& exceptionState) {
   if (!isAvailable())
     return;
 
   const VisibleSelection& selection = frame()->selection().selection();
 
   if (selection.isNone()) {
@@ skipping 50 matching lines @@
 
   if (!baseNode || !extentNode)
     UseCounter::count(frame(), UseCounter::SelectionSetBaseAndExtentNull);
 
   if (!isValidForPosition(baseNode) || !isValidForPosition(extentNode))
     return;
 
   Position base = createPosition(baseNode, baseOffset);
   Position extent = createPosition(extentNode, extentOffset);
   const bool selectionHasDirection = true;
-  frame()->selection().setSelection(createVisibleSelectionDeprecated(
+
+  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  // In the long term, we should change FrameSelection::setSelection to take a
+  // parameter that does not require clean layout, so that modifying selection
+  // no longer performs synchronous layout by itself.
+  frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+  frame()->selection().setSelection(createVisibleSelection(
       base, extent, SelDefaultAffinity, selectionHasDirection));
 }
 
 void DOMSelection::modify(const String& alterString,
                           const String& directionString,
                           const String& granularityString) {
   if (!isAvailable())
     return;
 
   FrameSelection::EAlteration alter;
@@ skipping 60 matching lines @@
         String::number(offset) + " is larger than the given node's length.");
     return;
   }
 
   if (!isValidForPosition(node))
     return;
 
   const Position& base = frame()->selection().base();
   const Position& extent = createPosition(node, offset);
   const bool selectionHasDirection = true;
-  const VisibleSelection newSelection = createVisibleSelectionDeprecated(
+
+  // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  // In the long term, we should change FrameSelection::setSelection to take a
+  // parameter that does not require clean layout, so that modifying selection
+  // no longer performs synchronous layout by itself.
+  frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+  const VisibleSelection newSelection = createVisibleSelection(
       base, extent, TextAffinity::Downstream, selectionHasDirection);
   frame()->selection().setSelection(newSelection);
 }
 
 Range* DOMSelection::getRangeAt(int index, ExceptionState& exceptionState) {
   if (!isAvailable())
     return nullptr;
 
   if (index < 0 || index >= rangeCount()) {
     exceptionState.throwDOMException(
@@ skipping 237 matching lines @@
     m_treeScope->document().addConsoleMessage(
         ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->trace(m_treeScope);
   DOMWindowProperty::trace(visitor);
 }
 
 }  // namespace blink