third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp - Issue 2496663002: Merge css3/image/ and fast/images/ to images/

Unified Diff: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp

index 5355271795c0112dd63bd0c7db5929076f4a4f2b..dba110eb13cbe1a03086c8cc8bffdff9d7b1b979 100644

--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp

+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp

@@ -54,38 +54,38 @@ static void mixImages(const char* fileName,

}

TEST(DeferredImageDecoderTestWoPlatform, mixImagesGif) {

- mixImages("/LayoutTests/fast/images/resources/animated.gif", 818u, 1u);

+ mixImages("/LayoutTests/images/resources/animated.gif", 818u, 1u);

}

TEST(DeferredImageDecoderTestWoPlatform, mixImagesPng) {

- mixImages("/LayoutTests/fast/images/resources/mu.png", 910u, 0u);

+ mixImages("/LayoutTests/images/resources/mu.png", 910u, 0u);

}

TEST(DeferredImageDecoderTestWoPlatform, mixImagesJpg) {

- mixImages("/LayoutTests/fast/images/resources/2-dht.jpg", 177u, 0u);

+ mixImages("/LayoutTests/images/resources/2-dht.jpg", 177u, 0u);

}

TEST(DeferredImageDecoderTestWoPlatform, mixImagesWebp) {

- mixImages("/LayoutTests/fast/images/resources/webp-animated.webp", 142u, 1u);

+ mixImages("/LayoutTests/images/resources/webp-animated.webp", 142u, 1u);

}

TEST(DeferredImageDecoderTestWoPlatform, mixImagesBmp) {

- mixImages("/LayoutTests/fast/images/resources/lenna.bmp", 122u, 0u);

+ mixImages("/LayoutTests/images/resources/lenna.bmp", 122u, 0u);

}

TEST(DeferredImageDecoderTestWoPlatform, mixImagesIco) {

- mixImages("/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico",

- 1376u, 1u);

+ mixImages("/LayoutTests/images/resources/wrong-frame-dimensions.ico", 1376u,

+ 1u);

}

TEST(DeferredImageDecoderTestWoPlatform, fragmentedSignature) {

const char* testFiles[] = {

- "/LayoutTests/fast/images/resources/animated.gif",

- "/LayoutTests/fast/images/resources/mu.png",

- "/LayoutTests/fast/images/resources/2-dht.jpg",

- "/LayoutTests/fast/images/resources/webp-animated.webp",

- "/LayoutTests/fast/images/resources/lenna.bmp",

- "/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico",

+ "/LayoutTests/images/resources/animated.gif",

+ "/LayoutTests/images/resources/mu.png",

+ "/LayoutTests/images/resources/2-dht.jpg",

+ "/LayoutTests/images/resources/webp-animated.webp",

+ "/LayoutTests/images/resources/lenna.bmp",

+ "/LayoutTests/images/resources/wrong-frame-dimensions.ico",

};

for (size_t i = 0; i < SK_ARRAY_COUNT(testFiles); ++i) {