| Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| index e913d31e1340f849c08cc1f8b86a41dd5aee504c..47f651423735866b529fb7f1db42c3091864f57d 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| @@ -922,9 +922,9 @@ LayoutBlock* LayoutObject::containingBlock(AncestorSkipInfo* skipInfo) const {
|
| if (!object && isLayoutScrollbarPart())
|
| object = toLayoutScrollbarPart(this)->scrollbarStyleSource();
|
| if (!isTextOrSVGChild()) {
|
| - if (m_style->position() == FixedPosition)
|
| + if (m_style->position() == EPosition::kFixed)
|
| return containerForFixedPosition(skipInfo);
|
| - if (m_style->position() == AbsolutePosition)
|
| + if (m_style->position() == EPosition::kAbsolute)
|
| return containingBlockForAbsolutePosition(skipInfo);
|
| }
|
| if (isColumnSpanAll()) {
|
| @@ -2115,8 +2115,9 @@ void LayoutObject::mapLocalToAncestor(const LayoutBoxModelObject* ancestor,
|
| : TransformState::FlattenTransform);
|
| // If the ancestor is fixed, then the rect is already in its coordinates so
|
| // doesn't need viewport-adjusting.
|
| - if (ancestor->style()->position() != FixedPosition &&
|
| - container->isLayoutView() && styleRef().position() == FixedPosition) {
|
| + if (ancestor->style()->position() != EPosition::kFixed &&
|
| + container->isLayoutView() &&
|
| + styleRef().position() == EPosition::kFixed) {
|
| LayoutSize adjustment = toLayoutView(container)->offsetForFixedPosition();
|
| transformState.move(adjustment.width(), adjustment.height());
|
| }
|
| @@ -2194,8 +2195,9 @@ void LayoutObject::mapAncestorToLocal(const LayoutBoxModelObject* ancestor,
|
| transformState.move(-containerOffset.width(), -containerOffset.height());
|
| // If the ancestor is fixed, then the rect is already in its coordinates so
|
| // doesn't need viewport-adjusting.
|
| - if (ancestor->style()->position() != FixedPosition &&
|
| - container->isLayoutView() && styleRef().position() == FixedPosition) {
|
| + if (ancestor->style()->position() != EPosition::kFixed &&
|
| + container->isLayoutView() &&
|
| + styleRef().position() == EPosition::kFixed) {
|
| LayoutSize adjustment = toLayoutView(container)->offsetForFixedPosition();
|
| transformState.move(adjustment.width(), adjustment.height());
|
| }
|
| @@ -2485,10 +2487,10 @@ LayoutObject* LayoutObject::container(AncestorSkipInfo* skipInfo) const {
|
| return parent();
|
|
|
| EPosition pos = m_style->position();
|
| - if (pos == FixedPosition)
|
| + if (pos == EPosition::kFixed)
|
| return containerForFixedPosition(skipInfo);
|
|
|
| - if (pos == AbsolutePosition) {
|
| + if (pos == EPosition::kAbsolute) {
|
| return containerForAbsolutePosition(skipInfo);
|
| }
|
|
|
|
|