201391 2019-09-01 16:06:14 -0700 [FTW] NativeImagePtr is drawn with invalid scaling 2019-09-02 14:38:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham commit-queue don.olmstead fujii pvollan webkit-bug-importer oldest_to_newest 1567074 0 bfulgham 2019-09-01 16:06:14 -0700 The current implementation of FTW applies horrible scaling factors to native images, resulting in blocky images (in some cases). This patch corrects the handling of native images, and retrieves more data from the ImageDecoder's metadata system. 1567084 1 bfulgham 2019-09-01 16:35:06 -0700 Also: The API that I was using to create BitmapRenderContexts overrode the screen DPI by passing the same size for the "logical dimensions" and the "pixel dimensions". This patch corrects that mistake. We need to use this API (rather than letting Direct2D handle it) because our software image processing wants to work in 1x dimensions, so those code paths need to be able to supply matching pixel and logical dimensions. 1567087 2 377832 bfulgham 2019-09-01 16:40:32 -0700 Created attachment 377832 Patch 1567230 3 377832 commit-queue 2019-09-02 14:37:12 -0700 Comment on attachment 377832 Patch Clearing flags on attachment: 377832 Committed r249414: <https://trac.webkit.org/changeset/249414> 1567231 4 commit-queue 2019-09-02 14:37:14 -0700 All reviewed patches have been landed. Closing bug. 1567232 5 webkit-bug-importer 2019-09-02 14:38:17 -0700 <rdar://problem/54956764> 377832 2019-09-01 16:40:32 -0700 2019-09-02 14:37:12 -0700 Patch bug-201391-20190901164031.patch text/plain 7352 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0OTM2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE5LTA5LTAxICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtGVFddIE5hdGl2ZUltYWdl UHRyIGlzIGRyYXduIHdpdGggaW52YWxpZCBzY2FsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDEzOTEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCBpbXBsZW1lbnRhdGlvbiBvZiBG VFcgaW1wcm9wZXJseSBhcHBsaWVzIHNjYWxpbmcgZmFjdG9ycyB0byBuYXRpdmUgaW1hZ2VzLAor ICAgICAgICByZXN1bHRpbmcgaW4gYmxvY2t5IGltYWdlcyAoaW4gc29tZSBjYXNlcykuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyB0aGUgaGFuZGxpbmcgb2YgbmF0aXZlIGltYWdlcywg Y29ycmVjdHMgYSBidWcgaW4gYml0bWFwIHJlbmRlcgorICAgICAgICBjb250ZXh0IHNjYWxpbmcs IGFuZCByZXRyaWV2ZXMgbW9yZSBkYXRhIGZyb20gdGhlIEltYWdlRGVjb2RlcidzIG1ldGFkYXRh IHN5c3RlbS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9EaXJlY3QyRFV0aWxp dGllcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXJlY3QyRDo6Y3JlYXRlQml0bWFwUmVuZGVy VGFyZ2V0T2ZTaXplKTogU3VwcGx5IGFuIGFwcHJvcHJpYXRlbHkgc2l6ZWQKKyAgICAgICAgcGl4 ZWwgZGltZW5zaW9uIGZvciBub24tdW5pdHkgc2NhbGUgZmFjdG9ycy4KKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy93aW4vSW1hZ2VCdWZmZXJEaXJlY3QyRC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbWFnZUJ1ZmZlcjo6SW1hZ2VCdWZmZXIpOiBJbmNsdWRlIHRoZSBzY2FsZSBmYWN0b3Ig d2hlbiBjcmVhdGluZyBhCisgICAgICAgIGJpdG1hcCByZW5kZXIgdGFyZ2V0LgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9JbWFnZURlY29kZXJEaXJlY3QyRC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbWFnZURlY29kZXJEaXJlY3QyRDo6ZnJhbWVPcmllbnRhdGlvbkF0SW5kZXgg Y29uc3QpOiBSZWFkIHRoZSBvcmllbnRhdGlvbgorICAgICAgICBkYXRhIGZvcm0gdGhlIGltYWdl IG1ldGFkYXRhLgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGVyRGlyZWN0MkQ6OmZyYW1l QWxsb3dTdWJzYW1wbGluZ0F0SW5kZXggY29uc3QpOiBBbHdheXMgcmV0dXJuCisgICAgICAgIHRy dWUsIHRvIG1hdGNoIHRoZSBDRyBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlRGVjb2RlckRpcmVjdDJEOjpmcmFtZUhhc0FscGhhQXRJbmRleCBjb25zdCk6IENvcnJlY3Qg dG8gbWF0Y2ggdGhlCisgICAgICAgIGJlaGF2aW9yIG9mIENHLgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3dpbi9OYXRpdmVJbWFnZURpcmVjdDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmRyYXdOYXRpdmVJbWFnZSk6IFBhc3MgdGhyb3VnaCB0aGUgRGlyZWN0MkRPcGVyYXRpb25zIGhl bHBlciBtZXRob2QsIHdoaWNoCisgICAgICAgIGhhbmRsZXMgc2NhbGluZyBhbmQgc3Vic2FtcGxp bmcgcHJvcGVybHkuCisKIDIwMTktMDktMDEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxk QGFwcGxlLmNvbT4KIAogICAgICAgICBbV0hMU0xdIFJlc291cmNlcyBkb24ndCB3b3JrIHdoZW4g b25seSBhIHN1YnNldCBvZiBhIGJpbmQgZ3JvdXAgaXMgcmVmZXJlbmNlZCBieSBhIHNoYWRlcgpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0RpcmVjdDJEVXRpbGl0 aWVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vRGlyZWN0MkRVdGlsaXRpZXMuY3BwCShyZXZpc2lvbiAyNDkzNjUpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRGlyZWN0MkRVdGlsaXRpZXMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMjQsNyArMjI0LDcgQEAgQ09NUHRyPElEMkQxQml0bWFwUmVuZGVyVGFyZ2V0 PiBjcmVhdGVCaQogCiAgICAgQ09NUHRyPElEMkQxQml0bWFwUmVuZGVyVGFyZ2V0PiBiaXRtYXBD b250ZXh0OwogICAgIGF1dG8gZGVzaXJlZFNpemUgPSBEMkQxOjpTaXplRihzaXplLndpZHRoKCks IHNpemUuaGVpZ2h0KCkpOwotICAgIEQyRDFfU0laRV9VIHBpeGVsU2l6ZSA9IHNpemU7CisgICAg RDJEMV9TSVpFX1UgcGl4ZWxTaXplID0gRDJEMTo6U2l6ZVUoY2xhbXBUbzx1bnNpZ25lZD4oZGV2 aWNlU2NhbGVGYWN0b3IgKiBzaXplLndpZHRoKCkpLCBjbGFtcFRvPHVuc2lnbmVkPihkZXZpY2VT Y2FsZUZhY3RvciAqIHNpemUuaGVpZ2h0KCkpKTsKICAgICBIUkVTVUxUIGhyID0gcmVuZGVyVGFy Z2V0LT5DcmVhdGVDb21wYXRpYmxlUmVuZGVyVGFyZ2V0KCZkZXNpcmVkU2l6ZSwgJnBpeGVsU2l6 ZSwgbnVsbHB0ciwgRDJEMV9DT01QQVRJQkxFX1JFTkRFUl9UQVJHRVRfT1BUSU9OU19HRElfQ09N UEFUSUJMRSwgJmJpdG1hcENvbnRleHQpOwogICAgIGlmICghU1VDQ0VFREVEKGhyKSkKICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93aW4vSW1hZ2VCdWZmZXJEaXJlY3QyRC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ltYWdlQnVmZmVyRGlyZWN0MkQuY3BwCShyZXZpc2lv biAyNDkzNjYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSW1hZ2VC dWZmZXJEaXJlY3QyRC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNywxMCArMTA3LDcgQEAgSW1h Z2VCdWZmZXI6OkltYWdlQnVmZmVyKGNvbnN0IEZsb2F0U2l6ZQogICAgIGlmICghcmVuZGVyVGFy Z2V0KQogICAgICAgICByZW5kZXJUYXJnZXQgPSBHcmFwaGljc0NvbnRleHQ6OmRlZmF1bHRSZW5k ZXJUYXJnZXQoKTsKIAotICAgIEQyRDFfU0laRV9GIGRlc2lyZWRTaXplID0gRmxvYXRTaXplKG1f bG9naWNhbFNpemUpOwotICAgIEQyRDFfU0laRV9VIHBpeGVsU2l6ZSA9IEludFNpemUobV9sb2dp Y2FsU2l6ZSk7Ci0KLSAgICBhdXRvIGJpdG1hcENvbnRleHQgPSBEaXJlY3QyRDo6Y3JlYXRlQml0 bWFwUmVuZGVyVGFyZ2V0T2ZTaXplKG1fbG9naWNhbFNpemUsIHJlbmRlclRhcmdldCk7CisgICAg YXV0byBiaXRtYXBDb250ZXh0ID0gRGlyZWN0MkQ6OmNyZWF0ZUJpdG1hcFJlbmRlclRhcmdldE9m U2l6ZShtX2xvZ2ljYWxTaXplLCByZW5kZXJUYXJnZXQsIG1fcmVzb2x1dGlvblNjYWxlKTsKICAg ICBpZiAoIWJpdG1hcENvbnRleHQpCiAgICAgICAgIHJldHVybjsKIApJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ltYWdlRGVjb2RlckRpcmVjdDJELmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSW1hZ2VEZWNv ZGVyRGlyZWN0MkQuY3BwCShyZXZpc2lvbiAyNDkzNjUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy93aW4vSW1hZ2VEZWNvZGVyRGlyZWN0MkQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNzEsNyArMTcxLDEyIEBAIEltYWdlT3JpZW50YXRpb24gSW1hZ2VEZWNvZGVyRGlyZWN0 MkQ6OmYKICAgICBpZiAoIVNVQ0NFRURFRChocikpCiAgICAgICAgIHJldHVybiBJbWFnZU9yaWVu dGF0aW9uOjpOb25lOwogCi0gICAgLy8gRklYTUU6IElkZW50aWZ5IGltYWdlIHR5cGUsIGFuZCBh c2sgcHJvcGVyIG9yaWVudGF0aW9uLgorICAgIFBST1BWQVJJQU5UIHZhbHVlOworICAgIFByb3BW YXJpYW50SW5pdCgmdmFsdWUpOworICAgIGhyID0gbWV0YWRhdGEtPkdldE1ldGFkYXRhQnlOYW1l KEwiU3lzdGVtLlBob3RvLk9yaWVudGF0aW9uIiwgJnZhbHVlKTsKKyAgICBpZiAoU1VDQ0VFREVE KGhyKSkKKyAgICAgICAgcmV0dXJuIEltYWdlT3JpZW50YXRpb24oc3RhdGljX2Nhc3Q8SW1hZ2VP cmllbnRhdGlvbjo6T3JpZW50YXRpb24+KHZhbHVlLnVpVmFsKSk7CisKICAgICByZXR1cm4gSW1h Z2VPcmllbnRhdGlvbjo6Tm9uZTsKIH0KIApAQCAtMTkyLDE2ICsxOTcsNiBAQCBTZWNvbmRzIElt YWdlRGVjb2RlckRpcmVjdDJEOjpmcmFtZUR1cmF0CiAKIGJvb2wgSW1hZ2VEZWNvZGVyRGlyZWN0 MkQ6OmZyYW1lQWxsb3dTdWJzYW1wbGluZ0F0SW5kZXgoc2l6ZV90IGluZGV4KSBjb25zdAogewot ICAgIGlmICghbV9uYXRpdmVEZWNvZGVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBD T01QdHI8SVdJQ0JpdG1hcEZyYW1lRGVjb2RlPiBmcmFtZTsKLSAgICBIUkVTVUxUIGhyID0gbV9u YXRpdmVEZWNvZGVyLT5HZXRGcmFtZShpbmRleCwgJmZyYW1lKTsKLSAgICBpZiAoIVNVQ0NFRURF RChocikpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8vIEZJWE1FOiBGaWd1cmUgb3V0 IGNvcnJlY3QgaW1hZ2UgZm9ybWF0LXNwZWNpZmljIHF1ZXJ5IGZvciBzdWJzYW1wbGluZyBjaGVj ay4KLSAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0yMTUs OCArMjEwLDE5IEBAIGJvb2wgSW1hZ2VEZWNvZGVyRGlyZWN0MkQ6OmZyYW1lSGFzQWxwaGEKICAg ICBpZiAoIVNVQ0NFRURFRChocikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIC8vIEZJ WE1FOiBGaWd1cmUgb3V0IGNvcnJlY3QgaW1hZ2UgZm9ybWF0LXNwZWNpZmljIHF1ZXJ5IGZvciBh bHBoYSBjaGVjay4KLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIENPTVB0cjxJV0lDTWV0YWRh dGFRdWVyeVJlYWRlcj4gbWV0YWRhdGE7CisgICAgaHIgPSBmcmFtZS0+R2V0TWV0YWRhdGFRdWVy eVJlYWRlcigmbWV0YWRhdGEpOworICAgIGlmICghU1VDQ0VFREVEKGhyKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworCisgICAgR1VJRCBjb250YWluZXJGb3JtYXQ7CisgICAgaHIgPSBtZXRhZGF0 YS0+R2V0Q29udGFpbmVyRm9ybWF0KCZjb250YWluZXJGb3JtYXQpOworICAgIGlmICghU1VDQ0VF REVEKGhyKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKDo6SXNFcXVhbEdVSUQo R1VJRF9Db250YWluZXJGb3JtYXRKcGVnLCBjb250YWluZXJGb3JtYXQpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL05hdGl2ZUltYWdlRGlyZWN0MkQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9OYXRpdmVJbWFnZURpcmVj dDJELmNwcAkocmV2aXNpb24gMjQ5MzY1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL05hdGl2ZUltYWdlRGlyZWN0MkQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2 ICsyNyw3IEBACiAjaW5jbHVkZSAiTmF0aXZlSW1hZ2UuaCIKIAogI2luY2x1ZGUgIkNvbG9yLmgi CisjaW5jbHVkZSAiRGlyZWN0MkRPcGVyYXRpb25zLmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0Lmgi CiAjaW5jbHVkZSAiR2VvbWV0cnlVdGlsaXRpZXMuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRl eHQuaCIKQEAgLTc4LDkgKzc5LDkgQEAgQ29sb3IgbmF0aXZlSW1hZ2VTaW5nbGVQaXhlbFNvbGlk Q29sb3IoYwogICAgIHJldHVybiBDb2xvcigpOwogfQogCi12b2lkIGRyYXdOYXRpdmVJbWFnZShj b25zdCBOYXRpdmVJbWFnZVB0ciYgaW1hZ2UsIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29u c3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBJ bnRTaXplJiBzcmNTaXplLCBjb25zdCBJbWFnZVBhaW50aW5nT3B0aW9ucyYpCit2b2lkIGRyYXdO YXRpdmVJbWFnZShjb25zdCBOYXRpdmVJbWFnZVB0ciYgaW1hZ2UsIEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNS ZWN0LCBjb25zdCBJbnRTaXplJiBzcmNTaXplLCBjb25zdCBJbWFnZVBhaW50aW5nT3B0aW9ucyYg b3B0aW9ucykKIHsKLSAgICBhdXRvIHBsYXRmb3JtQ29udGV4dCA9IGNvbnRleHQucGxhdGZvcm1D b250ZXh0KCk7CisgICAgYXV0byogcGxhdGZvcm1Db250ZXh0ID0gY29udGV4dC5wbGF0Zm9ybUNv bnRleHQoKTsKIAogICAgIC8vIFN1YnNhbXBsaW5nIG1heSBoYXZlIGdpdmVuIHVzIGFuIGltYWdl IHRoYXQgaXMgc21hbGxlciB0aGFuIHNpemUoKS4KICAgICBJbnRTaXplIHN1YnNhbXBsZWRJbWFn ZVNpemUgPSBuYXRpdmVJbWFnZVNpemUoaW1hZ2UpOwpAQCAtOTAsOSArOTEsOCBAQCB2b2lkIGRy YXdOYXRpdmVJbWFnZShjb25zdCBOYXRpdmVJbWFnZVB0CiAgICAgaWYgKHN1YnNhbXBsZWRJbWFn ZVNpemUgIT0gc3JjU2l6ZSkKICAgICAgICAgYWRqdXN0ZWRTcmNSZWN0ID0gbWFwUmVjdChzcmNS ZWN0LCBGbG9hdFJlY3QoeyB9LCBzcmNTaXplKSwgRmxvYXRSZWN0KHsgfSwgc3Vic2FtcGxlZElt YWdlU2l6ZSkpOwogCi0gICAgZmxvYXQgb3BhY2l0eSA9IDEuMGY7Ci0KLSAgICBwbGF0Zm9ybUNv bnRleHQtPnJlbmRlclRhcmdldCgpLT5EcmF3Qml0bWFwKGltYWdlLmdldCgpLCBkZXN0UmVjdCwg b3BhY2l0eSwgRDJEMV9CSVRNQVBfSU5URVJQT0xBVElPTl9NT0RFX05FQVJFU1RfTkVJR0hCT1Is IGFkanVzdGVkU3JjUmVjdCk7CisgICAgYXV0byYgc3RhdGUgPSBjb250ZXh0LnN0YXRlKCk7Cisg ICAgRGlyZWN0MkQ6OmRyYXdOYXRpdmVJbWFnZSgqcGxhdGZvcm1Db250ZXh0LCBpbWFnZS5nZXQo KSwgc3Vic2FtcGxlZEltYWdlU2l6ZSwgZGVzdFJlY3QsIGFkanVzdGVkU3JjUmVjdCwgb3B0aW9u cywgc3RhdGUuYWxwaGEsIERpcmVjdDJEOjpTaGFkb3dTdGF0ZShzdGF0ZSkpOwogfQogCiB2b2lk IGNsZWFyTmF0aXZlSW1hZ2VTdWJpbWFnZXMoY29uc3QgTmF0aXZlSW1hZ2VQdHImIGltYWdlKQo=