third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoderTest.cpp - Issue 2496663002: Merge css3/image/ and fast/images/ to images/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoderTest.cpp

Issue 2496663002: Merge css3/image/ and fast/images/ to images/ (Closed)

Patch Set: Address failing tests (3 of them) Created 4 years, 1 month 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

« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/ico/ICOImageDecoder.h"	5 #include "platform/image-decoders/ico/ICOImageDecoder.h"

6	6

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

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

9 #include "wtf/PtrUtil.h"	9 #include "wtf/PtrUtil.h"

10 #include <memory>	10 #include <memory>

11	11

12 namespace blink {	12 namespace blink {

13	13

14 namespace {	14 namespace {

15	15

16 std::unique_ptr<ImageDecoder> createDecoder() {	16 std::unique_ptr<ImageDecoder> createDecoder() {

17 return wrapUnique(new ICOImageDecoder(ImageDecoder::AlphaNotPremultiplied,	17 return wrapUnique(new ICOImageDecoder(ImageDecoder::AlphaNotPremultiplied,

18 ImageDecoder::ColorSpaceApplied,	18 ImageDecoder::ColorSpaceApplied,

19 ImageDecoder::noDecodedImageByteLimit));	19 ImageDecoder::noDecodedImageByteLimit));

20 }	20 }

21 }	21 }

22	22

23 TEST(ICOImageDecoderTests, parseAndDecodeByteByByte) {	23 TEST(ICOImageDecoderTests, parseAndDecodeByteByByte) {

24 testByteByByteDecode(&createDecoder,	24 testByteByByteDecode(&createDecoder,

25 "/LayoutTests/fast/images/resources/2entries.ico", 2u,	25 "/LayoutTests/images/resources/2entries.ico", 2u,

	26 cAnimationNone);

	27 testByteByByteDecode(&createDecoder,

	28 "/LayoutTests/images/resources/greenbox-3frames.cur", 3u,

26 cAnimationNone);	29 cAnimationNone);

27 testByteByByteDecode(	30 testByteByByteDecode(

28 &createDecoder, "/LayoutTests/fast/images/resources/greenbox-3frames.cur",

29 3u, cAnimationNone);

30 testByteByByteDecode(

31 &createDecoder,	31 &createDecoder,

32 "/LayoutTests/fast/images/resources/icon-without-and-bitmap.ico", 1u,	32 "/LayoutTests/images/resources/icon-without-and-bitmap.ico", 1u,

33 cAnimationNone);	33 cAnimationNone);

	34 testByteByByteDecode(&createDecoder, "/LayoutTests/images/resources/1bit.ico",

	35 1u, cAnimationNone);

34 testByteByByteDecode(&createDecoder,	36 testByteByByteDecode(&createDecoder,

35 "/LayoutTests/fast/images/resources/1bit.ico", 1u,	37 "/LayoutTests/images/resources/bug653075.ico", 2u,

36 cAnimationNone);

37 testByteByByteDecode(&createDecoder,

38 "/LayoutTests/fast/images/resources/bug653075.ico", 2u,

39 cAnimationNone);	38 cAnimationNone);

40 }	39 }

41	40

42 } // namespace blink	41 } // namespace blink

OLD	NEW