third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp - Issue 1686483002: Oilpan: Remove most WillBe types from the code base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.h ('k') | third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp

diff --git a/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp b/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp

index c2885ad6ff3e7292f226be14beb9515650a50615..97cf3ee4a47e902ea23788525e6538fcef7e0383 100644

--- a/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp

+++ b/third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp

@@ -66,7 +66,7 @@ void FormatBlockCommand::formatSelection(const VisiblePosition& startOfSelection

m_didApply = true;

}

-void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>& blockElement, EditingState* editingState)

+void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RawPtr<HTMLElement>& blockElement, EditingState* editingState)

{

Element* refElement = enclosingBlockFlowElement(createVisiblePosition(end));

Element* root = rootEditableElementOf(start);

@@ -75,9 +75,9 @@ void FormatBlockCommand::formatRange(const Position& start, const Position& end,

return;

Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.anchorNode());

- RefPtrWillBeRawPtr<Node> outerBlock = (start.anchorNode() == nodeToSplitTo) ? start.anchorNode() : splitTreeToNode(start.anchorNode(), nodeToSplitTo).get();

- RefPtrWillBeRawPtr<Node> nodeAfterInsertionPosition = outerBlock;

- RefPtrWillBeRawPtr<Range> range = Range::create(document(), start, endOfSelection);

+ RawPtr<Node> outerBlock = (start.anchorNode() == nodeToSplitTo) ? start.anchorNode() : splitTreeToNode(start.anchorNode(), nodeToSplitTo).get();

+ RawPtr<Node> nodeAfterInsertionPosition = outerBlock;

+ RawPtr<Range> range = Range::create(document(), start, endOfSelection);

if (isElementForFormatBlock(refElement->tagQName()) && createVisiblePosition(start).deepEquivalent() == startOfBlock(createVisiblePosition(start)).deepEquivalent()

&& (createVisiblePosition(end).deepEquivalent() == endOfBlock(createVisiblePosition(end)).deepEquivalent() || isNodeVisiblyContainedWithin(*refElement, *range))