Clean up DocumentMarkerController::copyMarkers() (now it's moveMarkers())

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

 /*
  * Copyright (C) 2005, 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 40 matching lines @@
   if (!parent || !hasEditableStyle(*parent))
     return;
 
   String prefixText =
       m_text2->substringData(0, m_offset, IGNORE_EXCEPTION_FOR_TESTING);
   if (prefixText.isEmpty())
     return;
 
   m_text1 = Text::create(document(), prefixText);
   DCHECK(m_text1);
-  document().markers().copyMarkers(m_text2.get(), 0, m_offset, m_text1.get(),
+  document().markers().moveMarkers(m_text2.get(), 0, m_offset, m_text1.get(),
                                    0);
 
   insertText1AndTrimText2();
 }
 
 void SplitTextNodeCommand::doUnapply() {
   if (!m_text1 || !hasEditableStyle(*m_text1))
     return;
 
   DCHECK_EQ(m_text1->document(), document());
 
   String prefixText = m_text1->data();
 
   m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION);
   document().updateStyleAndLayout();
 
-  document().markers().copyMarkers(m_text1.get(), 0, prefixText.length(),
+  document().markers().moveMarkers(m_text1.get(), 0, prefixText.length(),
                                    m_text2.get(), 0);
   m_text1->remove(ASSERT_NO_EXCEPTION);
 }
 
 void SplitTextNodeCommand::doReapply() {
   if (!m_text1 || !m_text2)
     return;
 
   ContainerNode* parent = m_text2->parentNode();
   if (!parent || !hasEditableStyle(*parent))
     return;
 
+  document().markers().moveMarkers(m_text2.get(), 0, m_offset, m_text1.get(),

[rlanday, 2017/04/08 02:30:09]

I'm glad I wrote the test case in the dependent CL to catch that I needed this!
(It was previously depending on the markers still existing on the unused marker)

[Xiaocheng, 2017/04/08 02:46:40]

Good catch!

+                                   0);
   insertText1AndTrimText2();
 }
 
 void SplitTextNodeCommand::insertText1AndTrimText2() {
   DummyExceptionStateForTesting exceptionState;
   m_text2->parentNode()->insertBefore(m_text1.get(), m_text2.get(),
                                       exceptionState);
   if (exceptionState.hadException())
     return;
   m_text2->deleteData(0, m_offset, exceptionState);
   document().updateStyleAndLayout();
 }
 
 DEFINE_TRACE(SplitTextNodeCommand) {
   visitor->trace(m_text1);
   visitor->trace(m_text2);
   SimpleEditCommand::trace(visitor);
 }
 
 }  // namespace blink