| Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| index aedf11027a24dc5cfa9a9215552689f78ead0496..ed7babe5851c47882c3bba047892c1e6bfa06431 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| @@ -32,10 +32,10 @@
|
| #include "core/layout/TextAutosizer.h"
|
| #include "core/style/AppliedTextDecoration.h"
|
| #include "core/style/BorderEdge.h"
|
| -#include "core/style/ContentData.h"
|
| -#include "core/style/DataEquivalency.h"
|
| #include "core/style/ComputedStyleConstants.h"
|
| +#include "core/style/ContentData.h"
|
| #include "core/style/CursorData.h"
|
| +#include "core/style/DataEquivalency.h"
|
| #include "core/style/QuotesData.h"
|
| #include "core/style/ShadowList.h"
|
| #include "core/style/StyleImage.h"
|
| @@ -52,8 +52,8 @@
|
| #include "platform/transforms/TranslateTransformOperation.h"
|
| #include "wtf/MathExtras.h"
|
| #include "wtf/PtrUtil.h"
|
| -
|
| #include <algorithm>
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -406,7 +406,7 @@ ComputedStyle* ComputedStyle::addCachedPseudoStyle(PassRefPtr<ComputedStyle> pse
|
| ComputedStyle* result = pseudo.get();
|
|
|
| if (!m_cachedPseudoStyles)
|
| - m_cachedPseudoStyles = adoptPtr(new PseudoStyleCache);
|
| + m_cachedPseudoStyles = wrapUnique(new PseudoStyleCache);
|
|
|
| m_cachedPseudoStyles->append(pseudo);
|
|
|
| @@ -1149,9 +1149,9 @@ const CounterDirectiveMap* ComputedStyle::counterDirectives() const
|
|
|
| CounterDirectiveMap& ComputedStyle::accessCounterDirectives()
|
| {
|
| - OwnPtr<CounterDirectiveMap>& map = rareNonInheritedData.access()->m_counterDirectives;
|
| + std::unique_ptr<CounterDirectiveMap>& map = rareNonInheritedData.access()->m_counterDirectives;
|
| if (!map)
|
| - map = adoptPtr(new CounterDirectiveMap);
|
| + map = wrapUnique(new CounterDirectiveMap);
|
| return *map;
|
| }
|
|
|
|
|