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

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

Powered by Google App Engine
This is Rietveld 408576698