225836 2021-05-14 17:43:33 -0700 Move CanvasRenderingContext2DSettings down to CanvasRenderingContext2DBase so it can be used there (and to support OffscreenCanvas) 2021-07-08 05:00:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225140 227792 1 sam sam cdumez changseok darin dino esprehn+autocc ews-watchlist gyuyoung.kim simon.fraser webkit-bug-importer oldest_to_newest 1760315 0 sam 2021-05-14 17:43:33 -0700 Move CanvasRenderingContext2DSettings down to CanvasRenderingContext2DBase so it can be used there (and to support OffscreenCanvas) 1760321 1 428694 sam 2021-05-14 17:47:58 -0700 Created attachment 428694 Patch 1760356 2 428708 sam 2021-05-14 20:59:54 -0700 Created attachment 428708 Patch 1760421 3 ews-feeder 2021-05-15 10:51:32 -0700 Committed r277543 (237771@main): <https://commits.webkit.org/237771@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428708. 1760422 4 webkit-bug-importer 2021-05-15 10:52:15 -0700 <rdar://problem/78060631> 428694 2021-05-14 17:47:58 -0700 2021-05-14 20:59:54 -0700 Patch bug-225836-20210514174757.patch text/plain 10796 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3NzUyMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA1LTE0ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRFNldHRpbmdzIGRvd24gdG8gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZSBzbyBp dCBjYW4gYmUgdXNlZCB0aGVyZSAoYW5kIHRvIHN1cHBvcnQgT2Zmc2NyZWVuQ2FudmFzKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODM2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gc3Vic2VxdWVu dCBjaGFuZ2VzLCBpdCB3aWxsIGJlIHVzZWZ1bCB0byBoYXZlIENhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRFNldHRpbmdzIGFjY2Vzc2libGUKKyAgICAgICAgaW4gQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJEQmFzZSBmb3IgaW1wbGVtZW50aW5nIGNvbG9yIHNwYWNlIHN1cHBvcnQgaW4gSW1hZ2VEYXRh LiAKKworICAgICAgICBXaGlsZSBkb2luZyB0aGlzLCBJIG5vdGljZWQgaXQgd2FzIHRyaXZpYWwg dG8gYWRkIHN1cHBvcnQgZm9yIHBhc3NpbmcgdGhlIHNldHRpbmdzCisgICAgICAgIHRvIE9mZnNj cmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCwgc28gSSBhZGQgdGhhdCBhcyB3ZWxsLgorCisg ICAgICAgICogaHRtbC9PZmZzY3JlZW5DYW52YXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6T2Zm c2NyZWVuQ2FudmFzOjpnZXRDb250ZXh0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNS ZW5kZXJpbmdDb250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5n Q29udGV4dDJEOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQpOgorICAgICAgICAoV2ViQ29yZTo6 Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpwaXhlbEZvcm1hdCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmNvbG9yU3BhY2UgY29u c3QpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRC5oOgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJh c2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6 Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNS ZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpwaXhlbEZvcm1hdCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpjb2xvclNwYWNlIGNvbnN0KToKKyAg ICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmg6CisgICAg ICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpnZXRDb250ZXh0QXR0 cmlidXRlcyBjb25zdCk6CisgICAgICAgICogaHRtbC9jYW52YXMvT2Zmc2NyZWVuQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9mZnNjcmVlbkNhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRDo6T2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKToKKyAg ICAgICAgKiBodG1sL2NhbnZhcy9PZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaDoK KyAgICAgICAgKiBodG1sL2NhbnZhcy9QYWludFJlbmRlcmluZ0NvbnRleHQyRC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQYWludFJlbmRlcmluZ0NvbnRleHQyRDo6UGFpbnRSZW5kZXJpbmdDb250 ZXh0MkQpOgorCiAyMDIxLTA1LTE0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBTYW1wbGVkIFBhZ2UgVG9wIENvbG9yOiBtb3ZlIGxvZ2ljIG91dCBvZiBgRG9j dW1lbnRgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL09mZnNjcmVlbkNhbnZhcy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9PZmZzY3JlZW5DYW52YXMuY3BwCShyZXZp c2lvbiAyNzc0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL09mZnNjcmVlbkNhbnZhcy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTIxMyw3ICsyMTMsMTEgQEAgRXhjZXB0aW9uT3I8T3B0aW9uYWw8 T2Zmc2NyZWVuUmVuZGVyaW5nQwogICAgICAgICAgICAgcmV0dXJuIHsgeyBSZWZQdHI8T2Zmc2Ny ZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEPiB7ICZkb3duY2FzdDxPZmZzY3JlZW5DYW52YXNS ZW5kZXJpbmdDb250ZXh0MkQ+KCptX2NvbnRleHQpIH0gfSB9OwogICAgICAgICB9CiAKLSAgICAg ICAgbV9jb250ZXh0ID0gbWFrZVVuaXF1ZTxPZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQ+KCp0aGlzKTsKKyAgICAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUoc3Rh dGUudm0oKSk7CisgICAgICAgIGF1dG8gc2V0dGluZ3MgPSBjb252ZXJ0PElETERpY3Rpb25hcnk8 Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3M+PihzdGF0ZSwgIWFyZ3VtZW50cy5pc0Vt cHR5KCkgPyBhcmd1bWVudHNbMF0uZ2V0KCkgOiBKU0M6OmpzVW5kZWZpbmVkKCkpOworICAgICAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBFeGNlcHRpb24geyBFeGlzdGluZ0V4Y2VwdGlv bkVycm9yIH0pOworCisgICAgICAgIG1fY29udGV4dCA9IG1ha2VVbmlxdWU8T2Zmc2NyZWVuQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEPigqdGhpcywgc2V0dGluZ3MpOwogICAgICAgICBpZiAoIW1f Y29udGV4dCkKICAgICAgICAgICAgIHJldHVybiB7IHsgV1RGOjpudWxsb3B0IH0gfTsKIApJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJp bmdDb250ZXh0MkQuY3BwCShyZXZpc2lvbiAyNzc0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 OSw4ICs3OSw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQKIH0K IAogQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQoQ2Fu dmFzQmFzZSYgY2FudmFzLCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRTZXR0aW5ncyYmIHNldHRp bmdzLCBib29sIHVzZXNDU1NDb21wYXRpYmlsaXR5UGFyc2VNb2RlKQotICAgIDogQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJEQmFzZShjYW52YXMsIHVzZXNDU1NDb21wYXRpYmlsaXR5UGFyc2VNb2Rl KQotICAgICwgbV9zZXR0aW5ncyB7IFdURk1vdmUoc2V0dGluZ3MpIH0KKyAgICA6IENhbnZhc1Jl bmRlcmluZ0NvbnRleHQyREJhc2UoY2FudmFzLCBXVEZNb3ZlKHNldHRpbmdzKSwgdXNlc0NTU0Nv bXBhdGliaWxpdHlQYXJzZU1vZGUpCiB7CiB9CiAKQEAgLTI0NiwxNSArMjQ1LDQgQEAgdm9pZCBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdUZXh0SQogICAgIGRyYXdUZXh0VW5jaGVja2Vk KHRleHRSdW4sIHgsIHksIGZpbGwsIG1heFdpZHRoKTsKIH0KIAotUGl4ZWxGb3JtYXQgQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJEOjpwaXhlbEZvcm1hdCgpIGNvbnN0Ci17Ci0gICAgLy8gRklYTUU6 IFRha2UgbV9zZXR0aW5ncy5hbHBoYSBpbnRvIGFjY291bnQgaGVyZSBhbmQgYWRkIFBpeGVsRm9y bWF0OjpCR1JYOC4KLSAgICByZXR1cm4gUGl4ZWxGb3JtYXQ6OkJHUkE4OwotfQotCi1EZXN0aW5h dGlvbkNvbG9yU3BhY2UgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjb2xvclNwYWNlKCkgY29u c3QKLXsKLSAgICByZXR1cm4gdG9EZXN0aW5hdGlvbkNvbG9yU3BhY2UobV9zZXR0aW5ncy5jb2xv clNwYWNlKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgJKHJl dmlzaW9uIDI3NzQ1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRl cmluZ0NvbnRleHQyRC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw2IEBACiAjcHJhZ21h IG9uY2UKIAogI2luY2x1ZGUgIkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuaCIKLSNpbmNs dWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRTZXR0aW5ncy5oIgogI2luY2x1ZGUgIkhUTUxD YW52YXNFbGVtZW50LmgiCiAjaW5jbHVkZSA8bWVtb3J5PgogCkBAIC00Myw4ICs0Miw2IEBAIHB1 YmxpYzoKIAogICAgIEhUTUxDYW52YXNFbGVtZW50JiBjYW52YXMoKSBjb25zdCB7IHJldHVybiBk b3duY2FzdDxIVE1MQ2FudmFzRWxlbWVudD4oY2FudmFzQmFzZSgpKTsgfQogCi0gICAgY29uc3Qg Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3MmIGdldENvbnRleHRBdHRyaWJ1dGVzKCkg Y29uc3QgeyByZXR1cm4gbV9zZXR0aW5nczsgfQotCiAgICAgdm9pZCBkcmF3Rm9jdXNJZk5lZWRl ZChFbGVtZW50Jik7CiAgICAgdm9pZCBkcmF3Rm9jdXNJZk5lZWRlZChQYXRoMkQmLCBFbGVtZW50 Jik7CiAKQEAgLTYxLDggKzU4LDYgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgaXMyZCgpIGNvbnN0 IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KICAgICBjb25zdCBGb250UHJveHkqIGZvbnRQcm94eSgp IGZpbmFsOwotICAgIFBpeGVsRm9ybWF0IHBpeGVsRm9ybWF0KCkgY29uc3QgZmluYWw7Ci0gICAg RGVzdGluYXRpb25Db2xvclNwYWNlIGNvbG9yU3BhY2UoKSBjb25zdCBmaW5hbDsKIAogICAgIHZv aWQgc2V0Rm9udFdpdGhvdXRVcGRhdGluZ1N0eWxlKGNvbnN0IFN0cmluZyYpOwogCkBAIC03MSw4 ICs2Niw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkcmF3Rm9jdXNJZk5lZWRlZEludGVybmFsKGNv bnN0IFBhdGgmLCBFbGVtZW50Jik7CiAKICAgICBUZXh0RGlyZWN0aW9uIHRvVGV4dERpcmVjdGlv bihDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpEaXJlY3Rpb24sIGNvbnN0IFJlbmRlclN0 eWxlKiogY29tcHV0ZWRTdHlsZSA9IG51bGxwdHIpIGNvbnN0OwotCi0gICAgQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJEU2V0dGluZ3MgbV9zZXR0aW5nczsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0Nv bnRleHQyREJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz L0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuY3BwCShyZXZpc2lvbiAyNzc0NTEpCisrKyBT b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjI0LDEwICsyMjQsMTEgQEAgc3RhdGljIFRleHRCYXNlbGlu ZSBmcm9tQ2FudmFzVGV4dEJhc2VsaQogICAgIHJldHVybiBUb3BUZXh0QmFzZWxpbmU7CiB9CiAK LUNhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2U6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJh c2UoQ2FudmFzQmFzZSYgY2FudmFzLCBib29sIHVzZXNDU1NDb21wYXRpYmlsaXR5UGFyc2VNb2Rl KQorQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJE QmFzZShDYW52YXNCYXNlJiBjYW52YXMsIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRFNldHRpbmdz JiYgc2V0dGluZ3MsIGJvb2wgdXNlc0NTU0NvbXBhdGliaWxpdHlQYXJzZU1vZGUpCiAgICAgOiBD YW52YXNSZW5kZXJpbmdDb250ZXh0KGNhbnZhcykKICAgICAsIG1fc3RhdGVTdGFjaygxKQogICAg ICwgbV91c2VzQ1NTQ29tcGF0aWJpbGl0eVBhcnNlTW9kZSh1c2VzQ1NTQ29tcGF0aWJpbGl0eVBh cnNlTW9kZSkKKyAgICAsIG1fc2V0dGluZ3MoV1RGTW92ZShzZXR0aW5ncykpCiB7CiB9CiAKQEAg LTI2MTAsNCArMjYxMSwxNSBAQCBGbG9hdFBvaW50IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJh c2U6CiAgICAgcmV0dXJuIG9mZnNldDsKIH0KIAorUGl4ZWxGb3JtYXQgQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJEQmFzZTo6cGl4ZWxGb3JtYXQoKSBjb25zdAoreworICAgIC8vIEZJWE1FOiBUYWtl IG1fc2V0dGluZ3MuYWxwaGEgaW50byBhY2NvdW50IGhlcmUgYW5kIGFkZCBQaXhlbEZvcm1hdDo6 QkdSWDguCisgICAgcmV0dXJuIFBpeGVsRm9ybWF0OjpCR1JBODsKK30KKworRGVzdGluYXRpb25D b2xvclNwYWNlIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2U6OmNvbG9yU3BhY2UoKSBjb25z dAoreworICAgIHJldHVybiB0b0Rlc3RpbmF0aW9uQ29sb3JTcGFjZShtX3NldHRpbmdzLmNvbG9y U3BhY2UpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFz ZS5oCShyZXZpc2lvbiAyNzc0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52 YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcg QEAKICNpbmNsdWRlICJDYW52YXNMaW5lSm9pbi5oIgogI2luY2x1ZGUgIkNhbnZhc1BhdGguaCIK ICNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0LmgiCisjaW5jbHVkZSAiQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJEU2V0dGluZ3MuaCIKICNpbmNsdWRlICJDYW52YXNTdHlsZS5oIgogI2lu Y2x1ZGUgIkNhbnZhc1RleHRBbGlnbi5oIgogI2luY2x1ZGUgIkNhbnZhc1RleHRCYXNlbGluZS5o IgpAQCAtNzgsMTEgKzc5LDEzIEBAIHVzaW5nIENhbnZhc0ltYWdlU291cmNlID0gVmFyaWFudDxS ZWZQdHIKIGNsYXNzIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UgOiBwdWJsaWMgQ2FudmFz UmVuZGVyaW5nQ29udGV4dCwgcHVibGljIENhbnZhc1BhdGggewogICAgIFdURl9NQUtFX0lTT19B TExPQ0FURUQoQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZSk7CiBwcm90ZWN0ZWQ6Ci0gICAg Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZShDYW52YXNCYXNlJiwgYm9vbCB1c2VzQ1NTQ29t cGF0aWJpbGl0eVBhcnNlTW9kZSk7CisgICAgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZShD YW52YXNCYXNlJiwgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3MmJiwgYm9vbCB1c2Vz Q1NTQ29tcGF0aWJpbGl0eVBhcnNlTW9kZSk7CiAKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5DYW52 YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlKCk7CiAKKyAgICBjb25zdCBDYW52YXNSZW5kZXJpbmdD b250ZXh0MkRTZXR0aW5ncyYgZ2V0Q29udGV4dEF0dHJpYnV0ZXMoKSBjb25zdCB7IHJldHVybiBt X3NldHRpbmdzOyB9CisKICAgICBmbG9hdCBsaW5lV2lkdGgoKSBjb25zdCB7IHJldHVybiBzdGF0 ZSgpLmxpbmVXaWR0aDsgfQogICAgIHZvaWQgc2V0TGluZVdpZHRoKGZsb2F0KTsKIApAQCAtMzI4 LDYgKzMzMSw5IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc0VudGlyZUJhY2tpbmdTdG9yZURpcnR5 KCkgY29uc3Q7CiAgICAgRmxvYXRSZWN0IGJhY2tpbmdTdG9yZUJvdW5kcygpIGNvbnN0IHsgcmV0 dXJuIEZsb2F0UmVjdCB7IHsgfSwgRmxvYXRTaXplIHsgY2FudmFzQmFzZSgpLnNpemUoKSB9IH07 IH0KIAorICAgIFBpeGVsRm9ybWF0IHBpeGVsRm9ybWF0KCkgY29uc3QgZmluYWw7CisgICAgRGVz dGluYXRpb25Db2xvclNwYWNlIGNvbG9yU3BhY2UoKSBjb25zdCBmaW5hbDsKKwogICAgIHZvaWQg dW53aW5kU3RhdGVTdGFjaygpOwogICAgIHZvaWQgcmVhbGl6ZVNhdmVzTG9vcCgpOwogCkBAIC0z OTUsNiArNDAxLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdXNlc0NTU0NvbXBhdGliaWxpdHlQ YXJzZU1vZGU7CiAgICAgYm9vbCBtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcgeyBmYWxzZSB9Owog ICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPERpc3BsYXlMaXN0OjpEcmF3aW5nQ29udGV4dD4g bV9yZWNvcmRpbmdDb250ZXh0OworICAgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRFNldHRpbmdz IG1fc2V0dGluZ3M7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL2NhbnZhcy9PZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09mZnNjcmVlbkNhbnZh c1JlbmRlcmluZ0NvbnRleHQyRC5jcHAJKHJldmlzaW9uIDI3NzQ1MSkKKysrIFNvdXJjZS9XZWJD b3JlL2h0bWwvY2FudmFzL09mZnNjcmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ4LDggKzQ4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBXVEZf TUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJE KTsKIAotT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpPZmZzY3JlZW5DYW52YXNS ZW5kZXJpbmdDb250ZXh0MkQoQ2FudmFzQmFzZSYgY2FudmFzKQotICAgIDogQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJEQmFzZShjYW52YXMsIGZhbHNlKQorT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJEOjpPZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQoQ2FudmFzQmFzZSYg Y2FudmFzLCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRTZXR0aW5ncyYmIHNldHRpbmdzKQorICAg IDogQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZShjYW52YXMsIFdURk1vdmUoc2V0dGluZ3Mp LCBmYWxzZSkKIHsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvT2Zmc2Ny ZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaHRtbC9jYW52YXMvT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgJKHJldmlz aW9uIDI3NzQ1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09mZnNjcmVlbkNhbnZh c1JlbmRlcmluZ0NvbnRleHQyRC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw3ICszNiw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIE9mZnNjcmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQy RCBmaW5hbCA6IHB1YmxpYyBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlIHsKICAgICBXVEZf TUFLRV9JU09fQUxMT0NBVEVEKE9mZnNjcmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCk7CiBw dWJsaWM6Ci0gICAgT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKENhbnZhc0Jhc2Um KTsKKyAgICBPZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQoQ2FudmFzQmFzZSYsIENh bnZhc1JlbmRlcmluZ0NvbnRleHQyRFNldHRpbmdzJiYpOwogICAgIHZpcnR1YWwgfk9mZnNjcmVl bkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCgpOwogCiAgICAgT2Zmc2NyZWVuQ2FudmFzJiBjYW52 YXMoKSBjb25zdCB7IHJldHVybiBkb3duY2FzdDxPZmZzY3JlZW5DYW52YXM+KGNhbnZhc0Jhc2Uo KSk7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1BhaW50UmVuZGVyaW5nQ29u dGV4dDJELmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9QYWlu dFJlbmRlcmluZ0NvbnRleHQyRC5jcHAJKHJldmlzaW9uIDI3NzQ1MSkKKysrIFNvdXJjZS9XZWJD b3JlL2h0bWwvY2FudmFzL1BhaW50UmVuZGVyaW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDAsNyArNDAsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGFpbnRSZW5kZXJpbmdDb250ZXh0 MkQ+CiB9CiAKIFBhaW50UmVuZGVyaW5nQ29udGV4dDJEOjpQYWludFJlbmRlcmluZ0NvbnRleHQy RChDYW52YXNCYXNlJiBjYW52YXMpCi0gICAgOiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNl KGNhbnZhcywgZmFsc2UpCisgICAgOiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlKGNhbnZh cywgeyB9LCBmYWxzZSkKIHsKIH0KIAo= 428708 2021-05-14 20:59:54 -0700 2021-05-15 10:51:33 -0700 Patch bug-225836-20210514174757.patch text/plain 10805 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3NzUyMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA1LTE0ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRFNldHRpbmdzIGRvd24gdG8gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZSBzbyBp dCBjYW4gYmUgdXNlZCB0aGVyZSAoYW5kIHRvIHN1cHBvcnQgT2Zmc2NyZWVuQ2FudmFzKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODM2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gc3Vic2VxdWVu dCBjaGFuZ2VzLCBpdCB3aWxsIGJlIHVzZWZ1bCB0byBoYXZlIENhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRFNldHRpbmdzIGFjY2Vzc2libGUKKyAgICAgICAgaW4gQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJEQmFzZSBmb3IgaW1wbGVtZW50aW5nIGNvbG9yIHNwYWNlIHN1cHBvcnQgaW4gSW1hZ2VEYXRh LiAKKworICAgICAgICBXaGlsZSBkb2luZyB0aGlzLCBJIG5vdGljZWQgaXQgd2FzIHRyaXZpYWwg dG8gYWRkIHN1cHBvcnQgZm9yIHBhc3NpbmcgdGhlIHNldHRpbmdzCisgICAgICAgIHRvIE9mZnNj cmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCwgc28gSSBhZGQgdGhhdCBhcyB3ZWxsLgorCisg ICAgICAgICogaHRtbC9PZmZzY3JlZW5DYW52YXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6T2Zm c2NyZWVuQ2FudmFzOjpnZXRDb250ZXh0KToKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNS ZW5kZXJpbmdDb250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5n Q29udGV4dDJEOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQpOgorICAgICAgICAoV2ViQ29yZTo6 Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpwaXhlbEZvcm1hdCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmNvbG9yU3BhY2UgY29u c3QpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRC5oOgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJh c2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6 Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNS ZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpwaXhlbEZvcm1hdCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpjb2xvclNwYWNlIGNvbnN0KToKKyAg ICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmg6CisgICAg ICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpnZXRDb250ZXh0QXR0 cmlidXRlcyBjb25zdCk6CisgICAgICAgICogaHRtbC9jYW52YXMvT2Zmc2NyZWVuQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9mZnNjcmVlbkNhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRDo6T2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKToKKyAg ICAgICAgKiBodG1sL2NhbnZhcy9PZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaDoK KyAgICAgICAgKiBodG1sL2NhbnZhcy9QYWludFJlbmRlcmluZ0NvbnRleHQyRC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQYWludFJlbmRlcmluZ0NvbnRleHQyRDo6UGFpbnRSZW5kZXJpbmdDb250 ZXh0MkQpOgorCiAyMDIxLTA1LTE0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBTYW1wbGVkIFBhZ2UgVG9wIENvbG9yOiBtb3ZlIGxvZ2ljIG91dCBvZiBgRG9j dW1lbnRgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL09mZnNjcmVlbkNhbnZhcy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9PZmZzY3JlZW5DYW52YXMuY3BwCShyZXZp c2lvbiAyNzc0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL09mZnNjcmVlbkNhbnZhcy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTIxMyw3ICsyMTMsMTEgQEAgRXhjZXB0aW9uT3I8T3B0aW9uYWw8 T2Zmc2NyZWVuUmVuZGVyaW5nQwogICAgICAgICAgICAgcmV0dXJuIHsgeyBSZWZQdHI8T2Zmc2Ny ZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEPiB7ICZkb3duY2FzdDxPZmZzY3JlZW5DYW52YXNS ZW5kZXJpbmdDb250ZXh0MkQ+KCptX2NvbnRleHQpIH0gfSB9OwogICAgICAgICB9CiAKLSAgICAg ICAgbV9jb250ZXh0ID0gbWFrZVVuaXF1ZTxPZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQ+KCp0aGlzKTsKKyAgICAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUoc3Rh dGUudm0oKSk7CisgICAgICAgIGF1dG8gc2V0dGluZ3MgPSBjb252ZXJ0PElETERpY3Rpb25hcnk8 Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3M+PihzdGF0ZSwgIWFyZ3VtZW50cy5pc0Vt cHR5KCkgPyBhcmd1bWVudHNbMF0uZ2V0KCkgOiBKU0M6OmpzVW5kZWZpbmVkKCkpOworICAgICAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBFeGNlcHRpb24geyBFeGlzdGluZ0V4Y2VwdGlv bkVycm9yIH0pOworCisgICAgICAgIG1fY29udGV4dCA9IG1ha2VVbmlxdWU8T2Zmc2NyZWVuQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEPigqdGhpcywgV1RGTW92ZShzZXR0aW5ncykpOwogICAgICAg ICBpZiAoIW1fY29udGV4dCkKICAgICAgICAgICAgIHJldHVybiB7IHsgV1RGOjpudWxsb3B0IH0g fTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29u dGV4dDJELmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52 YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCShyZXZpc2lvbiAyNzc0NTEpCisrKyBTb3VyY2UvV2Vi Q29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03OSw4ICs3OSw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkQKIH0KIAogQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkQoQ2FudmFzQmFzZSYgY2FudmFzLCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRTZXR0aW5n cyYmIHNldHRpbmdzLCBib29sIHVzZXNDU1NDb21wYXRpYmlsaXR5UGFyc2VNb2RlKQotICAgIDog Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZShjYW52YXMsIHVzZXNDU1NDb21wYXRpYmlsaXR5 UGFyc2VNb2RlKQotICAgICwgbV9zZXR0aW5ncyB7IFdURk1vdmUoc2V0dGluZ3MpIH0KKyAgICA6 IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UoY2FudmFzLCBXVEZNb3ZlKHNldHRpbmdzKSwg dXNlc0NTU0NvbXBhdGliaWxpdHlQYXJzZU1vZGUpCiB7CiB9CiAKQEAgLTI0NiwxNSArMjQ1LDQg QEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdUZXh0SQogICAgIGRyYXdUZXh0 VW5jaGVja2VkKHRleHRSdW4sIHgsIHksIGZpbGwsIG1heFdpZHRoKTsKIH0KIAotUGl4ZWxGb3Jt YXQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpwaXhlbEZvcm1hdCgpIGNvbnN0Ci17Ci0gICAg Ly8gRklYTUU6IFRha2UgbV9zZXR0aW5ncy5hbHBoYSBpbnRvIGFjY291bnQgaGVyZSBhbmQgYWRk IFBpeGVsRm9ybWF0OjpCR1JYOC4KLSAgICByZXR1cm4gUGl4ZWxGb3JtYXQ6OkJHUkE4OwotfQot Ci1EZXN0aW5hdGlvbkNvbG9yU3BhY2UgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjb2xvclNw YWNlKCkgY29uc3QKLXsKLSAgICByZXR1cm4gdG9EZXN0aW5hdGlvbkNvbG9yU3BhY2UobV9zZXR0 aW5ncy5jb2xvclNwYWNlKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291 cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJELmgJKHJldmlzaW9uIDI3NzQ1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw2IEBA CiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2Uu aCIKLSNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRTZXR0aW5ncy5oIgogI2luY2x1 ZGUgIkhUTUxDYW52YXNFbGVtZW50LmgiCiAjaW5jbHVkZSA8bWVtb3J5PgogCkBAIC00Myw4ICs0 Miw2IEBAIHB1YmxpYzoKIAogICAgIEhUTUxDYW52YXNFbGVtZW50JiBjYW52YXMoKSBjb25zdCB7 IHJldHVybiBkb3duY2FzdDxIVE1MQ2FudmFzRWxlbWVudD4oY2FudmFzQmFzZSgpKTsgfQogCi0g ICAgY29uc3QgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3MmIGdldENvbnRleHRBdHRy aWJ1dGVzKCkgY29uc3QgeyByZXR1cm4gbV9zZXR0aW5nczsgfQotCiAgICAgdm9pZCBkcmF3Rm9j dXNJZk5lZWRlZChFbGVtZW50Jik7CiAgICAgdm9pZCBkcmF3Rm9jdXNJZk5lZWRlZChQYXRoMkQm LCBFbGVtZW50Jik7CiAKQEAgLTYxLDggKzU4LDYgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgaXMy ZCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KICAgICBjb25zdCBGb250UHJveHkqIGZv bnRQcm94eSgpIGZpbmFsOwotICAgIFBpeGVsRm9ybWF0IHBpeGVsRm9ybWF0KCkgY29uc3QgZmlu YWw7Ci0gICAgRGVzdGluYXRpb25Db2xvclNwYWNlIGNvbG9yU3BhY2UoKSBjb25zdCBmaW5hbDsK IAogICAgIHZvaWQgc2V0Rm9udFdpdGhvdXRVcGRhdGluZ1N0eWxlKGNvbnN0IFN0cmluZyYpOwog CkBAIC03MSw4ICs2Niw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkcmF3Rm9jdXNJZk5lZWRlZElu dGVybmFsKGNvbnN0IFBhdGgmLCBFbGVtZW50Jik7CiAKICAgICBUZXh0RGlyZWN0aW9uIHRvVGV4 dERpcmVjdGlvbihDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpEaXJlY3Rpb24sIGNvbnN0 IFJlbmRlclN0eWxlKiogY29tcHV0ZWRTdHlsZSA9IG51bGxwdHIpIGNvbnN0OwotCi0gICAgQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3MgbV9zZXR0aW5nczsKIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1Jl bmRlcmluZ0NvbnRleHQyREJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuY3BwCShyZXZpc2lvbiAyNzc0 NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0 MkRCYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI0LDEwICsyMjQsMTEgQEAgc3RhdGljIFRl eHRCYXNlbGluZSBmcm9tQ2FudmFzVGV4dEJhc2VsaQogICAgIHJldHVybiBUb3BUZXh0QmFzZWxp bmU7CiB9CiAKLUNhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2U6OkNhbnZhc1JlbmRlcmluZ0Nv bnRleHQyREJhc2UoQ2FudmFzQmFzZSYgY2FudmFzLCBib29sIHVzZXNDU1NDb21wYXRpYmlsaXR5 UGFyc2VNb2RlKQorQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6Q2FudmFzUmVuZGVyaW5n Q29udGV4dDJEQmFzZShDYW52YXNCYXNlJiBjYW52YXMsIENhbnZhc1JlbmRlcmluZ0NvbnRleHQy RFNldHRpbmdzJiYgc2V0dGluZ3MsIGJvb2wgdXNlc0NTU0NvbXBhdGliaWxpdHlQYXJzZU1vZGUp CiAgICAgOiBDYW52YXNSZW5kZXJpbmdDb250ZXh0KGNhbnZhcykKICAgICAsIG1fc3RhdGVTdGFj aygxKQogICAgICwgbV91c2VzQ1NTQ29tcGF0aWJpbGl0eVBhcnNlTW9kZSh1c2VzQ1NTQ29tcGF0 aWJpbGl0eVBhcnNlTW9kZSkKKyAgICAsIG1fc2V0dGluZ3MoV1RGTW92ZShzZXR0aW5ncykpCiB7 CiB9CiAKQEAgLTI2MTAsNCArMjYxMSwxNSBAQCBGbG9hdFBvaW50IENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyREJhc2U6CiAgICAgcmV0dXJuIG9mZnNldDsKIH0KIAorUGl4ZWxGb3JtYXQgQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6cGl4ZWxGb3JtYXQoKSBjb25zdAoreworICAgIC8vIEZJ WE1FOiBUYWtlIG1fc2V0dGluZ3MuYWxwaGEgaW50byBhY2NvdW50IGhlcmUgYW5kIGFkZCBQaXhl bEZvcm1hdDo6QkdSWDguCisgICAgcmV0dXJuIFBpeGVsRm9ybWF0OjpCR1JBODsKK30KKworRGVz dGluYXRpb25Db2xvclNwYWNlIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2U6OmNvbG9yU3Bh Y2UoKSBjb25zdAoreworICAgIHJldHVybiB0b0Rlc3RpbmF0aW9uQ29sb3JTcGFjZShtX3NldHRp bmdzLmNvbG9yU3BhY2UpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29u dGV4dDJEQmFzZS5oCShyZXZpc2lvbiAyNzc0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMy LDYgKzMyLDcgQEAKICNpbmNsdWRlICJDYW52YXNMaW5lSm9pbi5oIgogI2luY2x1ZGUgIkNhbnZh c1BhdGguaCIKICNpbmNsdWRlICJDYW52YXNSZW5kZXJpbmdDb250ZXh0LmgiCisjaW5jbHVkZSAi Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3MuaCIKICNpbmNsdWRlICJDYW52YXNTdHls ZS5oIgogI2luY2x1ZGUgIkNhbnZhc1RleHRBbGlnbi5oIgogI2luY2x1ZGUgIkNhbnZhc1RleHRC YXNlbGluZS5oIgpAQCAtNzgsMTEgKzc5LDEzIEBAIHVzaW5nIENhbnZhc0ltYWdlU291cmNlID0g VmFyaWFudDxSZWZQdHIKIGNsYXNzIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UgOiBwdWJs aWMgQ2FudmFzUmVuZGVyaW5nQ29udGV4dCwgcHVibGljIENhbnZhc1BhdGggewogICAgIFdURl9N QUtFX0lTT19BTExPQ0FURUQoQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZSk7CiBwcm90ZWN0 ZWQ6Ci0gICAgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZShDYW52YXNCYXNlJiwgYm9vbCB1 c2VzQ1NTQ29tcGF0aWJpbGl0eVBhcnNlTW9kZSk7CisgICAgQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJEQmFzZShDYW52YXNCYXNlJiwgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEU2V0dGluZ3MmJiwg Ym9vbCB1c2VzQ1NTQ29tcGF0aWJpbGl0eVBhcnNlTW9kZSk7CiAKIHB1YmxpYzoKICAgICB2aXJ0 dWFsIH5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlKCk7CiAKKyAgICBjb25zdCBDYW52YXNS ZW5kZXJpbmdDb250ZXh0MkRTZXR0aW5ncyYgZ2V0Q29udGV4dEF0dHJpYnV0ZXMoKSBjb25zdCB7 IHJldHVybiBtX3NldHRpbmdzOyB9CisKICAgICBmbG9hdCBsaW5lV2lkdGgoKSBjb25zdCB7IHJl dHVybiBzdGF0ZSgpLmxpbmVXaWR0aDsgfQogICAgIHZvaWQgc2V0TGluZVdpZHRoKGZsb2F0KTsK IApAQCAtMzI4LDYgKzMzMSw5IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc0VudGlyZUJhY2tpbmdT dG9yZURpcnR5KCkgY29uc3Q7CiAgICAgRmxvYXRSZWN0IGJhY2tpbmdTdG9yZUJvdW5kcygpIGNv bnN0IHsgcmV0dXJuIEZsb2F0UmVjdCB7IHsgfSwgRmxvYXRTaXplIHsgY2FudmFzQmFzZSgpLnNp emUoKSB9IH07IH0KIAorICAgIFBpeGVsRm9ybWF0IHBpeGVsRm9ybWF0KCkgY29uc3QgZmluYWw7 CisgICAgRGVzdGluYXRpb25Db2xvclNwYWNlIGNvbG9yU3BhY2UoKSBjb25zdCBmaW5hbDsKKwog ICAgIHZvaWQgdW53aW5kU3RhdGVTdGFjaygpOwogICAgIHZvaWQgcmVhbGl6ZVNhdmVzTG9vcCgp OwogCkBAIC0zOTUsNiArNDAxLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdXNlc0NTU0NvbXBh dGliaWxpdHlQYXJzZU1vZGU7CiAgICAgYm9vbCBtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcgeyBm YWxzZSB9OwogICAgIG11dGFibGUgc3RkOjp1bmlxdWVfcHRyPERpc3BsYXlMaXN0OjpEcmF3aW5n Q29udGV4dD4gbV9yZWNvcmRpbmdDb250ZXh0OworICAgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQy RFNldHRpbmdzIG1fc2V0dGluZ3M7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9PZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250 ZXh0MkQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09mZnNj cmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAJKHJldmlzaW9uIDI3NzQ1MSkKKysrIFNv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09mZnNjcmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDggKzQ4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJEKTsKIAotT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpPZmZzY3Jl ZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQoQ2FudmFzQmFzZSYgY2FudmFzKQotICAgIDogQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZShjYW52YXMsIGZhbHNlKQorT2Zmc2NyZWVuQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJEOjpPZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQoQ2Fu dmFzQmFzZSYgY2FudmFzLCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRTZXR0aW5ncyYmIHNldHRp bmdzKQorICAgIDogQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZShjYW52YXMsIFdURk1vdmUo c2V0dGluZ3MpLCBmYWxzZSkKIHsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52 YXMvT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJE LmgJKHJldmlzaW9uIDI3NzQ1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL09mZnNj cmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw3ICsz Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIE9mZnNjcmVlbkNhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRCBmaW5hbCA6IHB1YmxpYyBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlIHsK ICAgICBXVEZfTUFLRV9JU09fQUxMT0NBVEVEKE9mZnNjcmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRCk7CiBwdWJsaWM6Ci0gICAgT2Zmc2NyZWVuQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKENh bnZhc0Jhc2UmKTsKKyAgICBPZmZzY3JlZW5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQoQ2FudmFz QmFzZSYsIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRFNldHRpbmdzJiYpOwogICAgIHZpcnR1YWwg fk9mZnNjcmVlbkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCgpOwogCiAgICAgT2Zmc2NyZWVuQ2Fu dmFzJiBjYW52YXMoKSBjb25zdCB7IHJldHVybiBkb3duY2FzdDxPZmZzY3JlZW5DYW52YXM+KGNh bnZhc0Jhc2UoKSk7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1BhaW50UmVu ZGVyaW5nQ29udGV4dDJELmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9QYWludFJlbmRlcmluZ0NvbnRleHQyRC5jcHAJKHJldmlzaW9uIDI3NzQ1MSkKKysrIFNv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1BhaW50UmVuZGVyaW5nQ29udGV4dDJELmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGFpbnRSZW5kZXJp bmdDb250ZXh0MkQ+CiB9CiAKIFBhaW50UmVuZGVyaW5nQ29udGV4dDJEOjpQYWludFJlbmRlcmlu Z0NvbnRleHQyRChDYW52YXNCYXNlJiBjYW52YXMpCi0gICAgOiBDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkRCYXNlKGNhbnZhcywgZmFsc2UpCisgICAgOiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRC YXNlKGNhbnZhcywgeyB9LCBmYWxzZSkKIHsKIH0KIAo=