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

Unified Diff: third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp

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/platform/testing/TestPaintArtifact.cpp
diff --git a/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp b/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp
index 07878a947bcb003170a01f518ee8226c57f40e7b..a805e0194c8e97971b3475b6080b82e65f6bdecb 100644
--- a/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp
+++ b/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp
@@ -14,8 +14,6 @@
#include "third_party/skia/include/core/SkPicture.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"
#include "wtf/Assertions.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
@@ -76,7 +74,7 @@ TestPaintArtifact& TestPaintArtifact::chunk(const PaintChunkProperties& properti
TestPaintArtifact& TestPaintArtifact::rectDrawing(const FloatRect& bounds, Color color)
{
- std::unique_ptr<DummyRectClient> client = wrapUnique(new DummyRectClient(bounds, color));
+ OwnPtr<DummyRectClient> client = adoptPtr(new DummyRectClient(bounds, color));
m_displayItemList.allocateAndConstruct<DrawingDisplayItem>(
*client, DisplayItem::DrawingFirst, client->makePicture());
m_dummyClients.append(std::move(client));
@@ -86,7 +84,7 @@ TestPaintArtifact& TestPaintArtifact::rectDrawing(const FloatRect& bounds, Color
TestPaintArtifact& TestPaintArtifact::foreignLayer(const FloatPoint& location, const IntSize& size, scoped_refptr<cc::Layer> layer)
{
FloatRect floatBounds(location, FloatSize(size));
- std::unique_ptr<DummyRectClient> client = wrapUnique(new DummyRectClient(floatBounds, Color::transparent));
+ OwnPtr<DummyRectClient> client = adoptPtr(new DummyRectClient(floatBounds, Color::transparent));
m_displayItemList.allocateAndConstruct<ForeignLayerDisplayItem>(
*client, DisplayItem::ForeignLayerFirst, std::move(layer), location, size);
m_dummyClients.append(std::move(client));

Powered by Google App Engine
This is Rietveld 408576698