Add support for persisting CompositionUnderlines in InputMethodController

third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2007, 2008 Apple 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 626 matching lines @@
       DeleteFromTextNodeCommand::create(node, offset, count),
       ASSERT_NO_EDITING_ABORT);
 }
 
 void CompositeEditCommand::replaceTextInNode(Text* node,
                                              unsigned offset,
                                              unsigned count,
                                              const String& replacementText) {
   // DeleteFromTextNodeCommand and InsertIntoTextNodeCommand are never
   // aborted.
-  applyCommandToComposite(
-      DeleteFromTextNodeCommand::create(node, offset, count),
-      ASSERT_NO_EDITING_ABORT);
+
+  // Insert must happen before delete to preserve markers correctly

[rlanday, 2017/01/03 21:07:03]

This is something that came up when I added a test case. There's some piece of
logic that sometimes replaced spaces with &nbsps; and the marker range was no
longer including the space because it was deleting the old space and adding the
new one (and ending up outside the marker range) instead of inserting first (so
the new space stays in the marker range).

+  // See algorithm in https://dom.spec.whatwg.org/#concept-cd-replace
   if (!replacementText.isEmpty())
     applyCommandToComposite(
         InsertIntoTextNodeCommand::create(node, offset, replacementText),
         ASSERT_NO_EDITING_ABORT);
+  applyCommandToComposite(DeleteFromTextNodeCommand::create(
+                              node, offset + replacementText.length(), count),
+                          ASSERT_NO_EDITING_ABORT);
 }
 
 Position CompositeEditCommand::replaceSelectedTextInNode(const String& text) {
   Position start = endingSelection().start();
   Position end = endingSelection().end();
   if (start.computeContainerNode() != end.computeContainerNode() ||
       !start.computeContainerNode()->isTextNode() ||
       isTabHTMLSpanElementTextNode(start.computeContainerNode()))
     return Position();
 
@@ skipping 1383 matching lines @@
   return node;
 }
 
 DEFINE_TRACE(CompositeEditCommand) {
   visitor->trace(m_commands);
   visitor->trace(m_composition);
   EditCommand::trace(visitor);
 }
 
 }  // namespace blink