third_party/WebKit/Source/core/html/HTMLOptionElement.cpp - Issue 2258033002: Replace ASSERT()s with DCHECK*() in core/html/*.{cpp,h}.

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/html/HTMLOptionElement.cpp

Issue 2258033002: Replace ASSERT()s with DCHECK*() in core/html/*.{cpp,h}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Replace ASSERT()s with DCHECK*() in core/html/*.{cpp,h}. Created 4 years, 4 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/html/HTMLOptGroupElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLOptionsCollection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLOptionElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp

index 36f6e5c6a763dbf5e2b6aff3cccaf82c549dfa3f..8579ebb7a9d36d0aed8949160d8e348b8b7bd91e 100644

--- a/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLOptionElement.cpp

@@ -92,7 +92,7 @@ void HTMLOptionElement::attachLayoutTree(const AttachContext& context)

{

AttachContext optionContext(context);

if (context.resolvedStyle) {

- ASSERT(!m_style || m_style == context.resolvedStyle);

+ DCHECK(!m_style || m_style == context.resolvedStyle);

m_style = context.resolvedStyle;

} else if (parentComputedStyle()) {

updateNonComputedStyle();

@@ -464,7 +464,7 @@ bool HTMLOptionElement::isDisplayNone() const

// display:none doesn't override children's display properties in

// ComputedStyle.

Element* parent = parentElement();

- ASSERT(parent);

+ DCHECK(parent);

if (isHTMLOptGroupElement(*parent)) {

const ComputedStyle* parentStyle = parent->computedStyle() ? parent->computedStyle() : parent->ensureComputedStyle();

return !parentStyle || parentStyle->display() == NONE;