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

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

Index: third_party/WebKit/Source/core/editing/Editor.cpp
diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp
index cf8b08e6be8a9e8d57e49f3f2e3bce5ae88e5995..8db85385837d2b5d012c1d13cbed6a7897e8960a 100644
--- a/third_party/WebKit/Source/core/editing/Editor.cpp
+++ b/third_party/WebKit/Source/core/editing/Editor.cpp
@@ -773,7 +773,10 @@ Element* Editor::findEventTargetFromSelection() const {
 
 void Editor::applyStyle(StylePropertySet* style,
                         InputEvent::InputType inputType) {
-  switch (frame().selection().getSelectionType()) {
+  switch (frame()
+              .selection()
+              .computeVisibleSelectionInDOMTreeDeprecated()
+              .getSelectionType()) {
     case NoSelection:
       // do nothing
       break;
@@ -1428,9 +1431,14 @@ void Editor::changeSelectionAfterCommand(
   // 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 {