Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
index 8263e0f5cc9c0c04a24028dcb2cd0b6b6eaa4481..c5b41801e3386164d1245b4d02636d74b820dac5 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
@@ -80,6 +80,7 @@ |
#include "wtf/text/StringBuilder.h" |
#include "wtf/text/WTFString.h" |
#include <algorithm> |
+#include <memory> |
#ifndef NDEBUG |
#include <stdio.h> |
#endif |
@@ -137,7 +138,7 @@ static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = nullptr; |
// The pointer to paint properties is implemented as a global hash map temporarily, |
// to avoid memory regression during the transition towards SPv2. |
-typedef HashMap<const LayoutObject*, OwnPtr<ObjectPaintProperties>> ObjectPaintPropertiesMap; |
+typedef HashMap<const LayoutObject*, std::unique_ptr<ObjectPaintProperties>> ObjectPaintPropertiesMap; |
static ObjectPaintPropertiesMap& objectPaintPropertiesMap() |
{ |
DEFINE_STATIC_LOCAL(ObjectPaintPropertiesMap, staticObjectPaintPropertiesMap, ()); |
@@ -1170,9 +1171,9 @@ void addJsonObjectForPoint(TracedValue* value, const char* name, const T& point) |
value->endDictionary(); |
} |
-static PassOwnPtr<TracedValue> jsonObjectForPaintInvalidationInfo(const LayoutRect& rect, const String& invalidationReason) |
+static std::unique_ptr<TracedValue> jsonObjectForPaintInvalidationInfo(const LayoutRect& rect, const String& invalidationReason) |
{ |
- OwnPtr<TracedValue> value = TracedValue::create(); |
+ std::unique_ptr<TracedValue> value = TracedValue::create(); |
addJsonObjectForRect(value.get(), "rect", rect); |
value->setString("invalidation_reason", invalidationReason); |
return value; |
@@ -1327,9 +1328,9 @@ void LayoutObject::invalidatePaintOfSubtreesIfNeeded(const PaintInvalidationStat |
} |
} |
-static PassOwnPtr<TracedValue> jsonObjectForOldAndNewRects(const LayoutRect& oldRect, const LayoutPoint& oldLocation, const LayoutRect& newRect, const LayoutPoint& newLocation) |
+static std::unique_ptr<TracedValue> jsonObjectForOldAndNewRects(const LayoutRect& oldRect, const LayoutPoint& oldLocation, const LayoutRect& newRect, const LayoutPoint& newLocation) |
{ |
- OwnPtr<TracedValue> value = TracedValue::create(); |
+ std::unique_ptr<TracedValue> value = TracedValue::create(); |
addJsonObjectForRect(value.get(), "oldRect", oldRect); |
addJsonObjectForPoint(value.get(), "oldLocation", oldLocation); |
addJsonObjectForRect(value.get(), "newRect", newRect); |