Chromium Code Reviews| Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
| index d03cab1f7eac3f6a493566bf98995f1269f6e99a..a6a639942125a6f6caaef0cf21b9444f610bd0ac 100644 |
| --- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp |
| @@ -45,6 +45,7 @@ |
| #include "core/css/CSSValuePair.h" |
| #include "core/css/resolver/FilterOperationResolver.h" |
| #include "core/frame/LocalFrame.h" |
| +#include "core/style/TextSizeAdjust.h" |
| #include "core/svg/SVGURIReference.h" |
| #include "platform/transforms/RotateTransformOperation.h" |
| #include "platform/transforms/ScaleTransformOperation.h" |
| @@ -937,6 +938,21 @@ float StyleBuilderConverter::convertTextStrokeWidth(StyleResolverState& state, c |
| return primitiveValue.computeLength<float>(state.cssToLengthConversionData()); |
| } |
| +TextSizeAdjust StyleBuilderConverter::convertTextSizeAdjust(StyleResolverState& state, const CSSValue& value) |
| +{ |
| + if (value.isPrimitiveValue()) { |
|
Timothy Loh
2016/06/28 00:50:25
I'd probably write
const CSSPrimitiveValue& primi
pdr.
2016/06/28 16:38:57
I wasn't sure this would work but it is better tha
|
| + const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
| + |
| + if (primitiveValue.getValueID() == CSSValueNone) |
| + return TextSizeAdjust::adjustNone(); |
| + |
| + if (primitiveValue.isPercentage()) |
| + return TextSizeAdjust(primitiveValue.getFloatValue() / 100.0f); |
| + } |
| + |
| + return TextSizeAdjust::adjustAuto(); |
| +} |
| + |
| TransformOrigin StyleBuilderConverter::convertTransformOrigin(StyleResolverState& state, const CSSValue& value) |
| { |
| const CSSValueList& list = toCSSValueList(value); |