WebCore/editing/DeleteSelectionCommand.cpp - Issue 3092017: Merge 63773 - 2010-07-20 Abhishek Arya <inferno@chromium.org>...

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

Issue 3092017: Merge 63773 - 2010-07-20 Abhishek Arya <inferno@chromium.org>... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/WebKit/375/

Patch Set: Created 10 years, 4 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/execCommand/editing-nontext-node-crash-expected.txt ('k') | WebCore/editing/InsertLineBreakCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: WebCore/editing/DeleteSelectionCommand.cpp

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

--- WebCore/editing/DeleteSelectionCommand.cpp (revision 55442)

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

@@ -537,12 +537,12 @@

{

updateLayout();

// FIXME: isRenderedCharacter should be removed, and we should use VisiblePosition::characterAfter and VisiblePosition::characterBefore

- if (m_leadingWhitespace.isNotNull() && !m_leadingWhitespace.isRenderedCharacter()) {

+ if (m_leadingWhitespace.isNotNull() && !m_leadingWhitespace.isRenderedCharacter() && m_leadingWhitespace.node()->isTextNode()) {

Text* textNode = static_cast<Text*>(m_leadingWhitespace.node());

ASSERT(!textNode->renderer() || textNode->renderer()->style()->collapseWhiteSpace());

replaceTextInNode(textNode, m_leadingWhitespace.deprecatedEditingOffset(), 1, nonBreakingSpaceString());

}

- if (m_trailingWhitespace.isNotNull() && !m_trailingWhitespace.isRenderedCharacter()) {

+ if (m_trailingWhitespace.isNotNull() && !m_trailingWhitespace.isRenderedCharacter() && m_trailingWhitespace.node()->isTextNode()) {

Text* textNode = static_cast<Text*>(m_trailingWhitespace.node());

ASSERT(!textNode->renderer() ||textNode->renderer()->style()->collapseWhiteSpace());

replaceTextInNode(textNode, m_trailingWhitespace.deprecatedEditingOffset(), 1, nonBreakingSpaceString());