third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp - Issue 1854423002: ASSERT -> {DCHECK|DCHECK_XX}, ENABLE(ASSERT) -> DCHECK_IS_ON() in dom

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/dom/DocumentStyleSheetCollection.cpp

Issue 1854423002: ASSERT -> {DCHECK|DCHECK_XX}, ENABLE(ASSERT) -> DCHECK_IS_ON() in dom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: mark svg/as-image/svg-nested.html crash on win 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

« no previous file with comments | « third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp ('k') | third_party/WebKit/Source/core/dom/DocumentType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp

diff --git a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp

index 028b48bccd0f718544382728f435bf662eb1a3a8..5dd079acb7e773daad4141caab0362cc39f06a44 100644

--- a/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp

+++ b/third_party/WebKit/Source/core/dom/DocumentStyleSheetCollection.cpp

@@ -40,7 +40,7 @@ namespace blink {

DocumentStyleSheetCollection::DocumentStyleSheetCollection(TreeScope& treeScope)

: TreeScopeStyleSheetCollection(treeScope)

{

- ASSERT(treeScope.rootNode() == treeScope.rootNode().document());

+ DCHECK_EQ(treeScope.rootNode(), treeScope.rootNode().document());

}

void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine& engine, DocumentStyleSheetCollector& collector)

@@ -48,7 +48,7 @@ void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine&

for (Node* n : m_styleSheetCandidateNodes) {

StyleSheetCandidate candidate(*n);

- ASSERT(!candidate.isXSL());

+ DCHECK(!candidate.isXSL());

if (candidate.isImport()) {

Document* document = candidate.importedDocument();

if (!document)

@@ -81,7 +81,7 @@ void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine&

void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine& engine, DocumentStyleSheetCollector& collector)

{

- ASSERT(&document().styleEngine() == &engine);

+ DCHECK_EQ(&document().styleEngine(), &engine);

collector.appendActiveStyleSheets(engine.injectedAuthorStyleSheets());

collectStyleSheetsFromCandidates(engine, collector);

}

@@ -105,7 +105,7 @@ void DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine& engine,

engine.clearFontCache();

} else if (StyleResolver* styleResolver = engine.resolver()) {

if (change.styleResolverUpdateType != Additive) {

- ASSERT(change.styleResolverUpdateType == Reset);

+ DCHECK_EQ(change.styleResolverUpdateType, Reset);

styleResolver->resetAuthorStyle(treeScope());

engine.removeFontFaceRules(change.fontFaceRulesToRemove);

styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets);