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

Unified Diff: third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp

Issue 1703903002: Editing: Remove unreasonable ASSERT_NO_EDITING_ABORT instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | third_party/WebKit/Source/core/editing/commands/EditingState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
index 001a63c9ac53960c5e43bd79fda352c8f678237d..a072725af790dd365d5fadf1b45c2cea4a0cdf3a 100644
--- a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
@@ -1154,7 +1154,9 @@ void ApplyStyleCommand::pushDownInlineStyleAroundNode(EditingStyle* style, Node*
element->removeAttribute(HTMLNames::idAttr);
if (isHTMLAnchorElement(element))
element->removeAttribute(HTMLNames::nameAttr);
- surroundNodeRangeWithElement(child, child, wrapper, ASSERT_NO_EDITING_ABORT);
+ surroundNodeRangeWithElement(child, child, wrapper, editingState);
+ if (editingState->isAborted())
+ return;
}
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/editing/commands/EditingState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698