third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp - Issue 1878473002: ASSERT -> DCHECK in core/editing.

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: third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp

Issue 1878473002: ASSERT -> DCHECK in core/editing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Output info for some DCHECKs, add TODOs. Created 4 years, 8 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

« third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/serializers/Serialization.cpp ('k') | third_party/WebKit/Source/core/editing/serializers/StyledMarkupSerializer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp

diff --git a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp

index 6216b4678e23a4e47321a8613e2d1479dd10ed4d..10bc148362e66acbc6ff90021b8fd5c00182b674 100644

--- a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp

+++ b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp

@@ -97,8 +97,8 @@ void StyledMarkupAccumulator::appendTextWithInlineStyle(Text& text, EditingStyle

{

if (inlineStyle) {

// wrappingStyleForAnnotatedSerialization should have removed -webkit-text-decorations-in-effect

- ASSERT(!shouldAnnotate() || propertyMissingOrEqualToNone(inlineStyle->style(), CSSPropertyWebkitTextDecorationsInEffect));

- ASSERT(m_document);

+ DCHECK(!shouldAnnotate() || propertyMissingOrEqualToNone(inlineStyle->style(), CSSPropertyWebkitTextDecorationsInEffect));

+ DCHECK(m_document);

m_result.appendLiteral("<span style=\"");

MarkupFormatter::appendAttributeValue(m_result, inlineStyle->style()->asText(), m_document->isHTMLDocument());

@@ -158,8 +158,8 @@ void StyledMarkupAccumulator::appendElement(StringBuilder& out, const Element& e

void StyledMarkupAccumulator::wrapWithStyleNode(StylePropertySet* style)

{

// wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect

- ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));

- ASSERT(m_document);

+ DCHECK(propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect));

+ DCHECK(m_document);

StringBuilder openTag;

openTag.appendLiteral("<div style=\"");