| Index: third_party/WebKit/Source/core/dom/Element.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
|
| index cde1c106f18ac2c7486d7dc8bb4f209158ab2c4d..73df10be9ca623e3840c41e4ff9f5f7ac84d9750 100644
|
| --- a/third_party/WebKit/Source/core/dom/Element.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/Element.cpp
|
| @@ -1574,8 +1574,8 @@ const AtomicString Element::imageSourceURL() const {
|
| }
|
|
|
| bool Element::layoutObjectIsNeeded(const ComputedStyle& style) {
|
| - return style.display() != EDisplay::None &&
|
| - style.display() != EDisplay::Contents;
|
| + return style.display() != EDisplay::kNone &&
|
| + style.display() != EDisplay::kContents;
|
| }
|
|
|
| LayoutObject* Element::createLayoutObject(const ComputedStyle& style) {
|
| @@ -3196,18 +3196,18 @@ const ComputedStyle* Element::nonLayoutObjectComputedStyle() const {
|
|
|
| bool Element::hasDisplayContentsStyle() const {
|
| if (const ComputedStyle* style = nonLayoutObjectComputedStyle())
|
| - return style->display() == EDisplay::Contents;
|
| + return style->display() == EDisplay::kContents;
|
| return false;
|
| }
|
|
|
| bool Element::shouldStoreNonLayoutObjectComputedStyle(
|
| const ComputedStyle& style) const {
|
| #if DCHECK_IS_ON()
|
| - if (style.display() == EDisplay::Contents)
|
| + if (style.display() == EDisplay::kContents)
|
| DCHECK(!layoutObject());
|
| #endif
|
|
|
| - return style.display() == EDisplay::Contents ||
|
| + return style.display() == EDisplay::kContents ||
|
| isHTMLOptGroupElement(*this) || isHTMLOptionElement(*this);
|
| }
|
|
|
|
|