| Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| index c465e29f0a0273b7efebcac85ef9f08ed9f0c756..909904ef298581529698c93e6ef86d1fb8f4a795 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| @@ -372,7 +372,7 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
|
| const CSSValue& value) {
|
| state.Style()->ResetPageSizeType();
|
| FloatSize size;
|
| - PageSizeType page_size_type = PAGE_SIZE_AUTO;
|
| + PageSizeType page_size_type = PageSizeType::kAuto;
|
| const CSSValueList& list = ToCSSValueList(value);
|
| if (list.length() == 2) {
|
| // <length>{2} | <page-size> <orientation>
|
| @@ -394,14 +394,14 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
|
| if (ToCSSIdentifierValue(second).GetValueID() == CSSValueLandscape)
|
| size = size.TransposedSize();
|
| }
|
| - page_size_type = PAGE_SIZE_RESOLVED;
|
| + page_size_type = PageSizeType::kResolved;
|
| } else {
|
| DCHECK_EQ(list.length(), 1U);
|
| // <length> | auto | <page-size> | [ portrait | landscape]
|
| const CSSValue& first = list.Item(0);
|
| if (first.IsPrimitiveValue() && ToCSSPrimitiveValue(first).IsLength()) {
|
| // <length>
|
| - page_size_type = PAGE_SIZE_RESOLVED;
|
| + page_size_type = PageSizeType::kResolved;
|
| float width = ToCSSPrimitiveValue(first).ComputeLength<float>(
|
| state.CssToLengthConversionData().CopyWithAdjustedZoom(1.0));
|
| size = FloatSize(width, width);
|
| @@ -409,17 +409,17 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
|
| const CSSIdentifierValue& ident = ToCSSIdentifierValue(first);
|
| switch (ident.GetValueID()) {
|
| case CSSValueAuto:
|
| - page_size_type = PAGE_SIZE_AUTO;
|
| + page_size_type = PageSizeType::kAuto;
|
| break;
|
| case CSSValuePortrait:
|
| - page_size_type = PAGE_SIZE_AUTO_PORTRAIT;
|
| + page_size_type = PageSizeType::kPortrait;
|
| break;
|
| case CSSValueLandscape:
|
| - page_size_type = PAGE_SIZE_AUTO_LANDSCAPE;
|
| + page_size_type = PageSizeType::kLandscape;
|
| break;
|
| default:
|
| // <page-size>
|
| - page_size_type = PAGE_SIZE_RESOLVED;
|
| + page_size_type = PageSizeType::kResolved;
|
| size = GetPageSizeFromName(ident);
|
| }
|
| }
|
|
|