[InputEvent] Don't modify selection when transpose was canceled

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 1389 matching lines @@
     return;
   const SelectionInDOMTree newSelection =
       SelectionInDOMTree::Builder().setBaseAndExtent(range).build();
 
   // Transpose the two characters.
   String text = plainText(range);
   if (text.length() != 2)
     return;
   String transposed = text.right(1) + text.left(1);
 
-  // Select the two characters.
-  if (createVisibleSelection(newSelection) !=
-      frame().selection().computeVisibleSelectionInDOMTreeDeprecated())
-    frame().selection().setSelection(newSelection);
-
   if (dispatchBeforeInputInsertText(
           eventTargetNodeForDocument(frame().document()), transposed,
-          InputEvent::InputType::InsertTranspose) !=
+          InputEvent::InputType::InsertTranspose,
+          new StaticRangeVector(1, StaticRange::create(range))) !=
       DispatchEventResult::NotCanceled)
     return;
 
   // 'beforeinput' event handler may destroy document.
   if (m_frame->document()->frame() != m_frame)
     return;
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited. see http://crbug.com/590369 for more details.
   frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
+  // Select the two characters.
+  if (createVisibleSelection(newSelection) !=
+      frame().selection().computeVisibleSelectionInDOMTreeDeprecated())

[yosin_UTC9, 2017/03/28 07:08:35]

nit: Since L1423 update layout, we don't need to use "deprecated" version here.

[chongz, 2017/03/28 20:46:47]

Done.

+    frame().selection().setSelection(newSelection);
+
   // Insert the transposed characters.
   replaceSelectionWithText(transposed, false, false,
                            InputEvent::InputType::InsertTranspose);
 }
 
 void Editor::addToKillRing(const EphemeralRange& range) {
   if (m_shouldStartNewKillRingSequence)
     killRing().startNewSequence();
 
   DCHECK(!frame().document()->needsLayoutTreeUpdate());
@@ skipping 356 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