Use tighter typing in editing: PlainTextRange / ReplaceNodeWithSpanCommand

Source/core/editing/ReplaceNodeWithSpanCommand.cpp

 /*
  * Copyright (c) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/editing/ReplaceNodeWithSpanCommand.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/HTMLNames.h"
 #include "core/editing/htmlediting.h"
 #include "core/html/HTMLElement.h"
+#include "core/html/HTMLSpanElement.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 ReplaceNodeWithSpanCommand::ReplaceNodeWithSpanCommand(PassRefPtrWillBeRawPtr<HTMLElement> element)
     : SimpleEditCommand(element->document())
     , m_elementToReplace(element)
 {
     ASSERT(m_elementToReplace);
 }
 
-static void swapInNodePreservingAttributesAndChildren(HTMLElement* newNode, HTMLElement& nodeToReplace)
+static void swapInNodePreservingAttributesAndChildren(HTMLElement* newElement, HTMLElement& elementToReplace)
 {
-    ASSERT(nodeToReplace.inDocument());
-    RefPtrWillBeRawPtr<ContainerNode> parentNode = nodeToReplace.parentNode();
-    parentNode->insertBefore(newNode, &nodeToReplace);
+    ASSERT(elementToReplace.inDocument());
+    RefPtrWillBeRawPtr<ContainerNode> parentNode = elementToReplace.parentNode();
+    parentNode->insertBefore(newElement, &elementToReplace);
 
     NodeVector children;
-    getChildNodes(nodeToReplace, children);
+    getChildNodes(elementToReplace, children);
     for (size_t i = 0; i < children.size(); ++i)
-        newNode->appendChild(children[i]);
+        newElement->appendChild(children[i]);
 
     // FIXME: Fix this to send the proper MutationRecords when MutationObservers are present.
-    newNode->cloneDataFromElement(nodeToReplace);
+    newElement->cloneDataFromElement(elementToReplace);
 
-    parentNode->removeChild(&nodeToReplace, ASSERT_NO_EXCEPTION);
+    parentNode->removeChild(&elementToReplace, ASSERT_NO_EXCEPTION);
 }
 
 void ReplaceNodeWithSpanCommand::doApply()
 {
     if (!m_elementToReplace->inDocument())
         return;
     if (!m_spanElement)
-        m_spanElement = createHTMLElement(m_elementToReplace->document(), spanTag);
+        m_spanElement = toHTMLSpanElement(createHTMLElement(m_elementToReplace->document(), spanTag).get());
     swapInNodePreservingAttributesAndChildren(m_spanElement.get(), *m_elementToReplace);
 }
 
 void ReplaceNodeWithSpanCommand::doUnapply()
 {
     if (!m_spanElement->inDocument())
         return;
     swapInNodePreservingAttributesAndChildren(m_elementToReplace.get(), *m_spanElement);
 }
 
 void ReplaceNodeWithSpanCommand::trace(Visitor* visitor)
 {
     visitor->trace(m_elementToReplace);
     visitor->trace(m_spanElement);
     SimpleEditCommand::trace(visitor);
 }
 
 } // namespace blink