third_party/WebKit/Source/core/editing/commands/FormatBlockCommand.cpp - Issue 2788473003: Use EphmeralRange insteadof Range in CompositeEditCommands::isNodeVisiblyContainedWithin()

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 2788473003: Use EphmeralRange insteadof Range in CompositeEditCommands::isNodeVisiblyContainedWithin()

Patch Set: update Created 3 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

« third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/InsertListCommand.cpp » ('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 ef9aa38619ca0c7e660aeefaa97bda058fb75337..24a81d210d3e7d6d00d819e412bb1cede8eef6c7 100644

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

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

@@ -84,7 +84,7 @@ void FormatBlockCommand::formatRange(const Position& start,

? start.anchorNode()

: splitTreeToNode(start.anchorNode(), nodeToSplitTo);

Node* nodeAfterInsertionPosition = outerBlock;

- Range* range = Range::create(document(), start, endOfSelection);

+ const EphemeralRange range = EphemeralRange(start, endOfSelection);

document().updateStyleAndLayoutIgnorePendingStylesheets();

if (isElementForFormatBlock(refElement->tagQName()) &&

@@ -92,7 +92,7 @@ void FormatBlockCommand::formatRange(const Position& start,

startOfBlock(createVisiblePosition(start)).deepEquivalent() &&

(createVisiblePosition(end).deepEquivalent() ==

endOfBlock(createVisiblePosition(end)).deepEquivalent() ||

- isNodeVisiblyContainedWithin(*refElement, *range)) &&

+ isNodeVisiblyContainedWithin(*refElement, range)) &&

refElement != root && !root->isDescendantOf(refElement)) {

// Already in a block element that only contains the current paragraph

if (refElement->hasTagName(tagName()))