Use tighter typing in editing: DeleteSelectionCommand

Use tighter typing in editing to increase code readability.
This CL focuses on DeleteSelectionCommand.

R=leviw@chromium.org

Review URL: https://codereview.chromium.org/420053002

git-svn-id: svn://svn.chromium.org/blink/trunk@179072 bbb929c8-8fbe-4397-9dbb-9b2b20218538

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

@@ -64,6 +64,7 @@
 #include "core/events/ScopedEventQueue.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLBRElement.h"
+#include "core/html/HTMLDivElement.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLSpanElement.h"
 #include "core/rendering/InlineTextBox.h"
@@ -293,11 +294,12 @@ bool CompositeEditCommand::isRemovableBlock(const Node* node)
     if (!isHTMLDivElement(*node))
         return false;
 
-    ContainerNode* parentNode = node->parentNode();
+    const HTMLDivElement& element = toHTMLDivElement(*node);
+    ContainerNode* parentNode = element.parentNode();
     if (parentNode && parentNode->firstChild() != parentNode->lastChild())
         return false;
 
-    if (!toElement(node)->hasAttributes())
+    if (!element.hasAttributes())
         return true;
 
     return false;

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

@@ -38,6 +38,8 @@
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLBRElement.h"
 #include "core/html/HTMLInputElement.h"
+#include "core/html/HTMLStyleElement.h"
+#include "core/html/HTMLTableRowElement.h"
 #include "core/rendering/RenderTableCell.h"
 #include "core/rendering/RenderText.h"
 
@@ -178,8 +180,8 @@ void DeleteSelectionCommand::initializePositionData()
     m_startRoot = editableRootForPosition(start);
     m_endRoot = editableRootForPosition(end);
 
-    m_startTableRow = enclosingNodeOfType(start, &isHTMLTableRowElement);
-    m_endTableRow = enclosingNodeOfType(end, &isHTMLTableRowElement);
+    m_startTableRow = toHTMLTableRowElement(enclosingNodeOfType(start, &isHTMLTableRowElement));
+    m_endTableRow = toHTMLTableRowElement(enclosingNodeOfType(end, &isHTMLTableRowElement));
 
     // Don't move content out of a table cell.
     // If the cell is non-editable, enclosingNodeOfType won't return it by default, so
@@ -400,7 +402,7 @@ void DeleteSelectionCommand::removeNode(PassRefPtrWillBeRawPtr<Node> node, Shoul
     CompositeEditCommand::removeNode(node, shouldAssumeContentIsAlwaysEditable);
 }
 
-static void updatePositionForTextRemoval(Node* node, int offset, int count, Position& position)
+static void updatePositionForTextRemoval(Text* node, int offset, int count, Position& position)
 {
     if (position.anchorType() != Position::PositionIsOffsetInAnchor || position.containerNode() != node)
         return;
@@ -428,9 +430,10 @@ void DeleteSelectionCommand::makeStylingElementsDirectChildrenOfEditableRootToPr
     RefPtrWillBeRawPtr<Node> node = range->firstNode();
     while (node && node != range->pastLastNode()) {
         RefPtrWillBeRawPtr<Node> nextNode = NodeTraversal::next(*node);
-        if ((isHTMLStyleElement(*node) && !(toElement(node)->hasAttribute(scopedAttr))) || isHTMLLinkElement(*node)) {
+        if ((isHTMLStyleElement(*node) && !toHTMLStyleElement(node)->hasAttribute(scopedAttr))
+            || isHTMLLinkElement(*node)) {
             nextNode = NodeTraversal::nextSkippingChildren(*node);
-            RefPtrWillBeRawPtr<ContainerNode> rootEditableElement = node->rootEditableElement();
+            RefPtrWillBeRawPtr<Element> rootEditableElement = node->rootEditableElement();
             if (rootEditableElement.get()) {
                 removeNode(node);
                 appendNode(node, rootEditableElement);
@@ -758,9 +761,9 @@ void DeleteSelectionCommand::clearTransientState()
 void DeleteSelectionCommand::removeRedundantBlocks()
 {
     Node* node = m_endingPosition.containerNode();
-    Node* rootNode = node->rootEditableElement();
+    Element* rootElement = node->rootEditableElement();
 
-    while (node != rootNode) {
+    while (node != rootElement) {
         if (isRemovableBlock(node)) {
             if (node == m_endingPosition.anchorNode())
                 updatePositionForNodeRemovalPreservingChildren(m_endingPosition, *node);

third_party/WebKit/Source/core/editing/DeleteSelectionCommand.h

@@ -31,6 +31,7 @@
 namespace blink {
 
 class EditingStyle;
+class HTMLTableRowElement;
 
 class DeleteSelectionCommand FINAL : public CompositeEditCommand {
 public:
@@ -92,10 +93,10 @@ private:
     RefPtrWillBeMember<Node> m_endBlock;
     RefPtrWillBeMember<EditingStyle> m_typingStyle;
     RefPtrWillBeMember<EditingStyle> m_deleteIntoBlockquoteStyle;
-    RefPtrWillBeMember<Node> m_startRoot;
-    RefPtrWillBeMember<Node> m_endRoot;
-    RefPtrWillBeMember<Node> m_startTableRow;
-    RefPtrWillBeMember<Node> m_endTableRow;
+    RefPtrWillBeMember<Element> m_startRoot;
+    RefPtrWillBeMember<Element> m_endRoot;
+    RefPtrWillBeMember<HTMLTableRowElement> m_startTableRow;
+    RefPtrWillBeMember<HTMLTableRowElement> m_endTableRow;
     RefPtrWillBeMember<Node> m_temporaryPlaceholder;
 };