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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp

Issue 1981823002: Remove OwnPtr::release() calls in platform/ (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/Canvas2DLayerBridge.cpp ('k') | third_party/WebKit/Source/platform/graphics/CompositorMutatorClient.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
index 3be2822526e9617a8d4792e6f57cefee011a78f2..764784f62c579aed8e3ba660ac8b78a629eaa722 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
@@ -161,7 +161,7 @@ protected:
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::DisableAcceleration)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::DisableAcceleration)));
const GrGLTextureInfo* textureInfo = skia::GrBackendObjectToGrGLTextureInfo(bridge->newImageSnapshot(PreferAcceleration, SnapshotReasonUnknown)->getTextureHandle(true));
EXPECT_EQ(textureInfo, nullptr);
@@ -174,7 +174,7 @@ protected:
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
gl.setIsContextLost(true);
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
EXPECT_TRUE(bridge->checkSurfaceValid());
EXPECT_FALSE(bridge->isAccelerated());
}
@@ -185,7 +185,7 @@ protected:
// No fallback case.
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
EXPECT_TRUE(bridge->checkSurfaceValid());
EXPECT_TRUE(bridge->isAccelerated());
RefPtr<SkImage> snapshot = bridge->newImageSnapshot(PreferAcceleration, SnapshotReasonUnknown);
@@ -198,7 +198,7 @@ protected:
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
GrContext* gr = contextProvider->grContext();
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
EXPECT_TRUE(bridge->checkSurfaceValid());
EXPECT_TRUE(bridge->isAccelerated()); // We don't yet know that allocation will fail
// This will cause SkSurface_Gpu creation to fail without
@@ -215,7 +215,7 @@ protected:
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
EXPECT_TRUE(bridge->checkSurfaceValid());
SkPaint paint;
uint32_t genID = bridge->getOrCreateSurface()->generationID();
@@ -237,7 +237,7 @@ protected:
{
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
bridge->m_lastImageId = 1;
NullWebExternalBitmap bitmap;
@@ -254,7 +254,7 @@ protected:
{
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
WebExternalTextureMailbox mailbox;
bridge->prepareMailbox(&mailbox, 0);
bridge->mailboxReleased(mailbox, lostResource);
@@ -267,7 +267,7 @@ protected:
WebExternalTextureMailbox mailbox;
Canvas2DLayerBridge* rawBridge;
{
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
bridge->prepareMailbox(&mailbox, 0);
rawBridge = bridge.get();
} // bridge goes out of scope, but object is kept alive by self references.
@@ -282,7 +282,7 @@ protected:
{
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 300), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 300), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
SkPaint paint;
bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
RefPtr<SkImage> image = bridge->newImageSnapshot(PreferAcceleration, SnapshotReasonUnknown);
@@ -293,7 +293,7 @@ protected:
{
FakeGLES2Interface gl;
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(&gl));
- Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(contextProvider.release(), IntSize(300, 300), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
+ Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 300), 0, NonOpaque, Canvas2DLayerBridge::EnableAcceleration)));
SkPaint paint;
bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
RefPtr<SkImage> image = bridge->newImageSnapshot(PreferNoAcceleration, SnapshotReasonUnknown);
@@ -348,7 +348,7 @@ public:
void runCreateBridgeTask(Canvas2DLayerBridgePtr* bridgePtr, gpu::gles2::GLES2Interface* gl, Canvas2DLayerBridgeTest* testHost, WaitableEvent* doneEvent)
{
OwnPtr<FakeWebGraphicsContext3DProvider> contextProvider = adoptPtr(new FakeWebGraphicsContext3DProvider(gl));
- *bridgePtr = testHost->makeBridge(contextProvider.release(), IntSize(300, 300), Canvas2DLayerBridge::EnableAcceleration);
+ *bridgePtr = testHost->makeBridge(std::move(contextProvider), IntSize(300, 300), Canvas2DLayerBridge::EnableAcceleration);
// draw+flush to trigger the creation of a GPU surface
(*bridgePtr)->didDraw(FloatRect(0, 0, 1, 1));
(*bridgePtr)->finalizeFrame(FloatRect(0, 0, 1, 1));
@@ -447,7 +447,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationLifeCycle)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -491,7 +491,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationReEntry)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -544,7 +544,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationLifeCycleWithDeferredRenderi
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -610,7 +610,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_BackgroundRenderingWhileHibernating)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -665,7 +665,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_BackgroundRenderingWhileHibernatingWith
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -725,7 +725,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_DisableDeferredRenderingWhileHibernatin
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -782,7 +782,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_TeardownWhileHibernating)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -835,7 +835,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_TeardownWhileHibernationIsPending)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationScheduledEvent = adoptPtr(new WaitableEvent());
@@ -875,7 +875,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationAbortedDueToPendingTeardown)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationAbortedEvent = adoptPtr(new WaitableEvent());
@@ -909,7 +909,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationAbortedDueToVisibilityChange
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationAbortedEvent = adoptPtr(new WaitableEvent());
@@ -946,7 +946,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationAbortedDueToLostContext)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
gl.setIsContextLost(true);
// Test entering hibernation
@@ -981,7 +981,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_PrepareMailboxWhileHibernating)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
@@ -1020,7 +1020,7 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_PrepareMailboxWhileBackgroundRendering)
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
- bridge->setLoggerForTesting(mockLogger.release());
+ bridge->setLoggerForTesting(std::move(mockLogger));
// Test entering hibernation
OwnPtr<WaitableEvent> hibernationStartedEvent = adoptPtr(new WaitableEvent());
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp ('k') | third_party/WebKit/Source/platform/graphics/CompositorMutatorClient.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698