Source/WebCore/editing/ApplyStyleCommand.cpp - Issue 7862013: Merge 94840 - Crashes in WebCore::ApplyStyleCommand.doApply()

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

Issue 7862013: Merge 94840 - Crashes in WebCore::ApplyStyleCommand.doApply() (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/

Patch Set: Created 9 years, 3 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

Index: Source/WebCore/editing/ApplyStyleCommand.cpp

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

--- Source/WebCore/editing/ApplyStyleCommand.cpp (revision 94880)

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

@@ -281,8 +281,8 @@

if (newBlock)

block = newBlock;

}

- ASSERT(block->isHTMLElement());

- if (block->isHTMLElement()) {

+ ASSERT(!block || block->isHTMLElement());

+ if (block && block->isHTMLElement()) {

removeCSSStyle(style, toHTMLElement(block.get()));

if (!m_removeOnly)

addBlockStyle(styleChange, toHTMLElement(block.get()));

« no previous file with comments | « LayoutTests/editing/style/remove-format-without-enclosing-block-expected.txt ('k') | no next file » | no next file with comments »