243632 2022-08-06 15:49:03 -0700 [Painting] Remove redundant TextDecorationPainter c'tor parameters 2022-08-14 14:06:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 243766 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1889425 0 zalan 2022-08-06 15:49:03 -0700 ssia 1889430 1 461448 zalan 2022-08-06 15:56:03 -0700 Created attachment 461448 [fast-cq]Patch 1889514 2 ews-feeder 2022-08-07 07:06:46 -0700 Committed 253189@main (2107ba5adf9a): <https://commits.webkit.org/253189@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 461448. 1889515 3 webkit-bug-importer 2022-08-07 07:07:17 -0700 <rdar://problem/98273126> 461448 2022-08-06 15:56:03 -0700 2022-08-07 07:06:47 -0700 [fast-cq]Patch bug-243632-20220806155603.patch text/plain 15896 zalan RnJvbSAyZDQ3YmI2ZjJkMTNiZWM0MDM0NWViYzlkNTQxMTAzNDRmMTgwODk4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBT YXQsIDYgQXVnIDIwMjIgMTU6NDk6NTIgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbUGFpbnRpbmdd IFJlbW92ZSByZWR1bmRhbnQgVGV4dERlY29yYXRpb25QYWludGVyIGMndG9yCiBwYXJhbWV0ZXJz IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDM2MzIKClJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgoKMS4gSW5jb21pbmcgT3B0aW9uU2V0PFRleHREZWNvcmF0aW9u TGluZT4gaXMgdGhlIGNvbWJpbmF0aW9uIG9mIHRoZSB0aGUgdGV4dCBib3ggc3R5bGUgYW5kIHNv bWUgb3ZlcnJpZGUgc3R5bGUgKGJvdGggcGFzc2VkIGluIGFscmVhZHkpIC0+IHRoaXMgZW5hYmxl cyB1cyB0byBtb3ZlIHRleHREZWNvcmF0aW9uc0luRWZmZWN0Rm9yU3R5bGUgbG9jYWwgdG8gVGV4 dEJveFBhaW50ZXIuY3BwLgoyLiBpc0ZpcnN0TGluZSBpcyBqdXN0IHRleHRCb3gtPmxpbmVCb3go KS0+aXNGaXJzdAozLiBzdGQ6Om9wdGlvbmFsPFN0eWxlcz4gc2hvdWxkIG5vdCBuZWVkIHRvIGJl IG9wdGlvbmFsPD4uIFRoZSBwbGFjZSB3aGVyZSB3ZSBjb25zdHJ1Y3QgdGhlIFRleHREZWNvcmF0 aW9uUGFpbnRlciBhbHdheXMgcGFzc2VzIGluIGEgdmFsaWQgIm92ZXJyaWRlIHN0eWxlIi4KNC4g UmVuYW1lIG1fbGluZVN0eWxlIHRvIG1fdGV4dEJveFN0eWxlICh0aGlzIGlzIGluIHByZXBhcmF0 aW9uIGZvciB0ZWxsaW5nIGRlY29yYXRpbmcgYW5kIHRleHQgYm94IHN0eWxlcyBhcGFydCkgLXNh bWUgZm9yIG1fZGVjb3JhdGlvbi9tX3RleHRCb3hEZWNvcmF0aW9ucy4KCiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcDoKKFdlYkNvcmU6OlRleHRCb3hQYWludGVy PFRleHRCb3hQYXRoPjo6Y3JlYXRlRGVjb3JhdGlvblBhaW50ZXIpOgoqIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9UZXh0RGVjb3JhdGlvblBhaW50ZXIuY3BwOgooV2ViQ29yZTo6dGV4dERlY29y YXRpb25zSW5FZmZlY3RGb3JTdHlsZSk6CihXZWJDb3JlOjpUZXh0RGVjb3JhdGlvblBhaW50ZXI6 OlRleHREZWNvcmF0aW9uUGFpbnRlcik6CihXZWJDb3JlOjpUZXh0RGVjb3JhdGlvblBhaW50ZXI6 OnBhaW50QmFja2dyb3VuZERlY29yYXRpb25zKToKKFdlYkNvcmU6OlRleHREZWNvcmF0aW9uUGFp bnRlcjo6cGFpbnRGb3JlZ3JvdW5kRGVjb3JhdGlvbnMpOgooV2ViQ29yZTo6VGV4dERlY29yYXRp b25QYWludGVyOjpwYWludExpbmVUaHJvdWdoKToKKFdlYkNvcmU6OlRleHREZWNvcmF0aW9uUGFp bnRlcjo6dGV4dERlY29yYXRpb25zSW5FZmZlY3RGb3JTdHlsZSk6IERlbGV0ZWQuCiogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5oOgotLS0KIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAgICB8ICA0ICstCiAuLi4vcmVuZGVy aW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHAgICAgICAgfCA2NyArKysrKysrKysrLS0tLS0t LS0tCiAuLi4vV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmggfCAgNyAr LQogMyBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRpb25zKCspLCA0MCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEJveFBhaW50ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcAppbmRleCBkNzRlN2E5 NTgxMDUuLmEzNGRjZWNlOGQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1RleHRCb3hQYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEJv eFBhaW50ZXIuY3BwCkBAIC00MzMsMTEgKzQzMyw5IEBAIFRleHREZWNvcmF0aW9uUGFpbnRlciBU ZXh0Qm94UGFpbnRlcjxUZXh0Qm94UGF0aD46OmNyZWF0ZURlY29yYXRpb25QYWludGVyKGNvbnN0 CiAgICAgfQogCiAgICAgLy8gQ3JlYXRlIHBhaW50ZXIKLSAgICBhdXRvIHRleHREZWNvcmF0aW9u cyA9IG1fc3R5bGUudGV4dERlY29yYXRpb25zSW5FZmZlY3QoKTsKLSAgICB0ZXh0RGVjb3JhdGlv bnMuYWRkKFRleHREZWNvcmF0aW9uUGFpbnRlcjo6dGV4dERlY29yYXRpb25zSW5FZmZlY3RGb3JT dHlsZShtYXJrZWRUZXh0LnN0eWxlLnRleHREZWNvcmF0aW9uU3R5bGVzKSk7CiAgICAgYXV0byog c2hhZG93ID0gbWFya2VkVGV4dC5zdHlsZS50ZXh0U2hhZG93ID8gJm1hcmtlZFRleHQuc3R5bGUu dGV4dFNoYWRvdy52YWx1ZSgpIDogbnVsbHB0cjsKICAgICBhdXRvKiBjb2xvckZpbHRlciA9IG1h cmtlZFRleHQuc3R5bGUudGV4dFNoYWRvdyAmJiBtX3N0eWxlLmhhc0FwcGxlQ29sb3JGaWx0ZXIo KSA/ICZtX3N0eWxlLmFwcGxlQ29sb3JGaWx0ZXIoKSA6IG51bGxwdHI7Ci0gICAgcmV0dXJuIHsg Y29udGV4dCwgdGV4dERlY29yYXRpb25zLCBtX2lzRmlyc3RMaW5lLCBmb250Q2FzY2FkZSgpLCBt YWtlSXRlcmF0b3IoKSwgc25hcHBlZFNlbGVjdGlvblJlY3Qud2lkdGgoKSwgc2hhZG93LCBjb2xv ckZpbHRlciwgbWFya2VkVGV4dC5zdHlsZS50ZXh0RGVjb3JhdGlvblN0eWxlcyB9OworICAgIHJl dHVybiB7IGNvbnRleHQsIGZvbnRDYXNjYWRlKCksIG1ha2VJdGVyYXRvcigpLCBzbmFwcGVkU2Vs ZWN0aW9uUmVjdC53aWR0aCgpLCBzaGFkb3csIGNvbG9yRmlsdGVyLCBtYXJrZWRUZXh0LnN0eWxl LnRleHREZWNvcmF0aW9uU3R5bGVzIH07CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFRleHRCb3hQ YXRoPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9u UGFpbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWlu dGVyLmNwcAppbmRleCBkNjRmNTMzZmJmZDYuLmY1ZTczOTcyMzlkMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHAKQEAgLTE4NSwx NSArMTg1LDI2IEBAIHN0YXRpYyBTdHJva2VTdHlsZSB0ZXh0RGVjb3JhdGlvblN0eWxlVG9TdHJv a2VTdHlsZShUZXh0RGVjb3JhdGlvblN0eWxlIGRlY29yYXRpCiAgICAgcmV0dXJuIHN0cm9rZVN0 eWxlOwogfQogCitzdGF0aWMgaW5saW5lIE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbkxpbmU+IHRl eHREZWNvcmF0aW9uc0luRWZmZWN0Rm9yU3R5bGUoY29uc3QgVGV4dERlY29yYXRpb25QYWludGVy OjpTdHlsZXMmIHN0eWxlKQoreworICAgIE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbkxpbmU+IGRl Y29yYXRpb25zOworICAgIGlmIChzdHlsZS51bmRlcmxpbmVDb2xvci5pc1ZhbGlkKCkpCisgICAg ICAgIGRlY29yYXRpb25zLmFkZChUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSk7CisgICAg aWYgKHN0eWxlLm92ZXJsaW5lQ29sb3IuaXNWYWxpZCgpKQorICAgICAgICBkZWNvcmF0aW9ucy5h ZGQoVGV4dERlY29yYXRpb25MaW5lOjpPdmVybGluZSk7CisgICAgaWYgKHN0eWxlLmxpbmV0aHJv dWdoQ29sb3IuaXNWYWxpZCgpKQorICAgICAgICBkZWNvcmF0aW9ucy5hZGQoVGV4dERlY29yYXRp b25MaW5lOjpMaW5lVGhyb3VnaCk7CisgICAgcmV0dXJuIGRlY29yYXRpb25zOworfQorCiBib29s IFRleHREZWNvcmF0aW9uUGFpbnRlcjo6U3R5bGVzOjpvcGVyYXRvcj09KGNvbnN0IFN0eWxlcyYg b3RoZXIpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHVuZGVybGluZUNvbG9yID09IG90aGVyLnVuZGVy bGluZUNvbG9yICYmIG92ZXJsaW5lQ29sb3IgPT0gb3RoZXIub3ZlcmxpbmVDb2xvciAmJiBsaW5l dGhyb3VnaENvbG9yID09IG90aGVyLmxpbmV0aHJvdWdoQ29sb3IKICAgICAgICAgJiYgdW5kZXJs aW5lU3R5bGUgPT0gb3RoZXIudW5kZXJsaW5lU3R5bGUgJiYgb3ZlcmxpbmVTdHlsZSA9PSBvdGhl ci5vdmVybGluZVN0eWxlICYmIGxpbmV0aHJvdWdoU3R5bGUgPT0gb3RoZXIubGluZXRocm91Z2hT dHlsZTsKIH0KIAotVGV4dERlY29yYXRpb25QYWludGVyOjpUZXh0RGVjb3JhdGlvblBhaW50ZXIo R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBPcHRpb25TZXQ8VGV4dERlY29yYXRpb25MaW5lPiBk ZWNvcmF0aW9ucywgYm9vbCBpc0ZpcnN0TGluZSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnQsIElu bGluZUl0ZXJhdG9yOjpUZXh0Qm94SXRlcmF0b3IgdGV4dEJveCwgZmxvYXQgd2lkdGgsIGNvbnN0 IFNoYWRvd0RhdGEqIHNoYWRvdywgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyogY29sb3JGaWx0ZXIs IHN0ZDo6b3B0aW9uYWw8U3R5bGVzPiBzdHlsZXMpCitUZXh0RGVjb3JhdGlvblBhaW50ZXI6OlRl eHREZWNvcmF0aW9uUGFpbnRlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZvbnRD YXNjYWRlJiBmb250LCBJbmxpbmVJdGVyYXRvcjo6VGV4dEJveEl0ZXJhdG9yIHRleHRCb3gsIGZs b2F0IHdpZHRoLCBjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3csIGNvbnN0IEZpbHRlck9wZXJhdGlv bnMqIGNvbG9yRmlsdGVyLCBTdHlsZXMgc3R5bGVPdmVycmlkZSkKICAgICA6IG1fY29udGV4dCB7 IGNvbnRleHQgfQotICAgICwgbV9kZWNvcmF0aW9ucyB7IGRlY29yYXRpb25zIH0KICAgICAsIG1f d2F2eU9mZnNldCB7IHdhdnlPZmZzZXRGcm9tRGVjb3JhdGlvbigpIH0KICAgICAsIG1fd2lkdGgo d2lkdGgpCiAgICAgLCBtX2lzUHJpbnRpbmcgeyB0ZXh0Qm94LT5yZW5kZXJlcigpLmRvY3VtZW50 KCkucHJpbnRpbmcoKSB9CkBAIC0yMDMsMTYgKzIxNCwxOCBAQCBUZXh0RGVjb3JhdGlvblBhaW50 ZXI6OlRleHREZWNvcmF0aW9uUGFpbnRlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIE9wdGlv blNldAogICAgICwgbV90ZXh0Qm94KHRleHRCb3gpCiAgICAgLCBtX2ZvbnQgeyBmb250IH0KICAg ICAsIG1fZGV2aWNlU2NhbGVGYWN0b3IodGV4dEJveC0+cmVuZGVyZXIoKS5kb2N1bWVudCgpLmRl dmljZVNjYWxlRmFjdG9yKCkpCi0gICAgLCBtX3N0eWxlcyB7IHN0eWxlcyA/ICpXVEZNb3ZlKHN0 eWxlcykgOiBzdHlsZXNGb3JSZW5kZXJlcih0ZXh0Qm94LT5yZW5kZXJlcigpLCBkZWNvcmF0aW9u cywgaXNGaXJzdExpbmUsIFBzZXVkb0lkOjpOb25lKSB9Ci0gICAgLCBtX2xpbmVTdHlsZSB7IGlz Rmlyc3RMaW5lID8gdGV4dEJveC0+cmVuZGVyZXIoKS5maXJzdExpbmVTdHlsZSgpIDogdGV4dEJv eC0+cmVuZGVyZXIoKS5zdHlsZSgpIH0KKyAgICAsIG1fc3R5bGVzIHsgc3R5bGVPdmVycmlkZSB9 CisgICAgLCBtX3RleHRCb3hTdHlsZSB7IHRleHRCb3gtPmxpbmVCb3goKS0+aXNGaXJzdCgpID8g dGV4dEJveC0+cmVuZGVyZXIoKS5maXJzdExpbmVTdHlsZSgpIDogdGV4dEJveC0+cmVuZGVyZXIo KS5zdHlsZSgpIH0KIHsKKyAgICBtX3RleHRCb3hEZWNvcmF0aW9ucyA9IG1fdGV4dEJveFN0eWxl LnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCk7CisgICAgbV90ZXh0Qm94RGVjb3JhdGlvbnMuYWRk KHRleHREZWNvcmF0aW9uc0luRWZmZWN0Rm9yU3R5bGUoc3R5bGVPdmVycmlkZSkpOwogfQogCiAv LyBQYWludCB0ZXh0LXNoYWRvdywgdW5kZXJsaW5lLCBvdmVybGluZQogdm9pZCBUZXh0RGVjb3Jh dGlvblBhaW50ZXI6OnBhaW50QmFja2dyb3VuZERlY29yYXRpb25zKGNvbnN0IFRleHRSdW4mIHRl eHRSdW4sIGNvbnN0IEZsb2F0UG9pbnQmIHRleHRPcmlnaW4sIGNvbnN0IEZsb2F0UG9pbnQmIGJv eE9yaWdpbikKIHsKLSAgICBjb25zdCBhdXRvJiBmb250TWV0cmljcyA9IG1fbGluZVN0eWxlLm1l dHJpY3NPZlByaW1hcnlGb250KCk7Ci0gICAgYXV0byB0ZXh0RGVjb3JhdGlvblRoaWNrbmVzcyA9 IGNlaWxUb0RldmljZVBpeGVsKG1fbGluZVN0eWxlLnRleHREZWNvcmF0aW9uVGhpY2tuZXNzKCku cmVzb2x2ZShtX2xpbmVTdHlsZS5jb21wdXRlZEZvbnRTaXplKCksIGZvbnRNZXRyaWNzKSwgbV9k ZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgY29uc3QgYXV0byYgZm9udE1ldHJpY3MgPSBtX3RleHRC b3hTdHlsZS5tZXRyaWNzT2ZQcmltYXJ5Rm9udCgpOworICAgIGF1dG8gdGV4dERlY29yYXRpb25U aGlja25lc3MgPSBjZWlsVG9EZXZpY2VQaXhlbChtX3RleHRCb3hTdHlsZS50ZXh0RGVjb3JhdGlv blRoaWNrbmVzcygpLnJlc29sdmUobV90ZXh0Qm94U3R5bGUuY29tcHV0ZWRGb250U2l6ZSgpLCBm b250TWV0cmljcyksIG1fZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgIEZsb2F0UG9pbnQgbG9jYWxP cmlnaW4gPSBib3hPcmlnaW47CiAKICAgICBhdXRvIHBhaW50RGVjb3JhdGlvbiA9IFsmXSAoVGV4 dERlY29yYXRpb25MaW5lIGRlY29yYXRpb24sIFRleHREZWNvcmF0aW9uU3R5bGUgc3R5bGUsIGNv bnN0IENvbG9yJiBjb2xvciwgY29uc3QgRmxvYXRSZWN0JiByZWN0KSB7CkBAIC0yMjEsOSArMjM0 LDkgQEAgdm9pZCBUZXh0RGVjb3JhdGlvblBhaW50ZXI6OnBhaW50QmFja2dyb3VuZERlY29yYXRp b25zKGNvbnN0IFRleHRSdW4mIHRleHRSdW4sIGMKICAgICAgICAgYXV0byBzdHJva2VTdHlsZSA9 IHRleHREZWNvcmF0aW9uU3R5bGVUb1N0cm9rZVN0eWxlKHN0eWxlKTsKIAogICAgICAgICBpZiAo c3R5bGUgPT0gVGV4dERlY29yYXRpb25TdHlsZTo6V2F2eSkKLSAgICAgICAgICAgIHN0cm9rZVdh dnlUZXh0RGVjb3JhdGlvbihtX2NvbnRleHQsIHJlY3QsIG1fbGluZVN0eWxlLmNvbXB1dGVkRm9u dFBpeGVsU2l6ZSgpKTsKKyAgICAgICAgICAgIHN0cm9rZVdhdnlUZXh0RGVjb3JhdGlvbihtX2Nv bnRleHQsIHJlY3QsIG1fdGV4dEJveFN0eWxlLmNvbXB1dGVkRm9udFBpeGVsU2l6ZSgpKTsKICAg ICAgICAgZWxzZSBpZiAoZGVjb3JhdGlvbiA9PSBUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGlu ZSB8fCBkZWNvcmF0aW9uID09IFRleHREZWNvcmF0aW9uTGluZTo6T3ZlcmxpbmUpIHsKLSAgICAg ICAgICAgIGlmICgobV9saW5lU3R5bGUudGV4dERlY29yYXRpb25Ta2lwSW5rKCkgPT0gVGV4dERl Y29yYXRpb25Ta2lwSW5rOjpBdXRvIHx8IG1fbGluZVN0eWxlLnRleHREZWNvcmF0aW9uU2tpcElu aygpID09IFRleHREZWNvcmF0aW9uU2tpcEluazo6QWxsKSAmJiBtX2lzSG9yaXpvbnRhbCkgewor ICAgICAgICAgICAgaWYgKChtX3RleHRCb3hTdHlsZS50ZXh0RGVjb3JhdGlvblNraXBJbmsoKSA9 PSBUZXh0RGVjb3JhdGlvblNraXBJbms6OkF1dG8gfHwgbV90ZXh0Qm94U3R5bGUudGV4dERlY29y YXRpb25Ta2lwSW5rKCkgPT0gVGV4dERlY29yYXRpb25Ta2lwSW5rOjpBbGwpICYmIG1faXNIb3Jp em9udGFsKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFtX2NvbnRleHQucGFpbnRpbmdEaXNhYmxl ZCgpKSB7CiAgICAgICAgICAgICAgICAgICAgIEZsb2F0UmVjdCB1bmRlcmxpbmVCb3VuZGluZ0Jv eCA9IG1fY29udGV4dC5jb21wdXRlVW5kZXJsaW5lQm91bmRzRm9yVGV4dChyZWN0LCBtX2lzUHJp bnRpbmcpOwogICAgICAgICAgICAgICAgICAgICBEYXNoQXJyYXkgaW50ZXJzZWN0aW9ucyA9IG1f Zm9udC5kYXNoZXNGb3JJbnRlcnNlY3Rpb25zV2l0aFJlY3QodGV4dFJ1biwgdGV4dE9yaWdpbiwg dW5kZXJsaW5lQm91bmRpbmdCb3gpOwpAQCAtMjQwLDkgKzI1Myw5IEBAIHZvaWQgVGV4dERlY29y YXRpb25QYWludGVyOjpwYWludEJhY2tncm91bmREZWNvcmF0aW9ucyhjb25zdCBUZXh0UnVuJiB0 ZXh0UnVuLCBjCiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9OwogCi0g ICAgYm9vbCBhcmVMaW5lc09wYXF1ZSA9ICFtX2lzUHJpbnRpbmcgJiYgKCFtX2RlY29yYXRpb25z LmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKSB8fCBtX3N0eWxlcy51bmRl cmxpbmVDb2xvci5pc09wYXF1ZSgpKQotICAgICAgICAmJiAoIW1fZGVjb3JhdGlvbnMuY29udGFp bnMoVGV4dERlY29yYXRpb25MaW5lOjpPdmVybGluZSkgfHwgbV9zdHlsZXMub3ZlcmxpbmVDb2xv ci5pc09wYXF1ZSgpKQotICAgICAgICAmJiAoIW1fZGVjb3JhdGlvbnMuY29udGFpbnMoVGV4dERl Y29yYXRpb25MaW5lOjpMaW5lVGhyb3VnaCkgfHwgbV9zdHlsZXMubGluZXRocm91Z2hDb2xvci5p c09wYXF1ZSgpKTsKKyAgICBib29sIGFyZUxpbmVzT3BhcXVlID0gIW1faXNQcmludGluZyAmJiAo IW1fdGV4dEJveERlY29yYXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJs aW5lKSB8fCBtX3N0eWxlcy51bmRlcmxpbmVDb2xvci5pc09wYXF1ZSgpKQorICAgICAgICAmJiAo IW1fdGV4dEJveERlY29yYXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6T3Zlcmxp bmUpIHx8IG1fc3R5bGVzLm92ZXJsaW5lQ29sb3IuaXNPcGFxdWUoKSkKKyAgICAgICAgJiYgKCFt X3RleHRCb3hEZWNvcmF0aW9ucy5jb250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6OkxpbmVUaHJv dWdoKSB8fCBtX3N0eWxlcy5saW5ldGhyb3VnaENvbG9yLmlzT3BhcXVlKCkpOwogCiAgICAgZmxv YXQgZXh0cmFPZmZzZXQgPSAwOwogICAgIGJvb2wgY2xpcHBpbmcgPSAhYXJlTGluZXNPcGFxdWUg JiYgbV9zaGFkb3cgJiYgbV9zaGFkb3ctPm5leHQoKTsKQEAgLTI4MywyNCArMjk2LDI0IEBAIHZv aWQgVGV4dERlY29yYXRpb25QYWludGVyOjpwYWludEJhY2tncm91bmREZWNvcmF0aW9ucyhjb25z dCBUZXh0UnVuJiB0ZXh0UnVuLCBjCiAgICAgICAgIH0KIAogICAgICAgICAvLyBUaGVzZSBkZWNv cmF0aW9ucyBzaG91bGQgbWF0Y2ggdGhlIHZpc3VhbCBvdmVyZmxvd3MgY29tcHV0ZWQgaW4gdmlz dWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9ucygpLgotICAgICAgICBpZiAobV9kZWNvcmF0aW9ucy5j b250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSkpIHsKLSAgICAgICAgICAgIGF1 dG8gb2Zmc2V0ID0gdW5kZXJsaW5lT2Zmc2V0Rm9yVGV4dEJveFBhaW50aW5nKG1fbGluZVN0eWxl LCBtX3RleHRCb3gpOworICAgICAgICBpZiAobV90ZXh0Qm94RGVjb3JhdGlvbnMuY29udGFpbnMo VGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpKSB7CisgICAgICAgICAgICBhdXRvIG9mZnNl dCA9IHVuZGVybGluZU9mZnNldEZvclRleHRCb3hQYWludGluZyhtX3RleHRCb3hTdHlsZSwgbV90 ZXh0Qm94KTsKICAgICAgICAgICAgIGZsb2F0IHdhdnlPZmZzZXQgPSBtX3N0eWxlcy51bmRlcmxp bmVTdHlsZSA9PSBUZXh0RGVjb3JhdGlvblN0eWxlOjpXYXZ5ID8gbV93YXZ5T2Zmc2V0IDogMDsK ICAgICAgICAgICAgIEZsb2F0UmVjdCByZWN0KGxvY2FsT3JpZ2luLCBGbG9hdFNpemUobV93aWR0 aCwgdGV4dERlY29yYXRpb25UaGlja25lc3MpKTsKICAgICAgICAgICAgIHJlY3QubW92ZSgwLCBv ZmZzZXQgKyB3YXZ5T2Zmc2V0KTsKICAgICAgICAgICAgIHBhaW50RGVjb3JhdGlvbihUZXh0RGVj b3JhdGlvbkxpbmU6OlVuZGVybGluZSwgbV9zdHlsZXMudW5kZXJsaW5lU3R5bGUsIG1fc3R5bGVz LnVuZGVybGluZUNvbG9yLCByZWN0KTsKICAgICAgICAgfQotICAgICAgICBpZiAobV9kZWNvcmF0 aW9ucy5jb250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6Ok92ZXJsaW5lKSkgeworICAgICAgICBp ZiAobV90ZXh0Qm94RGVjb3JhdGlvbnMuY29udGFpbnMoVGV4dERlY29yYXRpb25MaW5lOjpPdmVy bGluZSkpIHsKICAgICAgICAgICAgIGZsb2F0IHdhdnlPZmZzZXQgPSBtX3N0eWxlcy5vdmVybGlu ZVN0eWxlID09IFRleHREZWNvcmF0aW9uU3R5bGU6OldhdnkgPyBtX3dhdnlPZmZzZXQgOiAwOwog ICAgICAgICAgICAgRmxvYXRSZWN0IHJlY3QobG9jYWxPcmlnaW4sIEZsb2F0U2l6ZShtX3dpZHRo LCB0ZXh0RGVjb3JhdGlvblRoaWNrbmVzcykpOwotICAgICAgICAgICAgZmxvYXQgYXV0b1RleHRE ZWNvcmF0aW9uVGhpY2tuZXNzID0gY2VpbFRvRGV2aWNlUGl4ZWwoVGV4dERlY29yYXRpb25UaGlj a25lc3M6OmNyZWF0ZVdpdGhBdXRvKCkucmVzb2x2ZShtX2xpbmVTdHlsZS5jb21wdXRlZEZvbnRT aXplKCksIGZvbnRNZXRyaWNzKSwgbV9kZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICBm bG9hdCBhdXRvVGV4dERlY29yYXRpb25UaGlja25lc3MgPSBjZWlsVG9EZXZpY2VQaXhlbChUZXh0 RGVjb3JhdGlvblRoaWNrbmVzczo6Y3JlYXRlV2l0aEF1dG8oKS5yZXNvbHZlKG1fdGV4dEJveFN0 eWxlLmNvbXB1dGVkRm9udFNpemUoKSwgZm9udE1ldHJpY3MpLCBtX2RldmljZVNjYWxlRmFjdG9y KTsKICAgICAgICAgICAgIHJlY3QubW92ZSgwLCBhdXRvVGV4dERlY29yYXRpb25UaGlja25lc3Mg LSB0ZXh0RGVjb3JhdGlvblRoaWNrbmVzcyAtIHdhdnlPZmZzZXQpOwogICAgICAgICAgICAgcGFp bnREZWNvcmF0aW9uKFRleHREZWNvcmF0aW9uTGluZTo6T3ZlcmxpbmUsIG1fc3R5bGVzLm92ZXJs aW5lU3R5bGUsIG1fc3R5bGVzLm92ZXJsaW5lQ29sb3IsIHJlY3QpOwogICAgICAgICB9CiAKICAg ICAgICAgLy8gV2Ugb25seSB3YW50IHRvIHBhaW50IHRoZSBzaGFkb3csIGhlbmNlIHRoZSB0cmFu c3BhcmVudCBjb2xvciwgbm90IHRoZSBhY3R1YWwgbGluZS10aHJvdWdoLAogICAgICAgICAvLyB3 aGljaCB3aWxsIGJlIHBhaW50ZWQgaW4gcGFpbnRGb3JlZ3JvdW5kRGVjb3JhdGlvbnMoKS4KLSAg ICAgICAgaWYgKHNoYWRvdyAmJiBtX2RlY29yYXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9u TGluZTo6TGluZVRocm91Z2gpKQorICAgICAgICBpZiAoc2hhZG93ICYmIG1fdGV4dEJveERlY29y YXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6TGluZVRocm91Z2gpKQogICAgICAg ICAgICAgcGFpbnRMaW5lVGhyb3VnaChDb2xvcjo6dHJhbnNwYXJlbnRCbGFjaywgdGV4dERlY29y YXRpb25UaGlja25lc3MsIGxvY2FsT3JpZ2luKTsKICAgICB9IHdoaWxlIChzaGFkb3cpOwogCkBA IC0zMTIsMTggKzMyNSwxOCBAQCB2b2lkIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRCYWNr Z3JvdW5kRGVjb3JhdGlvbnMoY29uc3QgVGV4dFJ1biYgdGV4dFJ1biwgYwogCiB2b2lkIFRleHRE ZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRGb3JlZ3JvdW5kRGVjb3JhdGlvbnMoY29uc3QgRmxvYXRQ b2ludCYgYm94T3JpZ2luKQogewotICAgIGlmICghbV9kZWNvcmF0aW9ucy5jb250YWlucyhUZXh0 RGVjb3JhdGlvbkxpbmU6OkxpbmVUaHJvdWdoKSkKKyAgICBpZiAoIW1fdGV4dEJveERlY29yYXRp b25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6TGluZVRocm91Z2gpKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBhdXRvIHRleHREZWNvcmF0aW9uVGhpY2tuZXNzID0gY2VpbFRvRGV2aWNl UGl4ZWwobV9saW5lU3R5bGUudGV4dERlY29yYXRpb25UaGlja25lc3MoKS5yZXNvbHZlKG1fbGlu ZVN0eWxlLmNvbXB1dGVkRm9udFNpemUoKSwgbV9saW5lU3R5bGUubWV0cmljc09mUHJpbWFyeUZv bnQoKSksIG1fZGV2aWNlU2NhbGVGYWN0b3IpOworICAgIGF1dG8gdGV4dERlY29yYXRpb25UaGlj a25lc3MgPSBjZWlsVG9EZXZpY2VQaXhlbChtX3RleHRCb3hTdHlsZS50ZXh0RGVjb3JhdGlvblRo aWNrbmVzcygpLnJlc29sdmUobV90ZXh0Qm94U3R5bGUuY29tcHV0ZWRGb250U2l6ZSgpLCBtX3Rl eHRCb3hTdHlsZS5tZXRyaWNzT2ZQcmltYXJ5Rm9udCgpKSwgbV9kZXZpY2VTY2FsZUZhY3Rvcik7 CiAgICAgcGFpbnRMaW5lVGhyb3VnaChtX3N0eWxlcy5saW5ldGhyb3VnaENvbG9yLCB0ZXh0RGVj b3JhdGlvblRoaWNrbmVzcywgYm94T3JpZ2luKTsKIH0KIAogdm9pZCBUZXh0RGVjb3JhdGlvblBh aW50ZXI6OnBhaW50TGluZVRocm91Z2goY29uc3QgQ29sb3ImIGNvbG9yLCBmbG9hdCB0aGlja25l c3MsIGNvbnN0IEZsb2F0UG9pbnQmIGxvY2FsT3JpZ2luKQogewotICAgIGNvbnN0IGF1dG8mIGZv bnRNZXRyaWNzID0gbV9saW5lU3R5bGUubWV0cmljc09mUHJpbWFyeUZvbnQoKTsKKyAgICBjb25z dCBhdXRvJiBmb250TWV0cmljcyA9IG1fdGV4dEJveFN0eWxlLm1ldHJpY3NPZlByaW1hcnlGb250 KCk7CiAgICAgRmxvYXRSZWN0IHJlY3QobG9jYWxPcmlnaW4sIEZsb2F0U2l6ZShtX3dpZHRoLCB0 aGlja25lc3MpKTsKLSAgICBhdXRvIGF1dG9UZXh0RGVjb3JhdGlvblRoaWNrbmVzcyA9IGNlaWxU b0RldmljZVBpeGVsKFRleHREZWNvcmF0aW9uVGhpY2tuZXNzOjpjcmVhdGVXaXRoQXV0bygpLnJl c29sdmUobV9saW5lU3R5bGUuY29tcHV0ZWRGb250U2l6ZSgpLCBmb250TWV0cmljcyksIG1fZGV2 aWNlU2NhbGVGYWN0b3IpOworICAgIGF1dG8gYXV0b1RleHREZWNvcmF0aW9uVGhpY2tuZXNzID0g Y2VpbFRvRGV2aWNlUGl4ZWwoVGV4dERlY29yYXRpb25UaGlja25lc3M6OmNyZWF0ZVdpdGhBdXRv KCkucmVzb2x2ZShtX3RleHRCb3hTdHlsZS5jb21wdXRlZEZvbnRTaXplKCksIGZvbnRNZXRyaWNz KSwgbV9kZXZpY2VTY2FsZUZhY3Rvcik7CiAgICAgYXV0byBjZW50ZXIgPSAyICogZm9udE1ldHJp Y3MuZmxvYXRBc2NlbnQoKSAvIDMgKyBhdXRvVGV4dERlY29yYXRpb25UaGlja25lc3MgLyAyOwog ICAgIHJlY3QubW92ZSgwLCBjZW50ZXIgLSB0aGlja25lc3MgLyAyKTsKIApAQCAtMzMzLDcgKzM0 Niw3IEBAIHZvaWQgVGV4dERlY29yYXRpb25QYWludGVyOjpwYWludExpbmVUaHJvdWdoKGNvbnN0 IENvbG9yJiBjb2xvciwgZmxvYXQgdGhpY2tuZXNzCiAgICAgYXV0byBzdHJva2VTdHlsZSA9IHRl eHREZWNvcmF0aW9uU3R5bGVUb1N0cm9rZVN0eWxlKHN0eWxlKTsKIAogICAgIGlmIChzdHlsZSA9 PSBUZXh0RGVjb3JhdGlvblN0eWxlOjpXYXZ5KQotICAgICAgICBzdHJva2VXYXZ5VGV4dERlY29y YXRpb24obV9jb250ZXh0LCByZWN0LCBtX2xpbmVTdHlsZS5jb21wdXRlZEZvbnRQaXhlbFNpemUo KSk7CisgICAgICAgIHN0cm9rZVdhdnlUZXh0RGVjb3JhdGlvbihtX2NvbnRleHQsIHJlY3QsIG1f dGV4dEJveFN0eWxlLmNvbXB1dGVkRm9udFBpeGVsU2l6ZSgpKTsKICAgICBlbHNlCiAgICAgICAg IG1fY29udGV4dC5kcmF3TGluZUZvclRleHQocmVjdCwgbV9pc1ByaW50aW5nLCBzdHlsZSA9PSBU ZXh0RGVjb3JhdGlvblN0eWxlOjpEb3VibGUsIHN0cm9rZVN0eWxlKTsKIH0KQEAgLTQwMCwxOCAr NDEzLDYgQEAgQ29sb3IgVGV4dERlY29yYXRpb25QYWludGVyOjpkZWNvcmF0aW9uQ29sb3IoY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlKQogICAgIHJldHVybiBzdHlsZS52aXNpdGVkRGVwZW5kZW50 Q29sb3JXaXRoQ29sb3JGaWx0ZXIoQ1NTUHJvcGVydHlUZXh0RGVjb3JhdGlvbkNvbG9yKTsKIH0K IAotT3B0aW9uU2V0PFRleHREZWNvcmF0aW9uTGluZT4gVGV4dERlY29yYXRpb25QYWludGVyOjp0 ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdEZvclN0eWxlKGNvbnN0IFRleHREZWNvcmF0aW9uUGFpbnRl cjo6U3R5bGVzJiBzdHlsZSkKLXsKLSAgICBPcHRpb25TZXQ8VGV4dERlY29yYXRpb25MaW5lPiBk ZWNvcmF0aW9uczsKLSAgICBpZiAoc3R5bGUudW5kZXJsaW5lQ29sb3IuaXNWYWxpZCgpKQotICAg ICAgICBkZWNvcmF0aW9ucy5hZGQoVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpOwotICAg IGlmIChzdHlsZS5vdmVybGluZUNvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgZGVjb3JhdGlvbnMu YWRkKFRleHREZWNvcmF0aW9uTGluZTo6T3ZlcmxpbmUpOwotICAgIGlmIChzdHlsZS5saW5ldGhy b3VnaENvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgZGVjb3JhdGlvbnMuYWRkKFRleHREZWNvcmF0 aW9uTGluZTo6TGluZVRocm91Z2gpOwotICAgIHJldHVybiBkZWNvcmF0aW9uczsKLX07Ci0KIGF1 dG8gVGV4dERlY29yYXRpb25QYWludGVyOjpzdHlsZXNGb3JSZW5kZXJlcihjb25zdCBSZW5kZXJP YmplY3QmIHJlbmRlcmVyLCBPcHRpb25TZXQ8VGV4dERlY29yYXRpb25MaW5lPiByZXF1ZXN0ZWRE ZWNvcmF0aW9ucywgYm9vbCBmaXJzdExpbmVTdHlsZSwgUHNldWRvSWQgcHNldWRvSWQpIC0+IFN0 eWxlcwogewogICAgIGlmIChyZXF1ZXN0ZWREZWNvcmF0aW9ucy5pc0VtcHR5KCkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmgKaW5kZXggNGRh MmU0NjM4MWE1Li45ZGEzZDRiMDQyYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9UZXh0RGVjb3JhdGlvblBhaW50ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvVGV4dERlY29yYXRpb25QYWludGVyLmgKQEAgLTQ0LDcgKzQ0LDcgQEAgY2xhc3MgVGV4dFJ1 bjsKIGNsYXNzIFRleHREZWNvcmF0aW9uUGFpbnRlciB7CiBwdWJsaWM6CiAgICAgc3RydWN0IFN0 eWxlczsKLSAgICBUZXh0RGVjb3JhdGlvblBhaW50ZXIoR3JhcGhpY3NDb250ZXh0JiwgT3B0aW9u U2V0PFRleHREZWNvcmF0aW9uTGluZT4gZGVjb3JhdGlvbnMsIGJvb2wgaXNGaXJzdExpbmUsIGNv bnN0IEZvbnRDYXNjYWRlJiwgSW5saW5lSXRlcmF0b3I6OlRleHRCb3hJdGVyYXRvciwgZmxvYXQg d2lkdGgsIGNvbnN0IFNoYWRvd0RhdGEqLCBjb25zdCBGaWx0ZXJPcGVyYXRpb25zKiwgc3RkOjpv cHRpb25hbDxTdHlsZXM+ID0gc3RkOjpudWxsb3B0KTsKKyAgICBUZXh0RGVjb3JhdGlvblBhaW50 ZXIoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRm9udENhc2NhZGUmLCBJbmxpbmVJdGVyYXRvcjo6 VGV4dEJveEl0ZXJhdG9yLCBmbG9hdCB3aWR0aCwgY29uc3QgU2hhZG93RGF0YSosIGNvbnN0IEZp bHRlck9wZXJhdGlvbnMqLCBTdHlsZXMpOwogCiAgICAgdm9pZCBwYWludEJhY2tncm91bmREZWNv cmF0aW9ucyhjb25zdCBUZXh0UnVuJiwgY29uc3QgRmxvYXRQb2ludCYgdGV4dE9yaWdpbiwgY29u c3QgRmxvYXRQb2ludCYgYm94T3JpZ2luKTsKICAgICB2b2lkIHBhaW50Rm9yZWdyb3VuZERlY29y YXRpb25zKGNvbnN0IEZsb2F0UG9pbnQmIGJveE9yaWdpbik7CkBAIC02MSwxNCArNjEsMTMgQEAg cHVibGljOgogICAgICAgICBUZXh0RGVjb3JhdGlvblN0eWxlIGxpbmV0aHJvdWdoU3R5bGU7CiAg ICAgfTsKICAgICBzdGF0aWMgQ29sb3IgZGVjb3JhdGlvbkNvbG9yKGNvbnN0IFJlbmRlclN0eWxl Jik7Ci0gICAgc3RhdGljIE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbkxpbmU+IHRleHREZWNvcmF0 aW9uc0luRWZmZWN0Rm9yU3R5bGUoY29uc3QgU3R5bGVzJik7CiAgICAgc3RhdGljIFN0eWxlcyBz dHlsZXNGb3JSZW5kZXJlcihjb25zdCBSZW5kZXJPYmplY3QmLCBPcHRpb25TZXQ8VGV4dERlY29y YXRpb25MaW5lPiByZXF1ZXN0ZWREZWNvcmF0aW9ucywgYm9vbCBmaXJzdExpbmVTdHlsZSA9IGZh bHNlLCBQc2V1ZG9JZCA9IFBzZXVkb0lkOjpOb25lKTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHBh aW50TGluZVRocm91Z2goY29uc3QgQ29sb3ImLCBmbG9hdCB0aGlja25lc3MsIGNvbnN0IEZsb2F0 UG9pbnQmIGxvY2FsT3JpZ2luKTsKIAogICAgIEdyYXBoaWNzQ29udGV4dCYgbV9jb250ZXh0Owot ICAgIE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbkxpbmU+IG1fZGVjb3JhdGlvbnM7CisgICAgT3B0 aW9uU2V0PFRleHREZWNvcmF0aW9uTGluZT4gbV90ZXh0Qm94RGVjb3JhdGlvbnM7CiAgICAgZmxv YXQgbV93YXZ5T2Zmc2V0IHsgMCB9OwogICAgIGZsb2F0IG1fd2lkdGggeyAwIH07CiAgICAgRmxv YXRQb2ludCBtX2JveE9yaWdpbjsKQEAgLTgxLDcgKzgwLDcgQEAgcHJpdmF0ZToKICAgICBmbG9h dCBtX2RldmljZVNjYWxlRmFjdG9yIHsgMCB9OwogCiAgICAgU3R5bGVzIG1fc3R5bGVzOwotICAg IGNvbnN0IFJlbmRlclN0eWxlJiBtX2xpbmVTdHlsZTsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSYg bV90ZXh0Qm94U3R5bGU7CiB9OwogICAgIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=