Index: third_party/WebKit/Source/core/paint/ObjectPaintProperties.h |
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h |
index 525c5aacf0f5a06a82a68a99bb982d92d5ebcea4..3ebd68e98e8d6a9c468a83ba08496d661afbef21 100644 |
--- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h |
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h |
@@ -10,9 +10,10 @@ |
#include "platform/graphics/paint/EffectPaintPropertyNode.h" |
#include "platform/graphics/paint/PaintChunkProperties.h" |
#include "platform/graphics/paint/TransformPaintPropertyNode.h" |
-#include "wtf/PassOwnPtr.h" |
#include "wtf/PassRefPtr.h" |
+#include "wtf/PtrUtil.h" |
#include "wtf/RefPtr.h" |
+#include <memory> |
namespace blink { |
@@ -27,9 +28,9 @@ class ObjectPaintProperties { |
public: |
struct LocalBorderBoxProperties; |
- static PassOwnPtr<ObjectPaintProperties> create() |
+ static std::unique_ptr<ObjectPaintProperties> create() |
{ |
- return adoptPtr(new ObjectPaintProperties()); |
+ return wrapUnique(new ObjectPaintProperties()); |
} |
// The hierarchy of transform subtree created by a LayoutObject. |
@@ -96,7 +97,7 @@ private: |
m_scrollTranslation = translation; |
} |
void setScrollbarPaintOffset(PassRefPtr<TransformPaintPropertyNode> paintOffset) { m_scrollbarPaintOffset = paintOffset; } |
- void setLocalBorderBoxProperties(PassOwnPtr<LocalBorderBoxProperties> properties) { m_localBorderBoxProperties = std::move(properties); } |
+ void setLocalBorderBoxProperties(std::unique_ptr<LocalBorderBoxProperties> properties) { m_localBorderBoxProperties = std::move(properties); } |
RefPtr<TransformPaintPropertyNode> m_paintOffsetTranslation; |
RefPtr<TransformPaintPropertyNode> m_transform; |
@@ -110,7 +111,7 @@ private: |
RefPtr<TransformPaintPropertyNode> m_scrollTranslation; |
RefPtr<TransformPaintPropertyNode> m_scrollbarPaintOffset; |
- OwnPtr<LocalBorderBoxProperties> m_localBorderBoxProperties; |
+ std::unique_ptr<LocalBorderBoxProperties> m_localBorderBoxProperties; |
}; |
} // namespace blink |