Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Unified Diff: third_party/WebKit/Source/core/paint/ObjectPaintProperties.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3ebd68e98e8d6a9c468a83ba08496d661afbef21..525c5aacf0f5a06a82a68a99bb982d92d5ebcea4 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
@@ -10,10 +10,9 @@
#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 {
@@ -28,9 +27,9 @@ class ObjectPaintProperties {
public:
struct LocalBorderBoxProperties;
- static std::unique_ptr<ObjectPaintProperties> create()
+ static PassOwnPtr<ObjectPaintProperties> create()
{
- return wrapUnique(new ObjectPaintProperties());
+ return adoptPtr(new ObjectPaintProperties());
}
// The hierarchy of transform subtree created by a LayoutObject.
@@ -97,7 +96,7 @@ private:
m_scrollTranslation = translation;
}
void setScrollbarPaintOffset(PassRefPtr<TransformPaintPropertyNode> paintOffset) { m_scrollbarPaintOffset = paintOffset; }
- void setLocalBorderBoxProperties(std::unique_ptr<LocalBorderBoxProperties> properties) { m_localBorderBoxProperties = std::move(properties); }
+ void setLocalBorderBoxProperties(PassOwnPtr<LocalBorderBoxProperties> properties) { m_localBorderBoxProperties = std::move(properties); }
RefPtr<TransformPaintPropertyNode> m_paintOffsetTranslation;
RefPtr<TransformPaintPropertyNode> m_transform;
@@ -111,7 +110,7 @@ private:
RefPtr<TransformPaintPropertyNode> m_scrollTranslation;
RefPtr<TransformPaintPropertyNode> m_scrollbarPaintOffset;
- std::unique_ptr<LocalBorderBoxProperties> m_localBorderBoxProperties;
+ OwnPtr<LocalBorderBoxProperties> m_localBorderBoxProperties;
};
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/paint/FilterPainter.cpp ('k') | third_party/WebKit/Source/core/paint/PaintInfoTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698