Expand FrameSeleciton::start() to increase chances of hoisting update layout

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 190 matching lines @@
   if (Page* page = frame().page())
     return page->editorClient();
   return emptyEditorClient();
 }
 
 static bool isCaretAtStartOfWrappedLine(const FrameSelection& selection) {
   if (!selection.computeVisibleSelectionInDOMTreeDeprecated().isCaret())
     return false;
   if (selection.selectionInDOMTree().affinity() != TextAffinity::Downstream)
     return false;
-  const Position& position = selection.start();
+  const Position& position =
+      selection.computeVisibleSelectionInDOMTreeDeprecated().start();
   return !inSameLine(PositionWithAffinity(position, TextAffinity::Upstream),
                      PositionWithAffinity(position, TextAffinity::Downstream));
 }
 
 bool Editor::handleTextEvent(TextEvent* event) {
   // Default event handling for Drag and Drop will be handled by DragController
   // so we leave the event for it.
   if (event->isDrop())
     return false;
 
@@ skipping 867 matching lines @@
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // |tryDHTMLCut| dispatches cut event, which may make layout dirty, but we
   // need clean layout to obtain the selected content.
   frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   // TODO(yosin) We should use early return style here.
   if (canDeleteRange(selectedRange())) {
     spellChecker().updateMarkersForWordsAffectedByEditing(true);
-    if (enclosingTextControl(frame().selection().start())) {
+    if (enclosingTextControl(frame()
+                                 .selection()
+                                 .computeVisibleSelectionInDOMTreeDeprecated()
+                                 .start())) {
       String plainText = frame().selectedTextForClipboard();
       Pasteboard::generalPasteboard()->writePlainText(
           plainText, canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace
                                             : Pasteboard::CannotSmartReplace);
     } else {
       writeSelectionToPasteboard();
     }
 
     if (source == CommandFromMenuOrKeyBinding) {
       if (dispatchBeforeInputDataTransfer(findEventTargetFromSelection(),
@@ skipping 16 matching lines @@
     return;  // DHTML did the whole operation
   if (!canCopy())
     return;
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // |tryDHTMLCopy| dispatches copy event, which may make layout dirty, but
   // we need clean layout to obtain the selected content.
   frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-  if (enclosingTextControl(frame().selection().start())) {
+  if (enclosingTextControl(frame()
+                               .selection()
+                               .computeVisibleSelectionInDOMTreeDeprecated()
+                               .start())) {
     Pasteboard::generalPasteboard()->writePlainText(
         frame().selectedTextForClipboard(),
         canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace
                                : Pasteboard::CannotSmartReplace);
   } else {
     Document* document = frame().document();
     if (HTMLImageElement* imageElement =
             imageElementFromImageDocument(document))
       writeImageNodeToPasteboard(Pasteboard::generalPasteboard(), imageElement,
                                  document->title());
@@ skipping 593 matching lines @@
 
 DEFINE_TRACE(Editor) {
   visitor->trace(m_frame);
   visitor->trace(m_lastEditCommand);
   visitor->trace(m_undoStack);
   visitor->trace(m_mark);
   visitor->trace(m_typingStyle);
 }
 
 }  // namespace blink