Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

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
« no previous file with comments | « LayoutTests/editing/style/remove-format-without-enclosing-block-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 »

Powered by Google App Engine
This is Rietveld 408576698