Attachment 341227 Details for Bug 185956 – Patch

[patch] Patch

bug-185956-20180524144732.patch (text/plain), 2.55 KB, created by Chris Dumez on 2018-05-24 14:47:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-05-24 14:47:33 PDT

Size: 2.55 KB

patch

obsolete

>Subversion Revision: 232156
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a2b43d66ac8d88b7c8ae63784ce27470b2933180..129a7f0dc6d8bc2d3ae1db8cf08afb14ccf8d990 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-24  Chris Dumez  <cdumez@apple.com>
>+
>+        Enable subsampling for progressive JPEG images
>+        https://bugs.webkit.org/show_bug.cgi?id=185956
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Enable subsampling for progressive JPEG images now that it is supposed (rdar://problem/5191418).
>+        I verified locally that such images are still loading and do not cause any hang on iOS.
>+
>+        * platform/graphics/cg/ImageDecoderCG.cpp:
>+        (WebCore::ImageDecoderCG::frameAllowSubsamplingAtIndex const):
>+
> 2018-05-24  Chris Dumez  <cdumez@apple.com>
> 
>         [iOS WK2] Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/update-after-navigation-fetch-event.https.html is a flaky failure
>diff --git a/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp b/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp
>index 6c757c48475df99e80b87d3f58205439ec0b45a0..b7d592a9c8a25d70d37f519f5137c42d3a331aee 100644
>--- a/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp
>+++ b/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp
>@@ -366,23 +366,6 @@ Seconds ImageDecoderCG::frameDurationAtIndex(size_t index) const
> 
> bool ImageDecoderCG::frameAllowSubsamplingAtIndex(size_t) const
> {
>-    RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_nativeDecoder.get(), 0, imageSourceOptions().get()));
>-    if (!properties)
>-        return false;
>-    
>-    CFDictionaryRef jfifProperties = static_cast<CFDictionaryRef>(CFDictionaryGetValue(properties.get(), kCGImagePropertyJFIFDictionary));
>-    if (jfifProperties) {
>-        CFBooleanRef isProgCFBool = static_cast<CFBooleanRef>(CFDictionaryGetValue(jfifProperties, kCGImagePropertyJFIFIsProgressive));
>-        if (isProgCFBool) {
>-            bool isProgressive = CFBooleanGetValue(isProgCFBool);
>-            // Workaround for <rdar://problem/5184655> - Hang rendering very large progressive JPEG. Decoding progressive
>-            // images hangs for a very long time right now. Until this is fixed, don't sub-sample progressive images. This
>-            // will cause them to fail our large image check and they won't be decoded.
>-            // FIXME: Remove once underlying issue is fixed (<rdar://problem/5191418>)
>-            return !isProgressive;
>-        }
>-    }
>-    
>     return true;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185956: 341219 | 341227