third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp - Issue 2044093002: Blink image-decoders: (lazy) deferred image decoding support for ICO

Side by Side Diff: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp

Issue 2044093002: Blink image-decoders: (lazy) deferred image decoding support for ICO (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Count only completelly received frames. Fixes 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/ImageDecoderTestHelpers.cpp » ('j') | third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp » ('J')
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/graphics/DeferredImageDecoder.h"	5 #include "platform/graphics/DeferredImageDecoder.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 "third_party/skia/include/core/SkImage.h"	10 #include "third_party/skia/include/core/SkImage.h"

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 mixImages("/LayoutTests/fast/images/resources/webp-animated.webp", 142u, 1u) ;	69 mixImages("/LayoutTests/fast/images/resources/webp-animated.webp", 142u, 1u) ;

70 }	70 }

71	71

72 TEST(DeferredImageDecoderTestWoPlatform, mixImagesBmp)	72 TEST(DeferredImageDecoderTestWoPlatform, mixImagesBmp)

73 {	73 {

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

75 }	75 }

76	76

77 TEST(DeferredImageDecoderTestWoPlatform, mixImagesIco)	77 TEST(DeferredImageDecoderTestWoPlatform, mixImagesIco)

78 {	78 {

79 mixImages("/LayoutTests/fast/images/resources/1bit.ico", 70u, 0u);	79 mixImages("/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico", 1 376u, 1u);
	aleksandar.stojiljkovic 2016/06/07 19:12:24 This file corresponds to mixImages test descriptio This file corresponds to mixImages test description - decodes first frame 1 and then frame 0. scroggo_chromium 2016/06/07 19:22:37 That's not what the mixImages test is about. Notic Show quoted text On 2016/06/07 19:12:24, aleksandar.stojiljkovic wrote: > This file corresponds to mixImages test description - decodes first frame 1 and > then frame 0. That's not what the mixImages test is about. Notice that it is used for other formats, where the frames have to come in order. wrong-frame-dimensions.ico might have frames out of order, but the test is actually about the order the client attempts to decode. Peter Kasting 2016/06/08 23:16:13 Yeah, I think the change to this file should be re Show quoted text On 2016/06/07 19:22:37, scroggo_chromium wrote: > On 2016/06/07 19:12:24, aleksandar.stojiljkovic wrote: > > This file corresponds to mixImages test description - decodes first frame 1 > and > > then frame 0. > > That's not what the mixImages test is about. Notice that it is used for other > formats, where the frames have to come in order. > > wrong-frame-dimensions.ico might have frames out of order, but the test is > actually about the order the client attempts to decode. Yeah, I think the change to this file should be reverted. aleksandar.stojiljkovic 2016/06/09 20:34:07 Sorry, I didn't put original response to Leon [1] Show quoted text On 2016/06/08 23:16:13, Peter Kasting wrote: > On 2016/06/07 19:22:37, scroggo_chromium wrote: > > On 2016/06/07 19:12:24, aleksandar.stojiljkovic wrote: > > > This file corresponds to mixImages test description - decodes first frame 1 > > and > > > then frame 0. > > > > That's not what the mixImages test is about. Notice that it is used for other > > formats, where the frames have to come in order. > > > > wrong-frame-dimensions.ico might have frames out of order, but the test is > > actually about the order the client attempts to decode. > > Yeah, I think the change to this file should be reverted. Sorry, I didn't put original response to Leon [1] inline. Verified that the other file (wrong-frame-dimensions.ico) is better for testing this as it has multiple frames and they are in order. wrong-frame-dimensions.ico has frames in required order for this test - frame 0 starts at byte offset 70 and is 1306 bytes long. Frame 1 starts at 1376 and is 1778 bytes long. One the other side 1bit.ico is not useful for this test as it has only one frame. [1] https://codereview.chromium.org/2044093002/#msg8
80 }	80 }

81	81

82 } // namespace blink	82 } // namespace blink

OLD	NEW