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

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.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/ImageDecodingStore.cpp ('k') | third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index bbd4fbe579125039c341d403a0a996be906fa67a..809174a14c901ccf6f029e17a5c84db1d0dc2d78 100644

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

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

@@ -28,7 +28,6 @@

#include "platform/graphics/ImageFrameGenerator.h"

#include "platform/graphics/test/MockImageDecoder.h"

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

-#include <memory>

namespace blink {

@@ -83,7 +82,7 @@ protected:

TEST_F(ImageDecodingStoreTest, insertDecoder)

{

const SkISize size = SkISize::Make(1, 1);

- std::unique_ptr<ImageDecoder> decoder = MockImageDecoder::create(this);

+ OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this);

decoder->setSize(1, 1);

const ImageDecoder* refDecoder = decoder.get();

ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder));

@@ -100,9 +99,9 @@ TEST_F(ImageDecodingStoreTest, insertDecoder)

TEST_F(ImageDecodingStoreTest, evictDecoder)

{

- std::unique_ptr<ImageDecoder> decoder1 = MockImageDecoder::create(this);

- std::unique_ptr<ImageDecoder> decoder2 = MockImageDecoder::create(this);

- std::unique_ptr<ImageDecoder> decoder3 = MockImageDecoder::create(this);

+ OwnPtr<ImageDecoder> decoder1 = MockImageDecoder::create(this);

+ OwnPtr<ImageDecoder> decoder2 = MockImageDecoder::create(this);

+ OwnPtr<ImageDecoder> decoder3 = MockImageDecoder::create(this);

decoder1->setSize(1, 1);

decoder2->setSize(2, 2);

decoder3->setSize(3, 3);

@@ -127,9 +126,9 @@ TEST_F(ImageDecodingStoreTest, evictDecoder)

TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted)

{