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 2f0c98f78df8b94055def04cbc67dc3db7bdd15f..6760b32cc894ec6aa1f6ee06ac51aa90d515e693 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
@@ -1876,7 +1876,7 @@ void LayoutBox::dirtyLineBoxes(bool fullLayout) |
void LayoutBox::positionLineBox(InlineBox* box) |
{ |
if (isOutOfFlowPositioned()) { |
- // Cache the x position only if we were an INLINE type originally. |
alancutter (OOO until 2018)
2016/09/26 04:23:46
This should not change.
|
+ // Cache the x position only if we were an EDisplay::Inline type originally. |
bool originallyInline = style()->isOriginalDisplayInlineType(); |
if (originallyInline) { |
// The value is cached in the xPos of the box. We only need this value if |
@@ -2817,7 +2817,7 @@ bool LayoutBox::skipContainingBlockForPercentHeightCalculation(const LayoutBox* |
// objects, such as table-cells, will be treated just as if they were non-anonymous. |
if (containingBlock->isAnonymous()) { |
EDisplay display = containingBlock->styleRef().display(); |
- return display == BLOCK || display == INLINE_BLOCK; |
+ return display == EDisplay::Block || display == EDisplay::InlineBlock; |
} |
// For quirks mode, we skip most auto-height containing blocks when computing percentages. |