Revert of Utilize FrameSelection::setSelection() taking SelectionInDOMTree/SelectionInFlatTree

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 204 matching lines @@
     return;
 
   const VisibleSelection& selection = frame()->selection().selection();
 
   if (selection.isNone()) {
     exceptionState.throwDOMException(InvalidStateError,
                                      "there is no selection.");
     return;
   }
 
+  // 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();
+
   SelectionInDOMTree::Builder builder;
   builder.collapse(selection.end());
-  frame()->selection().setSelection(builder.build());
+  frame()->selection().setSelection(createVisibleSelection(builder.build()));
 }
 
 void DOMSelection::collapseToStart(ExceptionState& exceptionState) {
   if (!isAvailable())
     return;
 
   const VisibleSelection& selection = frame()->selection().selection();
 
   if (selection.isNone()) {
     exceptionState.throwDOMException(InvalidStateError,
                                      "there is no selection.");
     return;
   }
 
+  // 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();
+
   SelectionInDOMTree::Builder builder;
   builder.collapse(selection.start());
-  frame()->selection().setSelection(builder.build());
+  frame()->selection().setSelection(createVisibleSelection(builder.build()));
 }
 
 void DOMSelection::empty() {
   if (!isAvailable())
     return;
   frame()->selection().clear();
 }
 
 void DOMSelection::setBaseAndExtent(Node* baseNode,
                                     int baseOffset,
@@ skipping 402 matching lines @@
     m_treeScope->document().addConsoleMessage(
         ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->trace(m_treeScope);
   DOMWindowProperty::trace(visitor);
 }
 
 }  // namespace blink