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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 5 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
6 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * Copyright (C) 2011 Motorola Mobility, Inc. All rights reserved. 8 * Copyright (C) 2011 Motorola Mobility, Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 element->setAttribute(selectedAttr, emptyAtom); 85 element->setAttribute(selectedAttr, emptyAtom);
86 element->setSelected(selected); 86 element->setSelected(selected);
87 87
88 return element; 88 return element;
89 } 89 }
90 90
91 void HTMLOptionElement::attachLayoutTree(const AttachContext& context) 91 void HTMLOptionElement::attachLayoutTree(const AttachContext& context)
92 { 92 {
93 AttachContext optionContext(context); 93 AttachContext optionContext(context);
94 if (context.resolvedStyle) { 94 if (context.resolvedStyle) {
95 ASSERT(!m_style || m_style == context.resolvedStyle); 95 DCHECK(!m_style || m_style == context.resolvedStyle);
96 m_style = context.resolvedStyle; 96 m_style = context.resolvedStyle;
97 } else if (parentComputedStyle()) { 97 } else if (parentComputedStyle()) {
98 updateNonComputedStyle(); 98 updateNonComputedStyle();
99 optionContext.resolvedStyle = m_style.get(); 99 optionContext.resolvedStyle = m_style.get();
100 } 100 }
101 HTMLElement::attachLayoutTree(optionContext); 101 HTMLElement::attachLayoutTree(optionContext);
102 } 102 }
103 103
104 void HTMLOptionElement::detachLayoutTree(const AttachContext& context) 104 void HTMLOptionElement::detachLayoutTree(const AttachContext& context)
105 { 105 {
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 // If m_style is not set, then the node is still unattached. 457 // If m_style is not set, then the node is still unattached.
458 // We have to wait till it gets attached to read the display property. 458 // We have to wait till it gets attached to read the display property.
459 if (!m_style) 459 if (!m_style)
460 return false; 460 return false;
461 461
462 if (m_style->display() != NONE) { 462 if (m_style->display() != NONE) {
463 // We need to check the parent's display property. Parent's 463 // We need to check the parent's display property. Parent's
464 // display:none doesn't override children's display properties in 464 // display:none doesn't override children's display properties in
465 // ComputedStyle. 465 // ComputedStyle.
466 Element* parent = parentElement(); 466 Element* parent = parentElement();
467 ASSERT(parent); 467 DCHECK(parent);
468 if (isHTMLOptGroupElement(*parent)) { 468 if (isHTMLOptGroupElement(*parent)) {
469 const ComputedStyle* parentStyle = parent->computedStyle() ? parent- >computedStyle() : parent->ensureComputedStyle(); 469 const ComputedStyle* parentStyle = parent->computedStyle() ? parent- >computedStyle() : parent->ensureComputedStyle();
470 return !parentStyle || parentStyle->display() == NONE; 470 return !parentStyle || parentStyle->display() == NONE;
471 } 471 }
472 } 472 }
473 return m_style->display() == NONE; 473 return m_style->display() == NONE;
474 } 474 }
475 475
476 } // namespace blink 476 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698