| Index: third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| diff --git a/third_party/WebKit/Source/core/layout/TextAutosizer.h b/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| index 4f3a2a645fc51d12469aff3797c6a1dd6b754694..c680135a98ef80cbe7439e40157a15c9e255a616 100644
|
| --- a/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| +++ b/third_party/WebKit/Source/core/layout/TextAutosizer.h
|
| @@ -36,8 +36,7 @@
|
| #include "wtf/HashMap.h"
|
| #include "wtf/HashSet.h"
|
| #include "wtf/Noncopyable.h"
|
| -#include "wtf/OwnPtr.h"
|
| -
|
| +#include <memory>
|
| #include <unicode/uchar.h>
|
|
|
| namespace blink {
|
| @@ -207,8 +206,8 @@ private:
|
| "sizeof(FingerprintSourceData) must be a multiple of UChar");
|
|
|
| typedef unsigned Fingerprint;
|
| - typedef HashMap<Fingerprint, OwnPtr<Supercluster>> SuperclusterMap;
|
| - typedef Vector<OwnPtr<Cluster>> ClusterStack;
|
| + typedef HashMap<Fingerprint, std::unique_ptr<Supercluster>> SuperclusterMap;
|
| + typedef Vector<std::unique_ptr<Cluster>> ClusterStack;
|
|
|
| // Fingerprints are computed during style recalc, for (some subset of)
|
| // blocks that will become cluster roots.
|
| @@ -224,7 +223,7 @@ private:
|
| bool hasFingerprints() const { return !m_fingerprints.isEmpty(); }
|
| private:
|
| typedef HashMap<const LayoutObject*, Fingerprint> FingerprintMap;
|
| - typedef HashMap<Fingerprint, OwnPtr<BlockSet>> ReverseFingerprintMap;
|
| + typedef HashMap<Fingerprint, std::unique_ptr<BlockSet>> ReverseFingerprintMap;
|
|
|
| FingerprintMap m_fingerprints;
|
| ReverseFingerprintMap m_blocksForFingerprint;
|
|
|