| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| index 2d85a295f4cee8d0bc4b7c8adf0b8acd317c1327..da3c689eb279b90f9eaf8e78a50e8e219029dc6c 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -3212,7 +3212,7 @@ bool LayoutBox::skipContainingBlockForPercentHeightCalculation(
|
| // non-anonymous.
|
| if (containingBlock->isAnonymous()) {
|
| EDisplay display = containingBlock->styleRef().display();
|
| - return display == EDisplay::Block || display == EDisplay::InlineBlock;
|
| + return display == EDisplay::kBlock || display == EDisplay::kInlineBlock;
|
| }
|
|
|
| // For quirks mode, we skip most auto-height containing blocks when computing
|
| @@ -4757,7 +4757,7 @@ bool LayoutBox::avoidsFloats() const {
|
| return shouldBeConsideredAsReplaced() || hasOverflowClip() || isHR() ||
|
| isLegend() || isWritingModeRoot() || isFlexItemIncludingDeprecated() ||
|
| style()->containsPaint() || style()->containsLayout() ||
|
| - style()->display() == EDisplay::FlowRoot;
|
| + style()->display() == EDisplay::kFlowRoot;
|
| }
|
|
|
| bool LayoutBox::hasNonCompositedScrollbars() const {
|
|
|