third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp - Issue 2050123002: 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/image-decoders/bmp/BMPImageDecoderTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. 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/image-decoders/bmp/BMPImageDecoder.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

index 1e2bc104531bb22b4abf71835a385ca3e1da216b..14b399a36edadf0050deb7f5a5abbbcfc8b620a7 100644

--- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp

@@ -7,14 +7,16 @@

#include "platform/SharedBuffer.h"

#include "platform/image-decoders/ImageDecoderTestHelpers.h"

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

+#include "wtf/PtrUtil.h"

+#include <memory>

namespace blink {

namespace {

-PassOwnPtr<ImageDecoder> createDecoder()

+std::unique_ptr<ImageDecoder> createDecoder()

{

- return adoptPtr(new BMPImageDecoder(ImageDecoder::AlphaNotPremultiplied, ImageDecoder::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit));

+ return wrapUnique(new BMPImageDecoder(ImageDecoder::AlphaNotPremultiplied, ImageDecoder::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit));

}

} // anonymous namespace

@@ -25,7 +27,7 @@ TEST(BMPImageDecoderTest, isSizeAvailable)

RefPtr<SharedBuffer> data = readFile(bmpFile);

ASSERT_TRUE(data.get());

- OwnPtr<ImageDecoder> decoder = createDecoder();

+ std::unique_ptr<ImageDecoder> decoder = createDecoder();

decoder->setData(data.get(), true);

EXPECT_TRUE(decoder->isSizeAvailable());

EXPECT_EQ(256, decoder->size().width());

@@ -38,7 +40,7 @@ TEST(BMPImageDecoderTest, parseAndDecode)

RefPtr<SharedBuffer> data = readFile(bmpFile);

ASSERT_TRUE(data.get());

- OwnPtr<ImageDecoder> decoder = createDecoder();

+ std::unique_ptr<ImageDecoder> decoder = createDecoder();

decoder->setData(data.get(), true);

ImageFrame* frame = decoder->frameBufferAtIndex(0);

@@ -56,7 +58,7 @@ TEST(BMPImageDecoderTest, emptyImage)

RefPtr<SharedBuffer> data = readFile(bmpFile);

ASSERT_TRUE(data.get());

- OwnPtr<ImageDecoder> decoder = createDecoder();

+ std::unique_ptr<ImageDecoder> decoder = createDecoder();

decoder->setData(data.get(), true);

ImageFrame* frame = decoder->frameBufferAtIndex(0);