Source/core/editing/ApplyStyleCommand.cpp - Issue 335773002: Don't move uneditable paragraph contents in CompositeEditCommand::moveParagraphContentsToNewBlockIfN

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/core/editing/ApplyStyleCommand.cpp

Issue 335773002: Don't move uneditable paragraph contents in CompositeEditCommand::moveParagraphContentsToNewBlockIfN (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 2014-06-16T12:44:07 Created 6 years, 6 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/justy-center-with-uneditable-crash-expected.txt ('k') | Source/core/editing/CompositeEditCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/editing/ApplyStyleCommand.cpp

diff --git a/Source/core/editing/ApplyStyleCommand.cpp b/Source/core/editing/ApplyStyleCommand.cpp

index 6638f846bd1182d0e3c0efa2753ab91210b6a1d4..d06b74d87e3c4ba5a0de518b45bf2f4b23b6cdb6 100644

--- a/Source/core/editing/ApplyStyleCommand.cpp

+++ b/Source/core/editing/ApplyStyleCommand.cpp

@@ -265,8 +265,9 @@ void ApplyStyleCommand::applyBlockStyle(EditingStyle *style)

StyleChange styleChange(style, paragraphStart.deepEquivalent());

if (styleChange.cssStyle().length() || m_removeOnly) {

RefPtrWillBeRawPtr<Node> block = enclosingBlock(paragraphStart.deepEquivalent().deprecatedNode());

- if (!m_removeOnly) {

- RefPtrWillBeRawPtr<Element> newBlock = moveParagraphContentsToNewBlockIfNecessary(paragraphStart.deepEquivalent());

+ const Position& paragraphStartToMove = paragraphStart.deepEquivalent();

+ if (!m_removeOnly && isEditablePosition(paragraphStartToMove)) {

+ RefPtrWillBeRawPtr<Element> newBlock = moveParagraphContentsToNewBlockIfNecessary(paragraphStartToMove);

if (newBlock)

block = newBlock;

}