Use tighter typing in editing: InsertParagraphSeparatorCommand / InsertTextCommand

Use tighter typing in editing: InsertParagraphSeparatorCommand / InsertTextCommand

Use tighter typing in editing/ to increase code readability. This CL focuses on
InsertParagraphSeparatorCommand / InsertTextCommand.

R=leviw@chromium.org, yosin@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=179180

[yosin_UTC9, 2014-07-29 04:26:00]

LGTM

Thanks for cleanup!

https://codereview.chromium.org/423003003/diff/1/Source/core/editing/InsertPa...
File Source/core/editing/InsertParagraphSeparatorCommand.h (left):

https://codereview.chromium.org/423003003/diff/1/Source/core/editing/InsertPa...
Source/core/editing/InsertParagraphSeparatorCommand.h:37: static
PassRefPtrWillBeRawPtr<InsertParagraphSeparatorCommand> create(Document&
document, bool useDefaultParagraphElement = false, bool
pasteBlockqutoeIntoUnquotedArea = false)
I see you fix typo in "qutoe". :-)
BTW, I don't like |bool| parameter. It is hard to read in call sites.

[Inactive, 2014-07-29 18:57:16]

On 2014/07/29 04:26:00, Yosi_UTC9 wrote:
> LGTM

Thanks. Levi, can you please take a look as well?

[leviw_travelin_and_unemployed, 2014-07-29 20:07:26]

lgtm.

[Inactive, 2014-07-29 20:13:41]

The CQ bit was checked by ch.dumez@samsung.com

[commit-bot: I haz the power, 2014-07-29 20:13:53]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/423003003/1

[commit-bot: I haz the power, 2014-07-29 20:14:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-29 20:14:04]

Failed to apply patch for
Source/core/editing/InsertParagraphSeparatorCommand.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/editing/InsertParagraphSeparatorCommand.cpp
  Hunk #1 succeeded at 61 (offset 1 line).
  Hunk #2 succeeded at 87 (offset 1 line).
  Hunk #3 succeeded at 106 (offset 1 line).
  Hunk #4 succeeded at 168 (offset 1 line).
  Hunk #5 succeeded at 222 (offset 1 line).
  Hunk #6 FAILED at 229.
  Hunk #7 succeeded at 242 (offset 1 line).
  1 out of 7 hunks FAILED -- saving rejects to file
Source/core/editing/InsertParagraphSeparatorCommand.cpp.rej

Patch:       Source/core/editing/InsertParagraphSeparatorCommand.cpp
Index: Source/core/editing/InsertParagraphSeparatorCommand.cpp
diff --git a/Source/core/editing/InsertParagraphSeparatorCommand.cpp
b/Source/core/editing/InsertParagraphSeparatorCommand.cpp
index
f5a1d5b148503d871cd48f5db5a44bcbd4da9ace..bf481651138cd2121922dcc1f29911a941c367d7
100644
--- a/Source/core/editing/InsertParagraphSeparatorCommand.cpp
+++ b/Source/core/editing/InsertParagraphSeparatorCommand.cpp
@@ -60,10 +60,10 @@ static Element*
highestVisuallyEquivalentDivBelowRoot(Element* startBlock)
     return curBlock;
 }
 
-InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand(Document&
document, bool mustUseDefaultParagraphElement, bool
pasteBlockqutoeIntoUnquotedArea)
+InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand(Document&
document, bool mustUseDefaultParagraphElement, bool
pasteBlockquoteIntoUnquotedArea)
     : CompositeEditCommand(document)
     , m_mustUseDefaultParagraphElement(mustUseDefaultParagraphElement)
-    , m_pasteBlockqutoeIntoUnquotedArea(pasteBlockqutoeIntoUnquotedArea)
+    , m_pasteBlockquoteIntoUnquotedArea(pasteBlockquoteIntoUnquotedArea)
 {
 }
 
@@ -86,7 +86,7 @@ void
InsertParagraphSeparatorCommand::calculateStyleBeforeInsertion(const Positi
     m_style->mergeTypingStyle(pos.document());
 }
 
