210364 2020-04-10 17:32:58 -0700 When drawing an image srcRect and imageRect have to be in the orientation of destRect 2020-05-08 14:33:45 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209849 https://bugs.webkit.org/show_bug.cgi?id=210371 InRadar P2 Normal --- 1 sabouhallawa sabouhallawa cdumez darin esprehn+autocc ews-watchlist graouts gyuyoung.kim webkit-bug-importer oldest_to_newest 1640434 0 sabouhallawa 2020-04-10 17:32:58 -0700 When passing ImageOrientation::None to any drawImage() function, srcRect and imageRect have to be calculated with this orientation. There are few places where the size of the image is calculated with ImageOrientation::FromImage because it is the default. 1640446 1 396140 sabouhallawa 2020-04-10 17:55:56 -0700 Created attachment 396140 Patch 1640925 2 ews-feeder 2020-04-13 09:43:26 -0700 Committed r260016: <https://trac.webkit.org/changeset/260016> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396140. 1640926 3 webkit-bug-importer 2020-04-13 09:44:17 -0700 <rdar://problem/61720495> 1647793 4 graouts 2020-05-01 01:33:31 -0700 This was reverted in r260989. 1650769 5 sabouhallawa 2020-05-08 14:33:45 -0700 It was reinstated in: Committed r261162: <https://trac.webkit.org/changeset/261162> 396140 2020-04-10 17:55:56 -0700 2020-04-13 09:43:27 -0700 Patch bug-210364-20200410175556.patch text/plain 10973 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1OTkxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA0LTEwICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgV2hlbiBkcmF3 aW5nIGFuIGltYWdlIHNyY1JlY3QgYW5kIGltYWdlUmVjdCBoYXZlIHRvIGJlIGluIHRoZSBvcmll bnRhdGlvbiBvZiBkZXN0UmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjEwMzY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2U6OmRyYXdJ bWFnZSk6CisgICAgICAgIFVzZSB0aGUgcmVuZGVyZXIgdG8gZ2V0IHRoZSBvcmllbnRhdGlvbiBv ZiB0aGUgaW1hZ2UgaWYgaXQgaXMgYXZhaWxhYmxlLgorICAgICAgICBPdGhlcndpc2UgZmFsbCBi YWNrIHRvIGNvbXB1dGVkU3R5bGUoKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Jp dG1hcEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpkcmF3KToKKyAg ICAgICAgRm9yIGFzeW5jIGltYWdlIGRlY29kaW5nLCB3ZSB3aWxsIHVzZSB0aGUgbm9uZSBvcmll bnRlZCBzaXplIGFzIHRoZQorICAgICAgICBzaXplRm9yRHJhd2luZy4gaW1hZ2VSZWN0IG11c3Qg YmUgaW4gdGhlIHNhbWUgb3JpZW50YXRpb24gYXMgZGVzdFJlY3QuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UpOgorICAgICAgICBzcmNSZWN0IG11c3QgYmUgaW4gdGhl IHNhbWUgb3JpZW50YXRpb24gYXMgZGVzdFJlY3QuCisKIDIwMjAtMDQtMTAgIFBlbmcgTGl1ICA8 cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiAocjI1OTg1MClbIE1h YyB3azEgRGVidWcgXSBtZWRpYS90cmFjay90cmFjay11c2VyLXN0eWxlc2hlZXQuaHRtbCBpcyBm bGFreSBmYWlsaW5nLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJEQmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRt bC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZS5jcHAJKHJldmlzaW9uIDI1OTgz MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy REJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDY1LDcgKzE0NjUsOSBAQCBFeGNlcHRpb25P cjx2b2lkPiBDYW52YXNSZW5kZXJpbmdDb250ZXh0CiAgICAgRmxvYXRSZWN0IGltYWdlUmVjdCA9 IEZsb2F0UmVjdChGbG9hdFBvaW50KCksIHNpemUoaW1hZ2VFbGVtZW50LCBJbWFnZVNpemVUeXBl OjpCZWZvcmVEZXZpY2VQaXhlbFJhdGlvKSk7CiAKICAgICBhdXRvIG9yaWVudGF0aW9uID0gSW1h Z2VPcmllbnRhdGlvbjo6RnJvbUltYWdlOwotICAgIGlmIChhdXRvKiBjb21wdXRlZFN0eWxlID0g aW1hZ2VFbGVtZW50LmNvbXB1dGVkU3R5bGUoKSkKKyAgICBpZiAoYXV0byogcmVuZGVyZXIgPSBp bWFnZUVsZW1lbnQucmVuZGVyZXIoKSkKKyAgICAgICAgb3JpZW50YXRpb24gPSByZW5kZXJlci0+ c3R5bGUoKS5pbWFnZU9yaWVudGF0aW9uKCk7CisgICAgZWxzZSBpZiAoYXV0byogY29tcHV0ZWRT dHlsZSA9IGltYWdlRWxlbWVudC5jb21wdXRlZFN0eWxlKCkpCiAgICAgICAgIG9yaWVudGF0aW9u ID0gY29tcHV0ZWRTdHlsZS0+aW1hZ2VPcmllbnRhdGlvbigpOwogCiAgICAgYXV0byByZXN1bHQg PSBkcmF3SW1hZ2UoaW1hZ2VFbGVtZW50LmRvY3VtZW50KCksIGltYWdlRWxlbWVudC5jYWNoZWRJ bWFnZSgpLCBpbWFnZUVsZW1lbnQucmVuZGVyZXIoKSwgaW1hZ2VSZWN0LCBzcmNSZWN0LCBkc3RS ZWN0LCBvcCwgYmxlbmRNb2RlLCBvcmllbnRhdGlvbik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCShyZXZpc2lvbiAyNTk4MzIp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIxMCw3ICsyMTAsNyBAQCBJbWFnZURyYXdSZXN1bHQgQml0bWFwSW1h Z2U6OmRyYXcoR3JhcGhpCiAgICAgICAgIHJldHVybiBJbWFnZURyYXdSZXN1bHQ6OkRpZE5vdGhp bmc7CiAKICAgICBGbG9hdFNpemUgc2NhbGVGYWN0b3JGb3JEcmF3aW5nID0gY29udGV4dC5zY2Fs ZUZhY3RvckZvckRyYXdpbmcoZGVzdFJlY3QsIHNyY1JlY3QpOwotICAgIEludFNpemUgc2l6ZUZv ckRyYXdpbmcgPSBleHBhbmRlZEludFNpemUoc2l6ZSgpICogc2NhbGVGYWN0b3JGb3JEcmF3aW5n KTsKKyAgICBJbnRTaXplIHNpemVGb3JEcmF3aW5nID0gZXhwYW5kZWRJbnRTaXplKHNpemUoSW1h Z2VPcmllbnRhdGlvbjo6Tm9uZSkgKiBzY2FsZUZhY3RvckZvckRyYXdpbmcpOwogICAgIEltYWdl RHJhd1Jlc3VsdCByZXN1bHQgPSBJbWFnZURyYXdSZXN1bHQ6OkRpZERyYXc7CiAKICAgICBtX2N1 cnJlbnRTdWJzYW1wbGluZ0xldmVsID0gbV9hbGxvd1N1YnNhbXBsaW5nID8gc3Vic2FtcGxpbmdM ZXZlbEZvclNjYWxlRmFjdG9yKGNvbnRleHQsIHNjYWxlRmFjdG9yRm9yRHJhd2luZykgOiBTdWJz YW1wbGluZ0xldmVsOjpEZWZhdWx0OwpAQCAtMjg5LDEwICsyODksMTIgQEAgSW1hZ2VEcmF3UmVz dWx0IEJpdG1hcEltYWdlOjpkcmF3KEdyYXBoaQogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAg IH0KIAotICAgIGlmIChvcHRpb25zLm9yaWVudGF0aW9uKCkgPT0gSW1hZ2VPcmllbnRhdGlvbjo6 RnJvbUltYWdlKQotICAgICAgICBkcmF3TmF0aXZlSW1hZ2UoaW1hZ2UsIGNvbnRleHQsIGRlc3RS ZWN0LCBzcmNSZWN0LCBJbnRTaXplKHNpemUoKSksIHsgb3B0aW9ucywgZnJhbWVPcmllbnRhdGlv bkF0SW5kZXgobV9jdXJyZW50RnJhbWUpIH0pOwotICAgIGVsc2UKLSAgICAgICAgZHJhd05hdGl2 ZUltYWdlKGltYWdlLCBjb250ZXh0LCBkZXN0UmVjdCwgc3JjUmVjdCwgSW50U2l6ZShzaXplKCkp LCBvcHRpb25zKTsKKyAgICBhdXRvIG9yaWVudGF0aW9uID0gb3B0aW9ucy5vcmllbnRhdGlvbigp OworICAgIGlmIChvcmllbnRhdGlvbiA9PSBJbWFnZU9yaWVudGF0aW9uOjpGcm9tSW1hZ2UpIHsK KyAgICAgICAgb3JpZW50YXRpb24gPSBmcmFtZU9yaWVudGF0aW9uQXRJbmRleChtX2N1cnJlbnRG cmFtZSk7CisgICAgICAgIGRyYXdOYXRpdmVJbWFnZShpbWFnZSwgY29udGV4dCwgZGVzdFJlY3Qs IHNyY1JlY3QsIEludFNpemUoc2l6ZShvcmllbnRhdGlvbikpLCB7IG9wdGlvbnMsIG9yaWVudGF0 aW9uIH0pOworICAgIH0gZWxzZQorICAgICAgICBkcmF3TmF0aXZlSW1hZ2UoaW1hZ2UsIGNvbnRl eHQsIGRlc3RSZWN0LCBzcmNSZWN0LCBJbnRTaXplKHNpemUob3JpZW50YXRpb24pKSwgb3B0aW9u cyk7CiAKICAgICBtX2N1cnJlbnRGcmFtZURlY29kaW5nU3RhdHVzID0gZnJhbWVEZWNvZGluZ1N0 YXR1c0F0SW5kZXgobV9jdXJyZW50RnJhbWUpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAJKHJldmlzaW9uIDI1 OTgzMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcxMSw3ICs3MTEsNyBAQCBJbWFnZURyYXdSZXN1bHQg R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hCiAKIEltYWdlRHJhd1Jlc3VsdCBHcmFwaGljc0NvbnRl eHQ6OmRyYXdJbWFnZShJbWFnZSYgaW1hZ2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdGluYXRpb24s IGNvbnN0IEltYWdlUGFpbnRpbmdPcHRpb25zJiBpbWFnZVBhaW50aW5nT3B0aW9ucykKIHsKLSAg ICBGbG9hdFJlY3Qgc3JjUmVjdChGbG9hdFBvaW50KCksIGltYWdlLnNpemUoKSk7CisgICAgRmxv YXRSZWN0IHNyY1JlY3QoRmxvYXRQb2ludCgpLCBpbWFnZS5zaXplKGltYWdlUGFpbnRpbmdPcHRp b25zLm9yaWVudGF0aW9uKCkpKTsKICAgICByZXR1cm4gZHJhd0ltYWdlKGltYWdlLCBkZXN0aW5h dGlvbiwgc3JjUmVjdCwgaW1hZ2VQYWludGluZ09wdGlvbnMpOwogfQogCkluZGV4OiBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZp c2lvbiAyNTk4MzIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNiBAQAorMjAyMC0wNC0xMCAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJvdWhhbGxh d2FAYXBwbGUuY29tPgorCisgICAgICAgIFdoZW4gZHJhd2luZyBhbiBpbWFnZSBzcmNSZWN0IGFu ZCBpbWFnZVJlY3QgaGF2ZSB0byBiZSBpbiB0aGUgb3JpZW50YXRpb24gb2YgZGVzdFJlY3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDM2NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9pbWFn ZXMvaW1hZ2Utb3JpZW50YXRpb24tbm9uZS1jYW52YXMuaHRtbDoKKyAgICAgICAgTWFrZSB0aGlz IHRlc3QgZm9yIGltYWdlcyB3aXRoICJ2aXNpYmlsaXR5OiBoaWRkZW47IiBvbmx5LiBUaGlzIGd1 YXJhbnRlZXMKKyAgICAgICAgdGhlIGltYWdlcyBoYXZlIHJlbmRlcmVycy4gSW1hZ2VzIHdpdGgg ImRpc3BsYXk6IG5vbmU7IiB3aWxsIGJlIGNvdmVyZWQKKyAgICAgICAgaW4gYW5vdGhlciBwYXRj aCBiZWNhdXNlIHRoZSB3aWR0aCBhbmQgaGVpZ2h0IGlzIGN1cnJlbnRseSBpbmNvcnJlY3QgaWYK KyAgICAgICAgImltYWdlLW9yaWVudGF0aW9uOiBub25lOyIuCisKIDIwMjAtMDQtMDkgIERhbmll bCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdOiBOZXcgdGVzdCBs YW5kZWQgZm9yIHIyNTk3NjIgbGFuZGVkIGJyb2tlbjogZWRpdGluZy9lZGl0YWJsZS1yZWdpb24v aGl0LXRlc3Qtb3ZlcmxhcC5odG1sCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2ltYWdlcy9pbWFn ZS1vcmllbnRhdGlvbi1ub25lLWNhbnZhcy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QvaW1hZ2VzL2ltYWdlLW9yaWVudGF0aW9uLW5vbmUtY2FudmFzLmh0bWwJKHJldmlzaW9u IDI1OTgzMikKKysrIExheW91dFRlc3RzL2Zhc3QvaW1hZ2VzL2ltYWdlLW9yaWVudGF0aW9uLW5v bmUtY2FudmFzLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTExLDcgKzExLDEzIEBACiAgICAgICAg IHdpZHRoOiAxMDJweDsKICAgICAgICAgaGVpZ2h0OiA1MnB4OwogICAgIH0KKyAgICBpbWcgewor ICAgICAgICBwb3NpdGlvbjogZml4ZWQ7CisgICAgICAgIGltYWdlLW9yaWVudGF0aW9uOiBub25l OworICAgICAgICB2aXNpYmlsaXR5OiBoaWRkZW47CisgICAgfQogICAgIGNhbnZhcyB7CisgICAg ICAgIHBvc2l0aW9uOiBmaXhlZDsKICAgICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CiAg ICAgICAgIHdpZHRoOiAxMDBweDsKICAgICAgICAgaGVpZ2h0OiA1MHB4OwpAQCAtMjMsNTcgKzI5 LDY2IEBACiAgICAgPGJyPgogICAgIDxkaXYgY2xhc3MgPSJjb250YWluZXIiPgogICAgICAgICA8 ZGl2IGNsYXNzID0iYm94Ij4KLSAgICAgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhczEiPjwvY2Fu dmFzPgorICAgICAgICAgICAgPGltZyBzcmM9InJlc291cmNlcy9leGlmLW9yaWVudGF0aW9uLTEt dWwuanBnIj4KKyAgICAgICAgICAgIDxjYW52YXM+PC9jYW52YXM+CiAgICAgICAgIDwvZGl2Pgog ICAgICAgICA8YnI+Tm9ybWFsCiAgICAgPC9kaXY+CiAgICAgPGRpdiBjbGFzcyA9ImNvbnRhaW5l ciI+CiAgICAgICAgIDxkaXYgY2xhc3MgPSJib3giPgotICAgICAgICAgICAgPGNhbnZhcyBpZD0i Y2FudmFzMiI+PC9jYW52YXM+CisgICAgICAgICAgICA8aW1nIHNyYz0icmVzb3VyY2VzL2V4aWYt b3JpZW50YXRpb24tMi11ci5qcGciPgorICAgICAgICAgICAgPGNhbnZhcz48L2NhbnZhcz4KICAg ICAgICAgPC9kaXY+CiAgICAgICAgIDxicj5GbGlwcGVkIGhvcml6b250YWxseQogICAgIDwvZGl2 PgogICAgIDxkaXYgY2xhc3MgPSJjb250YWluZXIiPgogICAgICAgICA8ZGl2IGNsYXNzID0iYm94 Ij4KLSAgICAgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhczMiPjwvY2FudmFzPgorICAgICAgICAg ICAgPGltZyBzcmM9InJlc291cmNlcy9leGlmLW9yaWVudGF0aW9uLTMtbHIuanBnIj4KKyAgICAg ICAgICAgIDxjYW52YXM+PC9jYW52YXM+CiAgICAgICAgIDwvZGl2PgogICAgICAgICA8YnI+Um90 YXRlZCAxODAmZGVnOwogICAgIDwvZGl2PgogICAgIDxkaXYgY2xhc3MgPSJjb250YWluZXIiPgog ICAgICAgICA8ZGl2IGNsYXNzID0iYm94Ij4KLSAgICAgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZh czQiPjwvY2FudmFzPgorICAgICAgICAgICAgPGltZyBzcmM9InJlc291cmNlcy9leGlmLW9yaWVu dGF0aW9uLTQtbG9sLmpwZyI+CisgICAgICAgICAgICA8Y2FudmFzPjwvY2FudmFzPgogICAgICAg ICA8L2Rpdj4KICAgICAgICAgPGJyPkZsaXBwZWQgdmVydGljYWxseQogICAgIDwvZGl2PgogICAg IDxicj4KICAgICA8ZGl2IGNsYXNzID0iY29udGFpbmVyIj4KICAgICAgICAgPGRpdiBjbGFzcyA9 ImJveCI+Ci0gICAgICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXM1Ij48L2NhbnZhcz4KKyAgICAg ICAgICAgIDxpbWcgc3JjPSJyZXNvdXJjZXMvZXhpZi1vcmllbnRhdGlvbi01LWx1LmpwZyI+Cisg ICAgICAgICAgICA8Y2FudmFzPjwvY2FudmFzPgogICAgICAgICA8L2Rpdj4KICAgICAgICAgPGJy PlJvdGF0ZWQgOTAmZGVnOyBDQ1cgYW5kIGZsaXBwZWQgdmVydGljYWxseQogICAgIDwvZGl2Pgog ICAgIDxkaXYgY2xhc3MgPSJjb250YWluZXIiPgogICAgICAgICA8ZGl2IGNsYXNzID0iYm94Ij4K LSAgICAgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhczYiPjwvY2FudmFzPgorICAgICAgICAgICAg PGltZyBzcmM9InJlc291cmNlcy9leGlmLW9yaWVudGF0aW9uLTYtcnUuanBnIj4KKyAgICAgICAg ICAgIDxjYW52YXM+PC9jYW52YXM+CiAgICAgICAgIDwvZGl2PgogICAgICAgICA8YnI+Um90YXRl ZCA5MCZkZWc7IENDVwogICAgIDwvZGl2PgogICAgIDxkaXYgY2xhc3MgPSJjb250YWluZXIiPgog ICAgICAgICA8ZGl2IGNsYXNzID0iYm94Ij4KLSAgICAgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZh czciPjwvY2FudmFzPgorICAgICAgICAgICAgPGltZyBzcmM9InJlc291cmNlcy9leGlmLW9yaWVu dGF0aW9uLTctcmwuanBnIj4KKyAgICAgICAgICAgIDxjYW52YXM+PC9jYW52YXM+CiAgICAgICAg IDwvZGl2PgogICAgICAgICA8YnI+Um90YXRlZCA5MCZkZWc7IENXIGFuZCBmbGlwcGVkIHZlcnRp Y2FsbHkKICAgICA8L2Rpdj4KICAgICA8ZGl2IGNsYXNzID0iY29udGFpbmVyIj4KICAgICAgICAg PGRpdiBjbGFzcyA9ImJveCI+Ci0gICAgICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXM4Ij48L2Nh bnZhcz4KKyAgICAgICAgICAgIDxpbWcgc3JjPSJyZXNvdXJjZXMvZXhpZi1vcmllbnRhdGlvbi04 LWxsby5qcGciPgorICAgICAgICAgICAgPGNhbnZhcz48L2NhbnZhcz4KICAgICAgICAgPC9kaXY+ CiAgICAgICAgIDxicj5Sb3RhdGVkIDkwJmRlZzsgQ1cKICAgICA8L2Rpdj4KICAgICA8YnI+CiAg ICAgPGRpdiBjbGFzcyA9ImNvbnRhaW5lciI+CiAgICAgICAgIDxkaXYgY2xhc3MgPSJib3giPgot ICAgICAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzOSI+PC9jYW52YXM+CisgICAgICAgICAgICA8 aW1nIHNyYz0icmVzb3VyY2VzL2V4aWYtb3JpZW50YXRpb24tOS11LmpwZyI+CisgICAgICAgICAg ICA8Y2FudmFzPjwvY2FudmFzPgogICAgICAgICA8L2Rpdj4KICAgICAgICAgPGJyPlVuZGVmaW5l ZCAoaW52YWxpZCB2YWx1ZSkKICAgICA8L2Rpdj4KQEAgLTgyLDM4ICs5NywxOCBAQAogICAgICAg ICAgICAgd2luZG93LnRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOwogCiAgICAgICAgIHdpbmRv dy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKLSAgICAgICAgICAgIHZhciBuYW1lcyA9IFsKLSAgICAg ICAgICAgICAgICB7IHJlc291cmNlOiAicmVzb3VyY2VzL2V4aWYtb3JpZW50YXRpb24tMS11bC5q cGciLCAgaWQgOiAiY2FudmFzMSIgfSwKLSAgICAgICAgICAgICAgICB7IHJlc291cmNlOiAicmVz b3VyY2VzL2V4aWYtb3JpZW50YXRpb24tMi11ci5qcGciLCAgaWQgOiAiY2FudmFzMiIgfSwKLSAg ICAgICAgICAgICAgICB7IHJlc291cmNlOiAicmVzb3VyY2VzL2V4aWYtb3JpZW50YXRpb24tMy1s ci5qcGciLCAgaWQgOiAiY2FudmFzMyIgfSwKLSAgICAgICAgICAgICAgICB7IHJlc291cmNlOiAi cmVzb3VyY2VzL2V4aWYtb3JpZW50YXRpb24tNC1sb2wuanBnIiwgaWQgOiAiY2FudmFzNCIgfSwK LSAgICAgICAgICAgICAgICB7IHJlc291cmNlOiAicmVzb3VyY2VzL2V4aWYtb3JpZW50YXRpb24t NS1sdS5qcGciLCAgaWQgOiAiY2FudmFzNSIgfSwKLSAgICAgICAgICAgICAgICB7IHJlc291cmNl OiAicmVzb3VyY2VzL2V4aWYtb3JpZW50YXRpb24tNi1ydS5qcGciLCAgaWQgOiAiY2FudmFzNiIg fSwKLSAgICAgICAgICAgICAgICB7IHJlc291cmNlOiAicmVzb3VyY2VzL2V4aWYtb3JpZW50YXRp b24tNy1ybC5qcGciLCAgaWQgOiAiY2FudmFzNyIgfSwKLSAgICAgICAgICAgICAgICB7IHJlc291 cmNlOiAicmVzb3VyY2VzL2V4aWYtb3JpZW50YXRpb24tOC1sbG8uanBnIiwgaWQgOiAiY2FudmFz OCIgfSwKLSAgICAgICAgICAgICAgICB7IHJlc291cmNlOiAicmVzb3VyY2VzL2V4aWYtb3JpZW50 YXRpb24tOS11LmpwZyIsICAgaWQgOiAiY2FudmFzOSIgfQotICAgICAgICAgICAgXTsKLQotICAg ICAgICAgICAgdmFyIGRyYXdDb3VudCA9IDA7CisgICAgICAgICAgICB2YXIgYm94ZXMgPSBkb2N1 bWVudC5xdWVyeVNlbGVjdG9yQWxsKCIuYm94Iik7CiAKLSAgICAgICAgICAgIG5hbWVzLmZvckVh Y2goZnVuY3Rpb24obmFtZSkgewotICAgICAgICAgICAgICAgIHZhciBpbWFnZSA9IG5ldyBJbWFn ZTsKLSAgICAgICAgICAgICAgICBpbWFnZS5zdHlsZS5pbWFnZU9yaWVudGF0aW9uID0gIm5vbmUi OwotICAgICAgICAgICAgICAgIGltYWdlLnN0eWxlLmRpc3BsYXkgPSAibm9uZSI7Ci0gICAgICAg ICAgICAgICAgaW1hZ2Uuc3JjID0gbmFtZS5yZXNvdXJjZTsKLSAgICAgICAgICAgICAgICBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKGltYWdlKTsKLSAgICAgICAgICAgICAgICBpbWFnZS5kZWNv ZGUoKS50aGVuKCgpID0+IHsKLSAgICAgICAgICAgICAgICAgICAgbGV0IGNhbnZhcyA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKG5hbWUuaWQpOwotICAgICAgICAgICAgICAgICAgICBjYW52YXMu d2lkdGggPSBjYW52YXMub2Zmc2V0V2lkdGggLSAyOwotICAgICAgICAgICAgICAgICAgICBjYW52 YXMuaGVpZ2h0ID0gY2FudmFzLm9mZnNldEhlaWdodCAtIDI7Ci0gICAgICAgICAgICAgICAgICAg IGxldCBjb250ZXh0ID0gY2FudmFzLmdldENvbnRleHQoIjJkIik7Ci0gICAgICAgICAgICAgICAg ICAgIGNvbnRleHQuZHJhd0ltYWdlKGltYWdlLCAwLCAwLCBjYW52YXMud2lkdGgsIGNhbnZhcy5o ZWlnaHQpOwotICAgICAgICAgICAgICAgICAgICBpZiAoKytkcmF3Q291bnQgPT0gbmFtZXMubGVu Z3RoKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgp OwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAg ICBib3hlcy5mb3JFYWNoKGZ1bmN0aW9uKGJveCkgeworICAgICAgICAgICAgICAgIGxldCBpbWFn ZSA9IGJveC5xdWVyeVNlbGVjdG9yKCJpbWciKTsKKyAgICAgICAgICAgICAgICBsZXQgY2FudmFz ID0gYm94LnF1ZXJ5U2VsZWN0b3IoImNhbnZhcyIpOworICAgICAgICAgICAgICAgIGNhbnZhcy53 aWR0aCA9IGNhbnZhcy5jbGllbnRXaWR0aDsKKyAgICAgICAgICAgICAgICBjYW52YXMuaGVpZ2h0 ID0gY2FudmFzLmNsaWVudEhlaWdodDsKKyAgICAgICAgICAgICAgICBsZXQgY29udGV4dCA9IGNh bnZhcy5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICAgICAgICAgIGNvbnRleHQuZHJhd0ltYWdl KGltYWdlLCAwLCAwLCBjYW52YXMud2lkdGgsIGNhbnZhcy5oZWlnaHQpOwogICAgICAgICAgICAg fSk7CisKKyAgICAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKICAgICAg ICAgfQogICAgIDwvc2NyaXB0PgogPC9ib2R5Pgo=