185956 2018-05-24 12:48:05 -0700 Enable subsampling for progressive JPEG images 2025-10-06 03:25:04 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez commit-queue ddkilzer ggaren sabouhallawa simon.fraser webkit-bug-importer oldest_to_newest 1427026 0 cdumez 2018-05-24 12:48:05 -0700 Optimize ImageDecoderCG::frameAllowSubsamplingAtIndex() currently checks if the image is a Progressive JPEG. We do not need CGImageSourceCopyPropertiesAtIndex() for non-JPEG images. 1427035 1 341219 cdumez 2018-05-24 13:14:58 -0700 Created attachment 341219 Patch 1427052 2 341219 ggaren 2018-05-24 14:02:36 -0700 Comment on attachment 341219 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341219&action=review r=me > Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp:388 > + // 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>) This patch is fine -- but the FIXME here is about a bug that was fixed in 2014. Maybe we should just remove this code entirely? 1427055 3 cdumez 2018-05-24 14:05:15 -0700 (In reply to Geoffrey Garen from comment #2) > Comment on attachment 341219 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=341219&action=review > > r=me > > > Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp:388 > > + // 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>) > > This patch is fine -- but the FIXME here is about a bug that was fixed in > 2014. Maybe we should just remove this code entirely? Simon, do you think we can remove this code entirely? 1427067 4 cdumez 2018-05-24 14:36:35 -0700 (In reply to Chris Dumez from comment #3) > (In reply to Geoffrey Garen from comment #2) > > Comment on attachment 341219 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=341219&action=review > > > > r=me > > > > > Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp:388 > > > + // 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>) > > > > This patch is fine -- but the FIXME here is about a bug that was fixed in > > 2014. Maybe we should just remove this code entirely? > > Simon, do you think we can remove this code entirely? I uploaded the test image to https://ibb.co/bG0pwT. I'll drop the code and try to load it. 1427075 5 341227 cdumez 2018-05-24 14:47:33 -0700 Created attachment 341227 Patch 1427134 6 341227 commit-queue 2018-05-24 18:12:37 -0700 Comment on attachment 341227 Patch Clearing flags on attachment: 341227 Committed r232177: <https://trac.webkit.org/changeset/232177> 1427135 7 commit-queue 2018-05-24 18:12:39 -0700 All reviewed patches have been landed. Closing bug. 1427136 8 webkit-bug-importer 2018-05-24 18:13:20 -0700 <rdar://problem/40541935> 2148686 9 ahmad.saleem792 2025-10-06 03:25:04 -0700 *** Bug 137648 has been marked as a duplicate of this bug. *** 341219 2018-05-24 13:14:58 -0700 2018-05-24 14:47:31 -0700 Patch bug-185956-20180524131458.patch text/plain 3669 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTJiNDNkNjZhYzhkODhi N2M4YWU2Mzc4NGNlMjc0NzBiMjkzMzE4MC4uODViNzIyMjExMTYxYWJjODQxMTZhYmIzNGE0ZWYw OTViMTZjMzUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA1LTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3B0aW1pemUgSW1hZ2VEZWNv ZGVyQ0c6OmZyYW1lQWxsb3dTdWJzYW1wbGluZ0F0SW5kZXgoKSBmb3Igbm9uLUpQRUcgaW1hZ2Vz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU5NTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbWFnZURl Y29kZXJDRzo6ZnJhbWVBbGxvd1N1YnNhbXBsaW5nQXRJbmRleCgpIGN1cnJlbnRseSBjaGVja3Mg aWYgdGhlIGltYWdlIGlzIGEgUHJvZ3Jlc3NpdmUKKyAgICAgICAgSlBFRy4gV2UgZG8gbm90IG5l ZWQgQ0dJbWFnZVNvdXJjZUNvcHlQcm9wZXJ0aWVzQXRJbmRleCgpIGZvciBub24tSlBFRyBpbWFn ZXMgc28gd2UgY2FuIHJldHVybgorICAgICAgICBlYXJseSBiYXNlZCBvbiBhIFVUSSBjaGVjay4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlRGVjb2RlckNHLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmNvbXB1dGVJc1Byb2dyZXNzaXZlKToKKyAgICAgICAgKFdlYkNvcmU6 OkltYWdlRGVjb2RlckNHOjpmcmFtZUFsbG93U3Vic2FtcGxpbmdBdEluZGV4IGNvbnN0KToKKwog MjAxOC0wNS0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1MgV0syXSBMYXlvdXQgVGVzdCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3NlcnZp Y2Utd29ya2Vycy9zZXJ2aWNlLXdvcmtlci91cGRhdGUtYWZ0ZXItbmF2aWdhdGlvbi1mZXRjaC1l dmVudC5odHRwcy5odG1sIGlzIGEgZmxha3kgZmFpbHVyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuY3BwCmluZGV4IDZjNzU3 YzQ4NDc1ZGY5OWU4MGI4N2QzZjU4MjA1NDM5ZWMwYjQ1YTAuLmJmYjYzYWUzMDQ5YjVhZTA5OWVk ZDQ3M2RlMTczMTM1YjM2Y2E3ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NnL0ltYWdlRGVjb2RlckNHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHAKQEAgLTM2NCwyNSArMzY0LDMyIEBA IFNlY29uZHMgSW1hZ2VEZWNvZGVyQ0c6OmZyYW1lRHVyYXRpb25BdEluZGV4KHNpemVfdCBpbmRl eCkgY29uc3QKICAgICByZXR1cm4gZHVyYXRpb247CiB9CiAKLWJvb2wgSW1hZ2VEZWNvZGVyQ0c6 OmZyYW1lQWxsb3dTdWJzYW1wbGluZ0F0SW5kZXgoc2l6ZV90KSBjb25zdAorc3RhdGljIGJvb2wg Y29tcHV0ZUlzUHJvZ3Jlc3NpdmUoQ0dJbWFnZVNvdXJjZVJlZiBuYXRpdmVEZWNvZGVyKQogewot ICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IHByb3BlcnRpZXMgPSBhZG9wdENGKENHSW1h Z2VTb3VyY2VDb3B5UHJvcGVydGllc0F0SW5kZXgobV9uYXRpdmVEZWNvZGVyLmdldCgpLCAwLCBp bWFnZVNvdXJjZU9wdGlvbnMoKS5nZXQoKSkpOworICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlS ZWY+IHByb3BlcnRpZXMgPSBhZG9wdENGKENHSW1hZ2VTb3VyY2VDb3B5UHJvcGVydGllc0F0SW5k ZXgobmF0aXZlRGVjb2RlciwgMCwgaW1hZ2VTb3VyY2VPcHRpb25zKCkuZ2V0KCkpKTsKICAgICBp ZiAoIXByb3BlcnRpZXMpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKKwogICAgIENGRGlj dGlvbmFyeVJlZiBqZmlmUHJvcGVydGllcyA9IHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJlZj4o Q0ZEaWN0aW9uYXJ5R2V0VmFsdWUocHJvcGVydGllcy5nZXQoKSwga0NHSW1hZ2VQcm9wZXJ0eUpG SUZEaWN0aW9uYXJ5KSk7CiAgICAgaWYgKGpmaWZQcm9wZXJ0aWVzKSB7CiAgICAgICAgIENGQm9v bGVhblJlZiBpc1Byb2dDRkJvb2wgPSBzdGF0aWNfY2FzdDxDRkJvb2xlYW5SZWY+KENGRGljdGlv bmFyeUdldFZhbHVlKGpmaWZQcm9wZXJ0aWVzLCBrQ0dJbWFnZVByb3BlcnR5SkZJRklzUHJvZ3Jl c3NpdmUpKTsKLSAgICAgICAgaWYgKGlzUHJvZ0NGQm9vbCkgewotICAgICAgICAgICAgYm9vbCBp c1Byb2dyZXNzaXZlID0gQ0ZCb29sZWFuR2V0VmFsdWUoaXNQcm9nQ0ZCb29sKTsKLSAgICAgICAg ICAgIC8vIFdvcmthcm91bmQgZm9yIDxyZGFyOi8vcHJvYmxlbS81MTg0NjU1PiAtIEhhbmcgcmVu ZGVyaW5nIHZlcnkgbGFyZ2UgcHJvZ3Jlc3NpdmUgSlBFRy4gRGVjb2RpbmcgcHJvZ3Jlc3NpdmUK LSAgICAgICAgICAgIC8vIGltYWdlcyBoYW5ncyBmb3IgYSB2ZXJ5IGxvbmcgdGltZSByaWdodCBu b3cuIFVudGlsIHRoaXMgaXMgZml4ZWQsIGRvbid0IHN1Yi1zYW1wbGUgcHJvZ3Jlc3NpdmUgaW1h Z2VzLiBUaGlzCi0gICAgICAgICAgICAvLyB3aWxsIGNhdXNlIHRoZW0gdG8gZmFpbCBvdXIgbGFy Z2UgaW1hZ2UgY2hlY2sgYW5kIHRoZXkgd29uJ3QgYmUgZGVjb2RlZC4KLSAgICAgICAgICAgIC8v IEZJWE1FOiBSZW1vdmUgb25jZSB1bmRlcmx5aW5nIGlzc3VlIGlzIGZpeGVkICg8cmRhcjovL3By b2JsZW0vNTE5MTQxOD4pCi0gICAgICAgICAgICByZXR1cm4gIWlzUHJvZ3Jlc3NpdmU7Ci0gICAg ICAgIH0KKyAgICAgICAgaWYgKGlzUHJvZ0NGQm9vbCkKKyAgICAgICAgICAgIHJldHVybiBDRkJv b2xlYW5HZXRWYWx1ZShpc1Byb2dDRkJvb2wpOwogICAgIH0KKworICAgIHJldHVybiBmYWxzZTsK K30KKworYm9vbCBJbWFnZURlY29kZXJDRzo6ZnJhbWVBbGxvd1N1YnNhbXBsaW5nQXRJbmRleChz aXplX3QpIGNvbnN0Cit7CisgICAgLy8gV29ya2Fyb3VuZCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzUx ODQ2NTU+IC0gSGFuZyByZW5kZXJpbmcgdmVyeSBsYXJnZSBwcm9ncmVzc2l2ZSBKUEVHLiBEZWNv ZGluZyBwcm9ncmVzc2l2ZQorICAgIC8vIGltYWdlcyBoYW5ncyBmb3IgYSB2ZXJ5IGxvbmcgdGlt ZSByaWdodCBub3cuIFVudGlsIHRoaXMgaXMgZml4ZWQsIGRvbid0IHN1Yi1zYW1wbGUgcHJvZ3Jl c3NpdmUgaW1hZ2VzLiBUaGlzCisgICAgLy8gd2lsbCBjYXVzZSB0aGVtIHRvIGZhaWwgb3VyIGxh cmdlIGltYWdlIGNoZWNrIGFuZCB0aGV5IHdvbid0IGJlIGRlY29kZWQuCisgICAgLy8gRklYTUU6 IFJlbW92ZSBvbmNlIHVuZGVybHlpbmcgaXNzdWUgaXMgZml4ZWQgKDxyZGFyOi8vcHJvYmxlbS81 MTkxNDE4PikKKyAgICBpZiAodXRpKCkgPT0gInB1YmxpYy5qcGVnIikKKyAgICAgICAgcmV0dXJu ICFjb21wdXRlSXNQcm9ncmVzc2l2ZShtX25hdGl2ZURlY29kZXIuZ2V0KCkpOwogICAgIAorICAg IEFTU0VSVCghY29tcHV0ZUlzUHJvZ3Jlc3NpdmUobV9uYXRpdmVEZWNvZGVyLmdldCgpKSk7CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAK 341227 2018-05-24 14:47:33 -0700 2018-05-24 18:12:37 -0700 Patch bug-185956-20180524144732.patch text/plain 2607 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTJiNDNkNjZhYzhkODhi N2M4YWU2Mzc4NGNlMjc0NzBiMjkzMzE4MC4uMTI5YTdmMGRjNmQ4YmMyZDNhZTFkYjhjZjA4YWZi MTRjY2Y4ZDk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA1LTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIHN1YnNhbXBsaW5n IGZvciBwcm9ncmVzc2l2ZSBKUEVHIGltYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1OTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHN1YnNhbXBsaW5nIGZvciBwcm9ncmVzc2l2ZSBK UEVHIGltYWdlcyBub3cgdGhhdCBpdCBpcyBzdXBwb3NlZCAocmRhcjovL3Byb2JsZW0vNTE5MTQx OCkuCisgICAgICAgIEkgdmVyaWZpZWQgbG9jYWxseSB0aGF0IHN1Y2ggaW1hZ2VzIGFyZSBzdGls bCBsb2FkaW5nIGFuZCBkbyBub3QgY2F1c2UgYW55IGhhbmcgb24gaU9TLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VEZWNvZGVyQ0c6OmZyYW1lQWxsb3dTdWJzYW1wbGluZ0F0SW5kZXggY29uc3QpOgor CiAyMDE4LTA1LTI0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPUyBXSzJdIExheW91dCBUZXN0IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvc2Vy dmljZS13b3JrZXJzL3NlcnZpY2Utd29ya2VyL3VwZGF0ZS1hZnRlci1uYXZpZ2F0aW9uLWZldGNo LWV2ZW50Lmh0dHBzLmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZURlY29kZXJDRy5jcHAKaW5kZXggNmM3 NTdjNDg0NzVkZjk5ZTgwYjg3ZDNmNTgyMDU0MzllYzBiNDVhMC4uYjdkNTkyYTljOGEyNWQ3MGQz N2Y1MTlmNTEzN2M0MmQzYTMzMWFlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2cvSW1hZ2VEZWNvZGVyQ0cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlRGVjb2RlckNHLmNwcApAQCAtMzY2LDIzICszNjYsNiBA QCBTZWNvbmRzIEltYWdlRGVjb2RlckNHOjpmcmFtZUR1cmF0aW9uQXRJbmRleChzaXplX3QgaW5k ZXgpIGNvbnN0CiAKIGJvb2wgSW1hZ2VEZWNvZGVyQ0c6OmZyYW1lQWxsb3dTdWJzYW1wbGluZ0F0 SW5kZXgoc2l6ZV90KSBjb25zdAogewotICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IHBy b3BlcnRpZXMgPSBhZG9wdENGKENHSW1hZ2VTb3VyY2VDb3B5UHJvcGVydGllc0F0SW5kZXgobV9u YXRpdmVEZWNvZGVyLmdldCgpLCAwLCBpbWFnZVNvdXJjZU9wdGlvbnMoKS5nZXQoKSkpOwotICAg IGlmICghcHJvcGVydGllcykKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAotICAgIENGRGlj dGlvbmFyeVJlZiBqZmlmUHJvcGVydGllcyA9IHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJlZj4o Q0ZEaWN0aW9uYXJ5R2V0VmFsdWUocHJvcGVydGllcy5nZXQoKSwga0NHSW1hZ2VQcm9wZXJ0eUpG SUZEaWN0aW9uYXJ5KSk7Ci0gICAgaWYgKGpmaWZQcm9wZXJ0aWVzKSB7Ci0gICAgICAgIENGQm9v bGVhblJlZiBpc1Byb2dDRkJvb2wgPSBzdGF0aWNfY2FzdDxDRkJvb2xlYW5SZWY+KENGRGljdGlv bmFyeUdldFZhbHVlKGpmaWZQcm9wZXJ0aWVzLCBrQ0dJbWFnZVByb3BlcnR5SkZJRklzUHJvZ3Jl c3NpdmUpKTsKLSAgICAgICAgaWYgKGlzUHJvZ0NGQm9vbCkgewotICAgICAgICAgICAgYm9vbCBp c1Byb2dyZXNzaXZlID0gQ0ZCb29sZWFuR2V0VmFsdWUoaXNQcm9nQ0ZCb29sKTsKLSAgICAgICAg ICAgIC8vIFdvcmthcm91bmQgZm9yIDxyZGFyOi8vcHJvYmxlbS81MTg0NjU1PiAtIEhhbmcgcmVu ZGVyaW5nIHZlcnkgbGFyZ2UgcHJvZ3Jlc3NpdmUgSlBFRy4gRGVjb2RpbmcgcHJvZ3Jlc3NpdmUK LSAgICAgICAgICAgIC8vIGltYWdlcyBoYW5ncyBmb3IgYSB2ZXJ5IGxvbmcgdGltZSByaWdodCBu b3cuIFVudGlsIHRoaXMgaXMgZml4ZWQsIGRvbid0IHN1Yi1zYW1wbGUgcHJvZ3Jlc3NpdmUgaW1h Z2VzLiBUaGlzCi0gICAgICAgICAgICAvLyB3aWxsIGNhdXNlIHRoZW0gdG8gZmFpbCBvdXIgbGFy Z2UgaW1hZ2UgY2hlY2sgYW5kIHRoZXkgd29uJ3QgYmUgZGVjb2RlZC4KLSAgICAgICAgICAgIC8v IEZJWE1FOiBSZW1vdmUgb25jZSB1bmRlcmx5aW5nIGlzc3VlIGlzIGZpeGVkICg8cmRhcjovL3By b2JsZW0vNTE5MTQxOD4pCi0gICAgICAgICAgICByZXR1cm4gIWlzUHJvZ3Jlc3NpdmU7Ci0gICAg ICAgIH0KLSAgICB9Ci0gICAgCiAgICAgcmV0dXJuIHRydWU7CiB9CiAK