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

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/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 side-by-side diff with in-line comments

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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoderTest.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoderTest.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoderTest.cpp

index 26567a28e2ae75c48ede0b2f5e0c4f7daac7909f..a38dfd5f6cbf97af42bed22dcc2b3e3b55e04b7c 100644

--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoderTest.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoderTest.cpp

@@ -22,20 +22,19 @@ std::unique_ptr<ImageDecoder> createDecoder() {

TEST(ICOImageDecoderTests, parseAndDecodeByteByByte) {

testByteByByteDecode(&createDecoder,

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

+ "/LayoutTests/images/resources/2entries.ico", 2u,

+ cAnimationNone);

+ testByteByByteDecode(&createDecoder,

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

cAnimationNone);

- testByteByByteDecode(

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

- 3u, cAnimationNone);

testByteByByteDecode(

&createDecoder,

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

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

cAnimationNone);

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

+ 1u, cAnimationNone);

testByteByByteDecode(&createDecoder,

- "/LayoutTests/fast/images/resources/1bit.ico", 1u,

- cAnimationNone);

- testByteByByteDecode(&createDecoder,

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

+ "/LayoutTests/images/resources/bug653075.ico", 2u,

cAnimationNone);

}