| Index: third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| index 54996390d12205474a717055e30bb1efb70d448d..b409ffc155eb7814fdf3ecb31b853b5772a8af0b 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
|
| @@ -9,8 +9,6 @@
|
| #include "core/css/resolver/StyleResolverState.h"
|
| #include "platform/LengthFunctions.h"
|
| #include "platform/fonts/FontDescription.h"
|
| -#include "wtf/PtrUtil.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -18,9 +16,9 @@ namespace {
|
|
|
| class IsMonospaceChecker : public InterpolationType::ConversionChecker {
|
| public:
|
| - static std::unique_ptr<IsMonospaceChecker> create(bool isMonospace)
|
| + static PassOwnPtr<IsMonospaceChecker> create(bool isMonospace)
|
| {
|
| - return wrapUnique(new IsMonospaceChecker(isMonospace));
|
| + return adoptPtr(new IsMonospaceChecker(isMonospace));
|
| }
|
| private:
|
| IsMonospaceChecker(bool isMonospace)
|
| @@ -37,9 +35,9 @@ private:
|
|
|
| class InheritedFontSizeChecker : public InterpolationType::ConversionChecker {
|
| public:
|
| - static std::unique_ptr<InheritedFontSizeChecker> create(const FontDescription::Size& inheritedFontSize)
|
| + static PassOwnPtr<InheritedFontSizeChecker> create(const FontDescription::Size& inheritedFontSize)
|
| {
|
| - return wrapUnique(new InheritedFontSizeChecker(inheritedFontSize));
|
| + return adoptPtr(new InheritedFontSizeChecker(inheritedFontSize));
|
| }
|
|
|
| private:
|
| @@ -99,7 +97,7 @@ InterpolationValue CSSFontSizeInterpolationType::maybeConvertInherit(const Style
|
|
|
| InterpolationValue CSSFontSizeInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
|
| {
|
| - std::unique_ptr<InterpolableValue> result = CSSLengthInterpolationType::maybeConvertCSSValue(value).interpolableValue;
|
| + OwnPtr<InterpolableValue> result = CSSLengthInterpolationType::maybeConvertCSSValue(value).interpolableValue;
|
| if (result)
|
| return InterpolationValue(std::move(result));
|
|
|
|
|