| Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
 | 
| diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
 | 
| index d95f1f656d63f77101dd2168c2af526c5b1cb519..b5009c1b789d6e84d85f48e4b8410c160aab5fd3 100644
 | 
| --- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
 | 
| +++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
 | 
| @@ -1934,7 +1934,7 @@ const CSSValue* ComputedStyleCSSValueMapping::get(CSSPropertyID propertyID, cons
 | 
|      case CSSPropertyOrder:
 | 
|          return CSSPrimitiveValue::create(style.order(), CSSPrimitiveValue::UnitType::Number);
 | 
|      case CSSPropertyFloat:
 | 
| -        if (style.display() != NONE && style.hasOutOfFlowPosition())
 | 
| +        if (style.display() != EDisplay::None && style.hasOutOfFlowPosition())
 | 
|              return CSSPrimitiveValue::createIdentifier(CSSValueNone);
 | 
|          return CSSPrimitiveValue::create(style.floating());
 | 
|      case CSSPropertyFont:
 | 
| @@ -2109,7 +2109,7 @@ const CSSValue* ComputedStyleCSSValueMapping::get(CSSPropertyID propertyID, cons
 | 
|          float value;
 | 
|          if (marginRight.isPercentOrCalc()) {
 | 
|              // LayoutBox gives a marginRight() that is the distance between the right-edge of the child box
 | 
| -            // and the right-edge of the containing box, when display == BLOCK. Let's calculate the absolute
 | 
| +            // and the right-edge of the containing box, when display == EDisplay::Block. Let's calculate the absolute
 | 
|              // value of the specified margin-right % instead of relying on LayoutBox's marginRight() value.
 | 
|              value = minimumValueForLength(marginRight, toLayoutBox(layoutObject)->containingBlockLogicalWidthForContent()).toFloat();
 | 
|          } else {
 | 
| 
 |