224348 2021-04-08 16:33:58 -0700 Add a completion handler argument to `ChromeClient::requestImageExtraction` 2021-04-08 22:14:03 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh andresg_22 cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1748545 0 wenson_hsieh 2021-04-08 16:33:58 -0700 Some refactoring to enable image-extraction-related accessibility support. 1748577 1 425572 wenson_hsieh 2021-04-08 19:32:28 -0700 Created attachment 425572 Patch 1748601 2 ews-feeder 2021-04-08 21:25:40 -0700 Committed r275749 (236327@main): <https://commits.webkit.org/236327@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425572. 1748602 3 webkit-bug-importer 2021-04-08 21:26:14 -0700 <rdar://problem/76436909> 425572 2021-04-08 19:32:28 -0700 2021-04-08 22:14:03 -0700 Patch bug-224348-20210408193227.patch text/plain 12660 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1Njc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODAwZmE2OTA2NDIyMTM3 ODI0OTg5YTljMTAyNWQxNmIyNzM2NWY5MC4uOGJhM2NhYmRmMTg2MWI1MmE0NGMwNmNiNjE3YjQ3 YzQ3NWQ0NWI1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA0LTA4ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIGNvbXBs ZXRpb24gaGFuZGxlciBhcmd1bWVudCB0byBgQ2hyb21lQ2xpZW50OjpyZXF1ZXN0SW1hZ2VFeHRy YWN0aW9uYAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI0MzQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2VlIFdlYktpdC9DaGFuZ2VMb2cgZm9yIG1vcmUgZGV0YWlscy4gTm8gY2hhbmdlIGluIGJlaGF2 aW9yLgorCisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5oOgorCisgICAgICAgIEV4cG9ydCBh biBleGlzdGluZyBoZWxwZXIgbWV0aG9kLgorCisgICAgICAgICogcGFnZS9DaHJvbWVDbGllbnQu aDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudDo6cmVxdWVzdEltYWdlRXh0cmFjdGlv bik6CisKKyAgICAgICAgQWRkIGEgKG51bGwtYnktZGVmYXVsdCkgYENvbXBsZXRpb25IYW5kbGVy YCBhcmd1bWVudCB0byB0aGlzIGNsaWVudCBtZXRob2QsIGZvciBmdXR1cmUgdXNlIGJ5IGFjY2Vz c2liaWxpdHkuCisKIDIwMjEtMDQtMDggIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAog ICAgICAgICBSZW1vdmUgdmlydHVhbCBmcm9tIFJlbmRlckJveDo6YXZhaWxhYmxlTG9naWNhbFdp ZHRoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCmluZGV4IDJiZGNhZGM4ODUyN2Q5NjM0MDAyYTcwMWMxNDhmZTNlZjBkNzJkOGIu LjdmMTg0OGNiZDY5MWUyZGZiZGQ5ZDE5MTEzNDY1YzdmODRmNDg0NWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzYgQEAKKzIwMjEtMDQtMDggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBs ZS5jb20+CisKKyAgICAgICAgQWRkIGEgY29tcGxldGlvbiBoYW5kbGVyIGFyZ3VtZW50IHRvIGBD aHJvbWVDbGllbnQ6OnJlcXVlc3RJbWFnZUV4dHJhY3Rpb25gCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQzNDgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYW4gb3B0aW9uYWwgY29tcGxldGlvbiBo YW5kbGVyIGFyZ3VtZW50IHRvIGBDaHJvbWVDbGllbnQ6OnJlcXVlc3RJbWFnZUV4dHJhY3Rpb25g LiBJZiBzcGVjaWZpZWQsIHRoaXMKKyAgICAgICAgY29tcGxldGlvbiBoYW5kbGVyIHdpbGwgYmUg aW52b2tlZCB3aXRoIHRoZSBpbWFnZSBvdmVybGF5IGhvc3QgZWxlbWVudCAoaWYgcHJlc2VudCks IG9uY2UgaW1hZ2UgZXh0cmFjdGlvbgorICAgICAgICBmaW5pc2hlcywgb3IgaWYgdGhlIGVsZW1l bnQgaXMgbm90IHN1aXRhYmxlIGZvciBpbWFnZSBleHRyYWN0aW9uLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJDaHJvbWVDbGllbnQ6OnJlcXVlc3RJbWFnZUV4dHJhY3Rpb24pOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVxdWVzdEltYWdl RXh0cmFjdGlvbik6CisKKyAgICAgICAgUmVmYWN0b3IgdGhpcyBjb2RlLCBzdWNoIHRoYXQgdGhl IGRhdGEgc3RydWN0dXJlIHRoYXQgKHdlYWtseSkgaG9sZHMgZWxlbWVudHMgcGVuZGluZyBpbWFn ZSBleHRyYWN0aW9uIGlzCisgICAgICAgIGRpc3RpbmN0IGZyb20gdGhlIHNldCBvZiBlbGVtZW50 cyB0aGF0IGhhdmUgY29tcGxldGVkIGltYWdlIGV4dHJhY3Rpb24uIFRoaXMgYWxsb3dzIHVzIHRv IHF1ZXVlIGNvbXBsZXRpb24KKyAgICAgICAgaGFuZGxlcnMgdG8gZWFjaCBlbGVtZW50IHdpdGgg YSBwZW5kaW5nIGltYWdlIGV4dHJhY3Rpb24gcmVxdWVzdCwgYW5kIGludm9rZSB0aGVtIG9uY2Ug aW1hZ2UgZXh0cmFjdGlvbiBpcworICAgICAgICBmaW5pc2hlZC4KKworICAgICAgICBUaGUgZXhp c3Rpbmcgd2VhayBzZXQsIGBtX2VsZW1lbnRzV2l0aEV4dHJhY3RlZEltYWdlc2AsIGlzIG5vdyBy ZXB1cnBvc2VkIHRvIGtlZXAgdHJhY2sgb2Ygb25seSBlbGVtZW50cyB0aGF0CisgICAgICAgIGhh dmUgZmluaXNoZWQgaW1hZ2UgZXh0cmFjdGlvbiAoYW5kIG1heSBvciBtYXkgbm90IGNvbnRhaW4g YW4gaW1hZ2Ugb3ZlcmxheSkuIFRoZSBuZXcgbWVtYmVyIHZhcmlhYmxlLAorICAgICAgICBgbV9l bGVtZW50c1BlbmRpbmdJbWFnZUV4dHJhY3Rpb25gLCBtYWludGFpbnMgcGFpcnMgb2Ygd2VhayBl bGVtZW50cyBhbmQgY29tcGxldGlvbiBoYW5kbGVyczsgdXBvbiBmaW5pc2hpbmcKKyAgICAgICAg aW1hZ2UgZXh0cmFjdGlvbiwgZWFjaCBjb21wbGV0aW9uIGhhbmRsZXIgY29ycmVzcG9uZGluZyB0 byB0aGUgZWxlbWVudCAoaWYgaXQgc3RpbGwgZXhpc3RzKSB3aWxsIGJlIGludm9rZWQuCisgICAg ICAgIFNpbmNlIHRoZSBlbGVtZW50IGlzIHdlYWtseSBoZWxkLCBpbiB0aGUgY2FzZSB3aGVyZSB0 aGUgZWxlbWVudCBpcyBkZXN0cm95ZWQgYmVmb3JlIGltYWdlIGV4dHJhY3Rpb24gZmluaXNoZXMs CisgICAgICAgIHdlIHdpbGwgY2xlYW4gdXAgdGhlIChub3ctbnVsbCkgZW50cmllcyBpbiBgbV9l bGVtZW50c1BlbmRpbmdJbWFnZUV4dHJhY3Rpb25gIHdoZW4gdGhlIGltYWdlIGV4dHJhY3Rpb24g cmVxdWVzdAorICAgICAgICBpcyBmaW5pc2hlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmg6CisKIDIwMjEtMDQtMDggIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUu Y29tPgogCiAgICAgICAgIFNwZWNpZnkgU3dpZnQgdmVyc2lvbiBpbiBjb25maWd1cmF0aW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxFbGVtZW50LmgKaW5kZXggNjRhYzY2MDNhNzBkODE2NzM0NjM2MjY4MjZi MzYwNWYxNjlkODk2NS4uMzMwMGJiMDM2MTNhMGM2MjZkZmI3YWExMDc3YWUyMmJmYTY5YmRhZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuaApAQCAtMTMwLDcgKzEzMCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldEVudGVyS2V5SGludChjb25zdCBTdHJpbmcmIHZhbHVlKTsKIAogICAgIFdF QkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIHNob3VsZEV4dGVuZFNlbGVjdGlvblRvVGFyZ2V0Tm9k ZShjb25zdCBOb2RlJiB0YXJnZXROb2RlLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rp b25CZWZvcmVVcGRhdGUpOwotICAgIGJvb2wgaGFzSW1hZ2VPdmVybGF5KCkgY29uc3Q7CisgICAg V0VCQ09SRV9FWFBPUlQgYm9vbCBoYXNJbWFnZU92ZXJsYXkoKSBjb25zdDsKICAgICBzdGF0aWMg Ym9vbCBpc0luc2lkZUltYWdlT3ZlcmxheShjb25zdCBTaW1wbGVSYW5nZSYpOwogICAgIHN0YXRp YyBib29sIGlzSW5zaWRlSW1hZ2VPdmVybGF5KGNvbnN0IE5vZGUmKTsKICAgICBXRUJDT1JFX0VY UE9SVCBzdGF0aWMgYm9vbCBpc0ltYWdlT3ZlcmxheVRleHQoY29uc3QgTm9kZSYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvQ2hyb21lQ2xpZW50LmgKaW5kZXggZTEwNDMxNTMzNzJiODZjZTBkNjg4M2JmMjA4MDM0 MTgzM2MwYjA5Yi4uZDBiYzM1NTBkNGQwODM1YzMzM2UxZjQ4M2Y1ZjI1YWRkMDQ4MzNjZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCkBAIC01NjAsNyArNTYwLDExIEBAIHB1YmxpYzoK ICNlbmRpZgogCiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCi0gICAgdmlydHVhbCB2b2lk IHJlcXVlc3RJbWFnZUV4dHJhY3Rpb24oRWxlbWVudCYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBy ZXF1ZXN0SW1hZ2VFeHRyYWN0aW9uKEVsZW1lbnQmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFJl ZlB0cjxFbGVtZW50PiYmKT4mJiBjb21wbGV0aW9uID0geyB9KQorICAgIHsKKyAgICAgICAgaWYg KGNvbXBsZXRpb24pCisgICAgICAgICAgICBjb21wbGV0aW9uKHsgfSk7CisgICAgfQogI2VuZGlm CiAgICAgdmlydHVhbCBib29sIG5lZWRzSW1hZ2VPdmVybGF5Q29udHJvbGxlckZvclNlbGVjdGlv blBhaW50aW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cAppbmRleCAyZTYwODQ2NDUxZDYxYTEzNDA0Y2VkMTA2MTI2YmQ0MGIzNGZiZjIxLi4xOTJhZDhk MTUxNmUwZDJkYmYxZTcwM2JjOWE3NzZhMzBkMzNlYmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cApAQCAtMTQ0OCw5ICsxNDQ4LDkgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmNoYW5nZVVuaXZl cnNhbEFjY2Vzc1pvb21Gb2N1cyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aWUKIAogI2lmIEVO QUJMRShJTUFHRV9FWFRSQUNUSU9OKQogCi12b2lkIFdlYkNocm9tZUNsaWVudDo6cmVxdWVzdElt YWdlRXh0cmFjdGlvbihFbGVtZW50JiBlbGVtZW50KQordm9pZCBXZWJDaHJvbWVDbGllbnQ6OnJl cXVlc3RJbWFnZUV4dHJhY3Rpb24oRWxlbWVudCYgZWxlbWVudCwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChSZWZQdHI8RWxlbWVudD4mJik+JiYgY29tcGxldGlvbikKIHsKLSAgICBtX3BhZ2UucmVx dWVzdEltYWdlRXh0cmFjdGlvbihlbGVtZW50KTsKKyAgICBtX3BhZ2UucmVxdWVzdEltYWdlRXh0 cmFjdGlvbihlbGVtZW50LCBXVEZNb3ZlKGNvbXBsZXRpb24pKTsKIH0KIAogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l Q2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hy b21lQ2xpZW50LmgKaW5kZXggYWUxZWQ2NjI3MTRkZmViZWMzMjBkMTQ1ZTcxMzJjMTI2MzE0MmRk ZC4uMGI4ZDE4MWM0YzllZGUxOTFiMmViOGQ5NjAzZGE4ZTdjMzU3NWUxZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQuaApAQCAtNDE1LDcgKzQxNSw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogI2lmIEVOQUJM RShJTUFHRV9FWFRSQUNUSU9OKQotICAgIHZvaWQgcmVxdWVzdEltYWdlRXh0cmFjdGlvbihXZWJD b3JlOjpFbGVtZW50JikgZmluYWw7CisgICAgdm9pZCByZXF1ZXN0SW1hZ2VFeHRyYWN0aW9uKFdl YkNvcmU6OkVsZW1lbnQmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFJlZlB0cjxXZWJDb3JlOjpF bGVtZW50PiYmKT4mJiA9IHsgfSkgZmluYWw7CiAjZW5kaWYKIAogICAgIGJvb2wgbmVlZHNJbWFn ZU92ZXJsYXlDb250cm9sbGVyRm9yU2VsZWN0aW9uUGFpbnRpbmcoKSBjb25zdCBmaW5hbApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBjODZjY2Zl NDU4ZjBhZDQwNDNjYWY3YWQ3NDlmZTlkN2I0M2Q4YmQ2Li4yOGQ5NzI5NjZhY2I0Y2U4NGVjZWY3 M2M2MDE3OTNjMzk0MmJhYmYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcApAQCAtNjE4Myw2ICs2MTgzLDExIEBAIHZvaWQgV2ViUGFnZTo6ZGlkQ29t bWl0TG9hZChXZWJGcmFtZSogZnJhbWUpCiAgICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVl RnJlZXplUmVhc29uOjpQcm9jZXNzU3dhcCk7CiAKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElP TikKKyAgICBmb3IgKGF1dG8mIFtlbGVtZW50LCBjb21wbGV0aW9uSGFuZGxlcnNdIDogbV9lbGVt ZW50c1BlbmRpbmdJbWFnZUV4dHJhY3Rpb24pIHsKKyAgICAgICAgZm9yIChhdXRvJiBjb21wbGV0 aW9uSGFuZGxlciA6IGNvbXBsZXRpb25IYW5kbGVycykKKyAgICAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKHsgfSk7CisgICAgfQorICAgIG1fZWxlbWVudHNQZW5kaW5nSW1hZ2VFeHRyYWN0aW9u LmNsZWFyKCk7CiAgICAgbV9lbGVtZW50c1dpdGhFeHRyYWN0ZWRJbWFnZXMuY2xlYXIoKTsKICNl bmRpZgogCkBAIC03MjYyLDM2ICs3MjY3LDk4IEBAIHZvaWQgV2ViUGFnZTo6cmVtb3ZlTWVkaWFV c2FnZU1hbmFnZXJTZXNzaW9uKE1lZGlhU2Vzc2lvbklkZW50aWZpZXIgaWRlbnRpZmllcikKIAog I2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQogCi12b2lkIFdlYlBhZ2U6OnJlcXVlc3RJbWFn ZUV4dHJhY3Rpb24oV2ViQ29yZTo6RWxlbWVudCYgZWxlbWVudCkKK3ZvaWQgV2ViUGFnZTo6cmVx dWVzdEltYWdlRXh0cmFjdGlvbihXZWJDb3JlOjpFbGVtZW50JiBlbGVtZW50LCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFJlZlB0cjxXZWJDb3JlOjpFbGVtZW50PiYmKT4mJiBjb21wbGV0aW9uKQog ewotICAgIGlmICghaXM8SFRNTEVsZW1lbnQ+KGVsZW1lbnQpKQorICAgIGlmICghaXM8SFRNTEVs ZW1lbnQ+KGVsZW1lbnQpKSB7CisgICAgICAgIGlmIChjb21wbGV0aW9uKQorICAgICAgICAgICAg Y29tcGxldGlvbih7IH0pOwogICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKG1fZWxl bWVudHNXaXRoRXh0cmFjdGVkSW1hZ2VzLmNvbnRhaW5zKGVsZW1lbnQpKSB7CisgICAgICAgIGlm IChjb21wbGV0aW9uKSB7CisgICAgICAgICAgICBBU1NFUlQoaXM8SFRNTEVsZW1lbnQ+KGVsZW1l bnQpKTsKKyAgICAgICAgICAgIFJlZlB0cjxFbGVtZW50PiBpbWFnZU92ZXJsYXlIb3N0OworICAg ICAgICAgICAgaWYgKGlzPEhUTUxFbGVtZW50PihlbGVtZW50KSAmJiBkb3duY2FzdDxIVE1MRWxl bWVudD4oZWxlbWVudCkuaGFzSW1hZ2VPdmVybGF5KCkpCisgICAgICAgICAgICAgICAgaW1hZ2VP dmVybGF5SG9zdCA9IG1ha2VSZWZQdHIoZWxlbWVudCk7CisgICAgICAgICAgICBjb21wbGV0aW9u KFdURk1vdmUoaW1hZ2VPdmVybGF5SG9zdCkpOworICAgICAgICB9CisgICAgICAgIHJldHVybjsK KyAgICB9CisKKyAgICBhdXRvIG1hdGNoSW5kZXggPSBtX2VsZW1lbnRzUGVuZGluZ0ltYWdlRXh0 cmFjdGlvbi5maW5kTWF0Y2hpbmcoWyZdIChhdXRvJiBlbGVtZW50QW5kQ29tcGxldGlvbkhhbmRs ZXJzKSB7CisgICAgICAgIHJldHVybiBlbGVtZW50QW5kQ29tcGxldGlvbkhhbmRsZXJzLmZpcnN0 ID09ICZlbGVtZW50OworICAgIH0pOwogCi0gICAgaWYgKG1fZWxlbWVudHNXaXRoRXh0cmFjdGVk SW1hZ2VzLmNvbnRhaW5zKGVsZW1lbnQpKQorICAgIGlmIChtYXRjaEluZGV4ICE9IG5vdEZvdW5k KSB7CisgICAgICAgIG1fZWxlbWVudHNQZW5kaW5nSW1hZ2VFeHRyYWN0aW9uW21hdGNoSW5kZXhd LnNlY29uZC5hcHBlbmQoV1RGTW92ZShjb21wbGV0aW9uKSk7CiAgICAgICAgIHJldHVybjsKKyAg ICB9CiAKICAgICBhdXRvKiByZW5kZXJlciA9IGVsZW1lbnQucmVuZGVyZXIoKTsKLSAgICBpZiAo IWlzPFJlbmRlckltYWdlPihyZW5kZXJlcikpCisgICAgaWYgKCFpczxSZW5kZXJJbWFnZT4ocmVu ZGVyZXIpKSB7CisgICAgICAgIGlmIChjb21wbGV0aW9uKQorICAgICAgICAgICAgY29tcGxldGlv bih7IH0pOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgYXV0byYgcmVuZGVySW1hZ2Ug PSBkb3duY2FzdDxSZW5kZXJJbWFnZT4oKnJlbmRlcmVyKTsKLQotICAgIG1fZWxlbWVudHNXaXRo RXh0cmFjdGVkSW1hZ2VzLmFkZChlbGVtZW50KTsKLQogICAgIGF1dG8gYml0bWFwID0gY3JlYXRl U2hhcmVhYmxlQml0bWFwKHJlbmRlckltYWdlKTsKLSAgICBpZiAoIWJpdG1hcCkKKyAgICBpZiAo IWJpdG1hcCkgeworICAgICAgICBpZiAoY29tcGxldGlvbikKKyAgICAgICAgICAgIGNvbXBsZXRp b24oeyB9KTsKICAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIFNoYXJlYWJsZUJpdG1hcDo6 SGFuZGxlIGJpdG1hcEhhbmRsZTsKICAgICBiaXRtYXAtPmNyZWF0ZUhhbmRsZShiaXRtYXBIYW5k bGUpOwotICAgIGlmIChiaXRtYXBIYW5kbGUuaXNOdWxsKCkpCisgICAgaWYgKGJpdG1hcEhhbmRs ZS5pc051bGwoKSkgeworICAgICAgICBpZiAoY29tcGxldGlvbikKKyAgICAgICAgICAgIGNvbXBs ZXRpb24oeyB9KTsKICAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIFZlY3RvcjxDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFJlZlB0cjxFbGVtZW50PiYmKT4+IGNvbXBsZXRpb25IYW5kbGVyczsK KyAgICBpZiAoY29tcGxldGlvbikKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXJzLmFwcGVuZChX VEZNb3ZlKGNvbXBsZXRpb24pKTsKKyAgICBtX2VsZW1lbnRzUGVuZGluZ0ltYWdlRXh0cmFjdGlv bi5hcHBlbmQoeyBtYWtlV2Vha1B0cihlbGVtZW50KSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl cnMpIH0pOwogCiAgICAgYXV0byBpbWFnZVVSTCA9IGVsZW1lbnQuZG9jdW1lbnQoKS5jb21wbGV0 ZVVSTChyZW5kZXJJbWFnZS5jYWNoZWRJbWFnZSgpLT51cmwoKS5zdHJpbmcoKSk7CisgICAgc2Vu ZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJlcXVlc3RJbWFnZUV4dHJh Y3Rpb24oV1RGTW92ZShpbWFnZVVSTCksIFdURk1vdmUoYml0bWFwSGFuZGxlKSksIFt3ZWJQYWdl ID0gbWFrZVdlYWtQdHIoKnRoaXMpLCB3ZWFrRWxlbWVudCA9IG1ha2VXZWFrUHRyKGVsZW1lbnQp XSAoYXV0byYmIHJlc3VsdCkgeworICAgICAgICBhdXRvIHByb3RlY3RlZFBhZ2UgPSBtYWtlUmVm UHRyKHdlYlBhZ2UuZ2V0KCkpOworICAgICAgICBpZiAoIXByb3RlY3RlZFBhZ2UpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgcHJvdGVjdGVkUGFnZS0+bV9lbGVtZW50c1BlbmRpbmdJ bWFnZUV4dHJhY3Rpb24ucmVtb3ZlQWxsTWF0Y2hpbmcoWyZdIChhdXRvJiBlbGVtZW50QW5kQ29t cGxldGlvbkhhbmRsZXJzKSB7CisgICAgICAgICAgICBhdXRvJiBbZWxlbWVudCwgY29tcGxldGlv bkhhbmRsZXJzXSA9IGVsZW1lbnRBbmRDb21wbGV0aW9uSGFuZGxlcnM7CisgICAgICAgICAgICBp ZiAoZWxlbWVudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAg IGZvciAoYXV0byYgY29tcGxldGlvbkhhbmRsZXIgOiBjb21wbGV0aW9uSGFuZGxlcnMpCisgICAg ICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoeyB9KTsKKyAgICAgICAgICAgIHJldHVybiB0 cnVlOworICAgICAgICB9KTsKKworICAgICAgICBhdXRvIHByb3RlY3RlZEVsZW1lbnQgPSBtYWtl UmVmUHRyKHdlYWtFbGVtZW50LmdldCgpKTsKKyAgICAgICAgaWYgKCFwcm90ZWN0ZWRFbGVtZW50 KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGF1dG8mIGh0bWxFbGVtZW50ID0gZG93 bmNhc3Q8SFRNTEVsZW1lbnQ+KCpwcm90ZWN0ZWRFbGVtZW50KTsKKyAgICAgICAgaHRtbEVsZW1l bnQudXBkYXRlV2l0aEltYWdlRXh0cmFjdGlvblJlc3VsdChXVEZNb3ZlKHJlc3VsdCkpOworICAg ICAgICBwcm90ZWN0ZWRQYWdlLT5tX2VsZW1lbnRzV2l0aEV4dHJhY3RlZEltYWdlcy5hZGQoaHRt bEVsZW1lbnQpOworCisgICAgICAgIGF1dG8gbWF0Y2hJbmRleCA9IHByb3RlY3RlZFBhZ2UtPm1f ZWxlbWVudHNQZW5kaW5nSW1hZ2VFeHRyYWN0aW9uLmZpbmRNYXRjaGluZyhbJl0gKGF1dG8mIGVs ZW1lbnRBbmRDb21wbGV0aW9uSGFuZGxlcnMpIHsKKyAgICAgICAgICAgIHJldHVybiBlbGVtZW50 QW5kQ29tcGxldGlvbkhhbmRsZXJzLmZpcnN0ID09ICZodG1sRWxlbWVudDsKKyAgICAgICAgfSk7 CisKKyAgICAgICAgaWYgKG1hdGNoSW5kZXggPT0gbm90Rm91bmQpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgYXV0byBpbWFnZU92ZXJsYXlIb3N0ID0gaHRtbEVsZW1lbnQuaGFzSW1h Z2VPdmVybGF5KCkgPyBtYWtlUmVmUHRyKGh0bWxFbGVtZW50KSA6IG51bGxwdHI7CisgICAgICAg IGZvciAoYXV0byYgY29tcGxldGlvbkhhbmRsZXIgOiBwcm90ZWN0ZWRQYWdlLT5tX2VsZW1lbnRz UGVuZGluZ0ltYWdlRXh0cmFjdGlvblttYXRjaEluZGV4XS5zZWNvbmQpCisgICAgICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihpbWFnZU92ZXJsYXlIb3N0LmNvcHlSZWYoKSk7CiAKLSAgICBzZW5k V2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVxdWVzdEltYWdlRXh0cmFj dGlvbihXVEZNb3ZlKGltYWdlVVJMKSwgV1RGTW92ZShiaXRtYXBIYW5kbGUpKSwgW3dlYWtFbGVt ZW50ID0gbWFrZVdlYWtQdHIoZWxlbWVudCldIChJbWFnZUV4dHJhY3Rpb25SZXN1bHQmJiByZXN1 bHQpIHsKLSAgICAgICAgaWYgKGF1dG8gZWxlbWVudCA9IHdlYWtFbGVtZW50LmdldCgpOyBpczxI VE1MRWxlbWVudD4oZWxlbWVudCkpCi0gICAgICAgICAgICBkb3duY2FzdDxIVE1MRWxlbWVudD4o KmVsZW1lbnQpLnVwZGF0ZVdpdGhJbWFnZUV4dHJhY3Rpb25SZXN1bHQoV1RGTW92ZShyZXN1bHQp KTsKKyAgICAgICAgcHJvdGVjdGVkUGFnZS0+bV9lbGVtZW50c1BlbmRpbmdJbWFnZUV4dHJhY3Rp b24ucmVtb3ZlKG1hdGNoSW5kZXgpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMGRkM2YyY2Q5Y2QwZDA0NTcwNTk4OWZiMjdl YzE5Yzg3NWJiZWQyMy4uOGI2OWM4MzMwYzI4Yzg1N2IxMjU0MDVjMzFjMDExNjM0OTY3MWU3NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTgyLDYg KzE4Miw3IEBAIGNsYXNzIEZyYW1lOwogY2xhc3MgRnJhbWVTZWxlY3Rpb247CiBjbGFzcyBGcmFt ZVZpZXc7CiBjbGFzcyBHcmFwaGljc0NvbnRleHQ7CitjbGFzcyBIVE1MRWxlbWVudDsKIGNsYXNz IEhUTUxJbWFnZUVsZW1lbnQ7CiBjbGFzcyBIVE1MTWVudUVsZW1lbnQ7CiBjbGFzcyBIVE1MTWVu dUl0ZW1FbGVtZW50OwpAQCAtMTM4MSw3ICsxMzgyLDcgQEAgcHVibGljOgogI2VuZGlmCiAKICNp ZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKLSAgICB2b2lkIHJlcXVlc3RJbWFnZUV4dHJhY3Rp b24oV2ViQ29yZTo6RWxlbWVudCYpOworICAgIHZvaWQgcmVxdWVzdEltYWdlRXh0cmFjdGlvbihX ZWJDb3JlOjpFbGVtZW50JiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZWZQdHI8V2ViQ29yZTo6 RWxlbWVudD4mJik+JiYpOwogICAgIHZvaWQgdXBkYXRlV2l0aEltYWdlRXh0cmFjdGlvblJlc3Vs dChXZWJDb3JlOjpJbWFnZUV4dHJhY3Rpb25SZXN1bHQmJiwgY29uc3QgV2ViQ29yZTo6RWxlbWVu dENvbnRleHQmLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBsb2NhdGlvbiwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChib29sKT4mJik7CiAjZW5kaWYKIApAQCAtMjMwNiw3ICsyMzA3LDggQEAg cHJpdmF0ZToKICNlbmRpZgogCiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCi0gICAgV2Vh a0hhc2hTZXQ8V2ViQ29yZTo6RWxlbWVudD4gbV9lbGVtZW50c1dpdGhFeHRyYWN0ZWRJbWFnZXM7 CisgICAgVmVjdG9yPHN0ZDo6cGFpcjxXZWFrUHRyPFdlYkNvcmU6OkhUTUxFbGVtZW50PiwgVmVj dG9yPENvbXBsZXRpb25IYW5kbGVyPHZvaWQoUmVmUHRyPFdlYkNvcmU6OkVsZW1lbnQ+JiYpPj4+ PiBtX2VsZW1lbnRzUGVuZGluZ0ltYWdlRXh0cmFjdGlvbjsKKyAgICBXZWFrSGFzaFNldDxXZWJD b3JlOjpIVE1MRWxlbWVudD4gbV9lbGVtZW50c1dpdGhFeHRyYWN0ZWRJbWFnZXM7CiAjZW5kaWYK IH07CiAK