-void InsertParagraphSeparatorCommand::applyStyleAfterInsertion(Node*
originalEnclosingBlock)
+void InsertParagraphSeparatorCommand::applyStyleAfterInsertion(Element*
originalEnclosingBlock)
 {
     // Not only do we break out of header tags, but we also do not preserve the
typing style,
     // in order to match other browsers.
@@ -105,7 +105,7 @@ void
InsertParagraphSeparatorCommand::applyStyleAfterInsertion(Node* originalEnc
         applyStyle(m_style.get());
 }
 
-bool InsertParagraphSeparatorCommand::shouldUseDefaultParagraphElement(Node*
enclosingBlock) const
+bool InsertParagraphSeparatorCommand::shouldUseDefaultParagraphElement(Element*
enclosingBlock) const
 {
     if (m_mustUseDefaultParagraphElement)
         return true;
@@ -167,7 +167,7 @@ void InsertParagraphSeparatorCommand::doApply()
     // FIXME: The parentAnchoredEquivalent conversion needs to be moved into
enclosingBlock.
     RefPtrWillBeRawPtr<Element> startBlock =
enclosingBlock(insertionPosition.parentAnchoredEquivalent().containerNode());
     Node* listChildNode =
enclosingListChild(insertionPosition.parentAnchoredEquivalent().containerNode());
-    RefPtrWillBeRawPtr<Element> listChild = listChildNode &&
listChildNode->isHTMLElement() ? toHTMLElement(listChildNode) : 0;
+    RefPtrWillBeRawPtr<HTMLElement> listChild = listChildNode &&
listChildNode->isHTMLElement() ? toHTMLElement(listChildNode) : 0;
     Position canonicalPos =
VisiblePosition(insertionPosition).deepEquivalent();
     if (!startBlock
         || !startBlock->nonShadowBoundaryParentNode()
@@ -221,7 +221,7 @@ void InsertParagraphSeparatorCommand::doApply()
             if (isFirstInBlock &&
!lineBreakExistsAtVisiblePosition(visiblePos)) {
                 // The block is empty.  Create an empty block to
                 // represent the paragraph that we're leaving.
-                RefPtrWillBeRawPtr<Element> extraBlock =
createDefaultParagraphElement(document());
+                RefPtrWillBeRawPtr<HTMLElement> extraBlock =
createDefaultParagraphElement(document());
                 appendNode(extraBlock, startBlock);
                 appendBlockPlaceholder(extraBlock);
             }
@@ -229,7 +229,7 @@ void InsertParagraphSeparatorCommand::doApply()
         } else {
             // We can get here if we pasted a copied portion of a blockquote
with a newline at the end and are trying to paste it
             // into an unquoted area. We then don't want the newline within the
blockquote or else it will also be quoted.
-            if (m_pasteBlockqutoeIntoUnquotedArea) {
+            if (m_pasteBlockquoteIntoUnquotedArea) {
                 if (Node* highestBlockquote =
highestEnclosingNodeOfType(canonicalPos, &isMailBlockquote))
                     startBlock = toElement(highestBlockquote);
             }
@@ -241,10 +241,10 @@ void InsertParagraphSeparatorCommand::doApply()
             } else {
                 // Most of the time we want to stay at the nesting level of the
startBlock (e.g., when nesting within lists). However,
                 // for div nodes, this can result in nested div tags that are
hard to break out of.
-                Element* siblingNode = startBlock.get();
+                Element* siblingElement = startBlock.get();
                 if (isHTMLDivElement(*blockToInsert))
-                    siblingNode =
highestVisuallyEquivalentDivBelowRoot(startBlock.get());
-                insertNodeAfter(blockToInsert, siblingNode);
+                    siblingElement =
highestVisuallyEquivalentDivBelowRoot(startBlock.get());
+                insertNodeAfter(blockToInsert, siblingElement);
             }
         }

[Inactive, 2014-07-29 20:47:11]

The CQ bit was checked by ch.dumez@samsung.com

[commit-bot: I haz the power, 2014-07-29 20:48:13]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/423003003/20001

[commit-bot: I haz the power, 2014-07-29 22:05:03]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/mac_blink_compile_dbg/bu...)
  win_blink_compile_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_compile_dbg/bu...)

[commit-bot: I haz the power, 2014-07-29 22:23:08]

Change committed as 179180