| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index c058e29af5d0487ca3aa94a51064dd23e143722f..4e50f807ae2c8834e59693536f0eea6791bfc644 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -28,9 +28,9 @@
|
| #include "core/CSSPropertyNames.h"
|
| #include "core/CoreExport.h"
|
| #include "core/style/BorderValue.h"
|
| +#include "core/style/ComputedStyleConstants.h"
|
| #include "core/style/CounterDirectives.h"
|
| #include "core/style/DataRef.h"
|
| -#include "core/style/ComputedStyleConstants.h"
|
| #include "core/style/LineClampValue.h"
|
| #include "core/style/NinePieceImage.h"
|
| #include "core/style/SVGComputedStyle.h"
|
| @@ -71,9 +71,9 @@
|
| #include "platform/transforms/TransformOperations.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/LeakAnnotations.h"
|
| -#include "wtf/OwnPtr.h"
|
| #include "wtf/RefCounted.h"
|
| #include "wtf/Vector.h"
|
| +#include <memory>
|
|
|
| template<typename T, typename U> inline bool compareEqual(const T& t, const U& u) { return t == static_cast<T>(u); }
|
|
|
| @@ -153,7 +153,7 @@ protected:
|
| DataRef<StyleInheritedData> inherited;
|
|
|
| // list of associated pseudo styles
|
| - OwnPtr<PseudoStyleCache> m_cachedPseudoStyles;
|
| + std::unique_ptr<PseudoStyleCache> m_cachedPseudoStyles;
|
|
|
| DataRef<SVGComputedStyle> m_svgStyle;
|
|
|
|
|