third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.cpp ('k') | third_party/WebKit/Source/platform/graphics/ImageSource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp

index ac6c74bc8e6b662d9faf579b9b90e62330a4afb2..ada2c2d4d1bd8ee0d78b524078379c3a34d00d1a 100644

--- a/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/ImageLayerChromiumTest.cpp

@@ -30,8 +30,7 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/skia/include/core/SkImage.h"

#include "third_party/skia/include/core/SkSurface.h"

-#include "wtf/PtrUtil.h"

-#include <memory>

+#include "wtf/PassOwnPtr.h"

namespace blink {

@@ -96,7 +95,7 @@ private:

TEST(ImageLayerChromiumTest, imageLayerContentReset)

{

FakeGraphicsLayerClient client;

- std::unique_ptr<FakeGraphicsLayer> graphicsLayer = wrapUnique(new FakeGraphicsLayer(&client));

+ OwnPtr<FakeGraphicsLayer> graphicsLayer = adoptPtr(new FakeGraphicsLayer(&client));

ASSERT_TRUE(graphicsLayer.get());

ASSERT_FALSE(graphicsLayer->hasContentsLayer());

@@ -118,7 +117,7 @@ TEST(ImageLayerChromiumTest, imageLayerContentReset)

TEST(ImageLayerChromiumTest, opaqueImages)

{

FakeGraphicsLayerClient client;

- std::unique_ptr<FakeGraphicsLayer> graphicsLayer = wrapUnique(new FakeGraphicsLayer(&client));

+ OwnPtr<FakeGraphicsLayer> graphicsLayer = adoptPtr(new FakeGraphicsLayer(&client));

ASSERT_TRUE(graphicsLayer.get());

bool opaque = true;