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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/image-decoders/bmp/BMPImageDecoder.h" 5 #include "platform/image-decoders/bmp/BMPImageDecoder.h"
6 6
7 #include "platform/SharedBuffer.h" 7 #include "platform/SharedBuffer.h"
8 #include "platform/image-decoders/ImageDecoderTestHelpers.h" 8 #include "platform/image-decoders/ImageDecoderTestHelpers.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "wtf/PtrUtil.h"
11 #include <memory>
10 12
11 namespace blink { 13 namespace blink {
12 14
13 namespace { 15 namespace {
14 16
15 PassOwnPtr<ImageDecoder> createDecoder() 17 std::unique_ptr<ImageDecoder> createDecoder()
16 { 18 {
17 return adoptPtr(new BMPImageDecoder(ImageDecoder::AlphaNotPremultiplied, Ima geDecoder::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit)); 19 return wrapUnique(new BMPImageDecoder(ImageDecoder::AlphaNotPremultiplied, I mageDecoder::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit) );
18 } 20 }
19 21
20 } // anonymous namespace 22 } // anonymous namespace
21 23
22 TEST(BMPImageDecoderTest, isSizeAvailable) 24 TEST(BMPImageDecoderTest, isSizeAvailable)
23 { 25 {
24 const char* bmpFile = "/LayoutTests/fast/images/resources/lenna.bmp"; // 256 x256 26 const char* bmpFile = "/LayoutTests/fast/images/resources/lenna.bmp"; // 256 x256
25 RefPtr<SharedBuffer> data = readFile(bmpFile); 27 RefPtr<SharedBuffer> data = readFile(bmpFile);
26 ASSERT_TRUE(data.get()); 28 ASSERT_TRUE(data.get());
27 29
28 OwnPtr<ImageDecoder> decoder = createDecoder(); 30 std::unique_ptr<ImageDecoder> decoder = createDecoder();
29 decoder->setData(data.get(), true); 31 decoder->setData(data.get(), true);
30 EXPECT_TRUE(decoder->isSizeAvailable()); 32 EXPECT_TRUE(decoder->isSizeAvailable());
31 EXPECT_EQ(256, decoder->size().width()); 33 EXPECT_EQ(256, decoder->size().width());
32 EXPECT_EQ(256, decoder->size().height()); 34 EXPECT_EQ(256, decoder->size().height());
33 } 35 }
34 36
35 TEST(BMPImageDecoderTest, parseAndDecode) 37 TEST(BMPImageDecoderTest, parseAndDecode)
36 { 38 {
37 const char* bmpFile = "/LayoutTests/fast/images/resources/lenna.bmp"; // 256 x256 39 const char* bmpFile = "/LayoutTests/fast/images/resources/lenna.bmp"; // 256 x256
38 RefPtr<SharedBuffer> data = readFile(bmpFile); 40 RefPtr<SharedBuffer> data = readFile(bmpFile);
39 ASSERT_TRUE(data.get()); 41 ASSERT_TRUE(data.get());
40 42
41 OwnPtr<ImageDecoder> decoder = createDecoder(); 43 std::unique_ptr<ImageDecoder> decoder = createDecoder();
42 decoder->setData(data.get(), true); 44 decoder->setData(data.get(), true);
43 45
44 ImageFrame* frame = decoder->frameBufferAtIndex(0); 46 ImageFrame* frame = decoder->frameBufferAtIndex(0);
45 ASSERT_TRUE(frame); 47 ASSERT_TRUE(frame);
46 EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus()); 48 EXPECT_EQ(ImageFrame::FrameComplete, frame->getStatus());
47 EXPECT_EQ(256, frame->bitmap().width()); 49 EXPECT_EQ(256, frame->bitmap().width());
48 EXPECT_EQ(256, frame->bitmap().height()); 50 EXPECT_EQ(256, frame->bitmap().height());
49 EXPECT_FALSE(decoder->failed()); 51 EXPECT_FALSE(decoder->failed());
50 } 52 }
51 53
52 // Test if a BMP decoder returns a proper error while decoding an empty image. 54 // Test if a BMP decoder returns a proper error while decoding an empty image.
53 TEST(BMPImageDecoderTest, emptyImage) 55 TEST(BMPImageDecoderTest, emptyImage)
54 { 56 {
55 const char* bmpFile = "/LayoutTests/fast/images/resources/0x0.bmp"; // 0x0 57 const char* bmpFile = "/LayoutTests/fast/images/resources/0x0.bmp"; // 0x0
56 RefPtr<SharedBuffer> data = readFile(bmpFile); 58 RefPtr<SharedBuffer> data = readFile(bmpFile);
57 ASSERT_TRUE(data.get()); 59 ASSERT_TRUE(data.get());
58 60
59 OwnPtr<ImageDecoder> decoder = createDecoder(); 61 std::unique_ptr<ImageDecoder> decoder = createDecoder();
60 decoder->setData(data.get(), true); 62 decoder->setData(data.get(), true);
61 63
62 ImageFrame* frame = decoder->frameBufferAtIndex(0); 64 ImageFrame* frame = decoder->frameBufferAtIndex(0);
63 ASSERT_TRUE(frame); 65 ASSERT_TRUE(frame);
64 EXPECT_EQ(ImageFrame::FrameEmpty, frame->getStatus()); 66 EXPECT_EQ(ImageFrame::FrameEmpty, frame->getStatus());
65 EXPECT_TRUE(decoder->failed()); 67 EXPECT_TRUE(decoder->failed());
66 } 68 }
67 69
68 // This test verifies that calling SharedBuffer::mergeSegmentsIntoBuffer() does 70 // This test verifies that calling SharedBuffer::mergeSegmentsIntoBuffer() does
69 // not break BMP decoding at a critical point: in between a call to decode the 71 // not break BMP decoding at a critical point: in between a call to decode the
70 // size (when BMPImageDecoder stops while it may still have input data to 72 // size (when BMPImageDecoder stops while it may still have input data to
71 // read) and a call to do a full decode. 73 // read) and a call to do a full decode.
72 TEST(BMPImageDecoderTest, mergeBuffer) 74 TEST(BMPImageDecoderTest, mergeBuffer)
73 { 75 {
74 const char* bmpFile = "/LayoutTests/fast/images/resources/lenna.bmp"; 76 const char* bmpFile = "/LayoutTests/fast/images/resources/lenna.bmp";
75 testMergeBuffer(&createDecoder, bmpFile); 77 testMergeBuffer(&createDecoder, bmpFile);
76 } 78 }
77 79
78 } // namespace blink 80 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698