Expand FrameSeleciton::getSelectionType() 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 755 matching lines @@
   return target;
 }
 
 Element* Editor::findEventTargetFromSelection() const {
   return findEventTargetFrom(
       frame().selection().computeVisibleSelectionInDOMTreeDeprecated());
 }
 
 void Editor::applyStyle(StylePropertySet* style,
                         InputEvent::InputType inputType) {
-  switch (frame().selection().getSelectionType()) {
+  switch (frame()
+              .selection()
+              .computeVisibleSelectionInDOMTreeDeprecated()
+              .getSelectionType()) {
     case NoSelection:
       // do nothing
       break;
     case CaretSelection:
       computeAndSetTypingStyle(style, inputType);
       break;
     case RangeSelection:
       if (style) {
         DCHECK(frame().document());
         ApplyStyleCommand::create(*frame().document(),
@@ skipping 634 matching lines @@
   // Some editing operations change the selection visually without affecting its
   // position within the DOM. For example when you press return in the following
   // (the caret is marked by ^):
   // <div contentEditable="true"><div>^Hello</div></div>
   // WebCore inserts <div><br></div> *before* the current block, which correctly
   // moves the paragraph down but which doesn't change the caret's DOM position
   // (["hello", 0]). In these situations the above FrameSelection::setSelection
   // call does not call EditorClient::respondToChangedSelection(), which, on the
   // Mac, sends selection change notifications and starts a new kill ring
   // sequence, but we want to do these things (matches AppKit).
-  if (selectionDidNotChangeDOMPosition)
-    client().respondToChangedSelection(m_frame,
-                                       frame().selection().getSelectionType());
+  if (selectionDidNotChangeDOMPosition) {
+    client().respondToChangedSelection(
+        m_frame,
+        frame()
+            .selection()
+            .computeVisibleSelectionInDOMTreeDeprecated()
+            .getSelectionType());
+  }
 }
 
 IntRect Editor::firstRectForRange(const EphemeralRange& range) const {
   DCHECK(!frame().document()->needsLayoutTreeUpdate());
   DocumentLifecycle::DisallowTransitionScope disallowTransition(
       frame().document()->lifecycle());
 
   LayoutUnit extraWidthToEndOfLine;
   DCHECK(range.isNotNull());
 
@@ skipping 307 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