Commit 9fb4a68c authored by ch.dumez@samsung.com's avatar ch.dumez@samsung.com

Use tighter typing in editing/

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

R=leviw@chromium.org

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

git-svn-id: svn://svn.chromium.org/blink/trunk@178950 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 1a2af5c4
...@@ -111,7 +111,7 @@ void ApplyBlockElementCommand::formatSelection(const VisiblePosition& startOfSel ...@@ -111,7 +111,7 @@ void ApplyBlockElementCommand::formatSelection(const VisiblePosition& startOfSel
// and there's nothing to move. // and there's nothing to move.
Position start = startOfSelection.deepEquivalent().downstream(); Position start = startOfSelection.deepEquivalent().downstream();
if (isAtUnsplittableElement(start)) { if (isAtUnsplittableElement(start)) {
RefPtrWillBeRawPtr<Element> blockquote = createBlockElement(); RefPtrWillBeRawPtr<HTMLElement> blockquote = createBlockElement();
insertNodeAt(blockquote, start); insertNodeAt(blockquote, start);
RefPtrWillBeRawPtr<Element> placeholder = createBreakElement(document()); RefPtrWillBeRawPtr<Element> placeholder = createBreakElement(document());
appendNode(placeholder, blockquote); appendNode(placeholder, blockquote);
...@@ -119,7 +119,7 @@ void ApplyBlockElementCommand::formatSelection(const VisiblePosition& startOfSel ...@@ -119,7 +119,7 @@ void ApplyBlockElementCommand::formatSelection(const VisiblePosition& startOfSel
return; return;
} }
RefPtrWillBeRawPtr<Element> blockquoteForNextIndent = nullptr; RefPtrWillBeRawPtr<HTMLElement> blockquoteForNextIndent = nullptr;
VisiblePosition endOfCurrentParagraph = endOfParagraph(startOfSelection); VisiblePosition endOfCurrentParagraph = endOfParagraph(startOfSelection);
VisiblePosition endOfLastParagraph = endOfParagraph(endOfSelection); VisiblePosition endOfLastParagraph = endOfParagraph(endOfSelection);
VisiblePosition endAfterSelection = endOfParagraph(endOfLastParagraph.next()); VisiblePosition endAfterSelection = endOfParagraph(endOfLastParagraph.next());
...@@ -280,9 +280,9 @@ VisiblePosition ApplyBlockElementCommand::endOfNextParagrahSplittingTextNodesIfN ...@@ -280,9 +280,9 @@ VisiblePosition ApplyBlockElementCommand::endOfNextParagrahSplittingTextNodesIfN
return VisiblePosition(Position(text.get(), position.offsetInContainerNode() - 1)); return VisiblePosition(Position(text.get(), position.offsetInContainerNode() - 1));
} }
PassRefPtrWillBeRawPtr<Element> ApplyBlockElementCommand::createBlockElement() const PassRefPtrWillBeRawPtr<HTMLElement> ApplyBlockElementCommand::createBlockElement() const
{ {
RefPtrWillBeRawPtr<Element> element = createHTMLElement(document(), m_tagName); RefPtrWillBeRawPtr<HTMLElement> element = createHTMLElement(document(), m_tagName);
if (m_inlineStyle.length()) if (m_inlineStyle.length())
element->setAttribute(styleAttr, m_inlineStyle); element->setAttribute(styleAttr, m_inlineStyle);
return element.release(); return element.release();
......
...@@ -42,14 +42,14 @@ protected: ...@@ -42,14 +42,14 @@ protected:
ApplyBlockElementCommand(Document&, const QualifiedName& tagName); ApplyBlockElementCommand(Document&, const QualifiedName& tagName);
virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection); virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection);
PassRefPtrWillBeRawPtr<Element> createBlockElement() const; PassRefPtrWillBeRawPtr<HTMLElement> createBlockElement() const;
const QualifiedName tagName() const { return m_tagName; } const QualifiedName tagName() const { return m_tagName; }
virtual void trace(Visitor*) OVERRIDE; virtual void trace(Visitor*) OVERRIDE;
private: private:
virtual void doApply() OVERRIDE FINAL; virtual void doApply() OVERRIDE FINAL;
virtual void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<Element>&) = 0; virtual void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>&) = 0;
void rangeForParagraphSplittingTextNodesIfNeeded(const VisiblePosition&, Position&, Position&); void rangeForParagraphSplittingTextNodesIfNeeded(const VisiblePosition&, Position&, Position&);
VisiblePosition endOfNextParagrahSplittingTextNodesIfNeeded(VisiblePosition&, Position&, Position&); VisiblePosition endOfNextParagrahSplittingTextNodesIfNeeded(VisiblePosition&, Position&, Position&);
......
...@@ -59,7 +59,7 @@ void FormatBlockCommand::formatSelection(const VisiblePosition& startOfSelection ...@@ -59,7 +59,7 @@ void FormatBlockCommand::formatSelection(const VisiblePosition& startOfSelection
m_didApply = true; m_didApply = true;
} }
void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<Element>& blockNode) void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>& blockNode)
{ {
Element* refNode = enclosingBlockFlowElement(VisiblePosition(end)); Element* refNode = enclosingBlockFlowElement(VisiblePosition(end));
Element* root = editableRootForPosition(start); Element* root = editableRootForPosition(start);
......
...@@ -54,7 +54,7 @@ private: ...@@ -54,7 +54,7 @@ private:
FormatBlockCommand(Document&, const QualifiedName& tagName); FormatBlockCommand(Document&, const QualifiedName& tagName);
virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection) OVERRIDE; virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection) OVERRIDE;
virtual void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<Element>&) OVERRIDE; virtual void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>&) OVERRIDE;
virtual EditAction editingAction() const OVERRIDE { return EditActionFormatBlock; } virtual EditAction editingAction() const OVERRIDE { return EditActionFormatBlock; }
bool m_didApply; bool m_didApply;
......
...@@ -93,7 +93,7 @@ bool IndentOutdentCommand::tryIndentingAsListItem(const Position& start, const P ...@@ -93,7 +93,7 @@ bool IndentOutdentCommand::tryIndentingAsListItem(const Position& start, const P
return true; return true;
} }
void IndentOutdentCommand::indentIntoBlockquote(const Position& start, const Position& end, RefPtrWillBeRawPtr<Element>& targetBlockquote) void IndentOutdentCommand::indentIntoBlockquote(const Position& start, const Position& end, RefPtrWillBeRawPtr<HTMLElement>& targetBlockquote)
{ {
Node* enclosingCell = enclosingNodeOfType(start, &isTableCell); Node* enclosingCell = enclosingNodeOfType(start, &isTableCell);
Node* nodeToSplitTo; Node* nodeToSplitTo;
...@@ -243,7 +243,7 @@ void IndentOutdentCommand::formatSelection(const VisiblePosition& startOfSelecti ...@@ -243,7 +243,7 @@ void IndentOutdentCommand::formatSelection(const VisiblePosition& startOfSelecti
outdentRegion(startOfSelection, endOfSelection); outdentRegion(startOfSelection, endOfSelection);
} }
void IndentOutdentCommand::formatRange(const Position& start, const Position& end, const Position&, RefPtrWillBeRawPtr<Element>& blockquoteForNextIndent) void IndentOutdentCommand::formatRange(const Position& start, const Position& end, const Position&, RefPtrWillBeRawPtr<HTMLElement>& blockquoteForNextIndent)
{ {
if (tryIndentingAsListItem(start, end)) if (tryIndentingAsListItem(start, end))
blockquoteForNextIndent = nullptr; blockquoteForNextIndent = nullptr;
......
...@@ -49,10 +49,10 @@ private: ...@@ -49,10 +49,10 @@ private:
void outdentRegion(const VisiblePosition&, const VisiblePosition&); void outdentRegion(const VisiblePosition&, const VisiblePosition&);
void outdentParagraph(); void outdentParagraph();
bool tryIndentingAsListItem(const Position&, const Position&); bool tryIndentingAsListItem(const Position&, const Position&);
void indentIntoBlockquote(const Position&, const Position&, RefPtrWillBeRawPtr<Element>&); void indentIntoBlockquote(const Position&, const Position&, RefPtrWillBeRawPtr<HTMLElement>&);
virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection) OVERRIDE; virtual void formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection) OVERRIDE;
virtual void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<Element>& blockquoteForNextIndent) OVERRIDE; virtual void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>& blockquoteForNextIndent) OVERRIDE;
EIndentType m_typeOfAction; EIndentType m_typeOfAction;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment