Source/WebCore/editing/DeleteSelectionCommand.cpp - Issue 10451004: Merge 116653

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: Source/WebCore/editing/DeleteSelectionCommand.cpp

Issue 10451004: Merge 116653 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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 | « LayoutTests/editing/inserting/insert-paragraph-seperator-crash-expected.txt ('k') | Source/WebCore/editing/IndentOutdentCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/editing/DeleteSelectionCommand.cpp

===================================================================

--- Source/WebCore/editing/DeleteSelectionCommand.cpp (revision 118286)

+++ Source/WebCore/editing/DeleteSelectionCommand.cpp (working copy)

@@ -579,7 +579,7 @@

// m_downstreamEnd's block has been emptied out by deletion. There is no content inside of it to

// move, so just remove it.

- Element* endBlock = static_cast<Element*>(enclosingBlock(m_downstreamEnd.deprecatedNode()));

+ Element* endBlock = enclosingBlock(m_downstreamEnd.deprecatedNode());

if (!endBlock || !endBlock->contains(startOfParagraphToMove.deepEquivalent().deprecatedNode()) || !startOfParagraphToMove.deepEquivalent().deprecatedNode()) {

removeNode(enclosingBlock(m_downstreamEnd.deprecatedNode()));

return;