174444 2017-07-12 17:21:18 -0700 Style fix. Replace strongThis with protectedThis. 2017-07-13 11:21:38 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson jer.noble oldest_to_newest 1328315 0 jeremyj-wk 2017-07-12 17:21:18 -0700 Style fix. Replace strongThis with protectedThis. 1328317 1 315314 jeremyj-wk 2017-07-12 17:23:04 -0700 Created attachment 315314 Patch 1328511 2 315314 commit-queue 2017-07-13 11:21:37 -0700 Comment on attachment 315314 Patch Clearing flags on attachment: 315314 Committed r219457: <http://trac.webkit.org/changeset/219457> 1328512 3 commit-queue 2017-07-13 11:21:38 -0700 All reviewed patches have been landed. Closing bug. 315314 2017-07-12 17:23:04 -0700 2017-07-13 11:21:37 -0700 Patch bug-174444-20170712172303.patch text/plain 12279 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYzODQ3ZWU5NmI5OTI2 ODM4MGIzYWNmZGI2MGU3ZjBkOGI1MDMyOC4uNmZkODgwM2RhOGMzMzQxOTczMzZkNjZhYjljM2Y5 OTFkMWY1YzVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA3LTEyICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBTdHlsZSBmaXguIFJlcGxh Y2Ugc3Ryb25nVGhpcyB3aXRoIHByb3RlY3RlZFRoaXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ0NDQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKwor ICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vQXVkaW9TY2hlZHVsZWRTb3VyY2VOb2RlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2NoZWR1bGVkU291cmNlTm9kZTo6ZmluaXNoKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Np b24ubW06CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246Om1h eWJlQmVjb21lUmVhZHlGb3JNb3JlTWVkaWFEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNv cmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6ZW5xdWV1ZVNhbXBsZSk6CisgICAgICAgIChXZWJDb3Jl OjpXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmhhbmRsZURlY29tcHJlc3Npb25PdXRwdXQp OgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjplbnF1ZXVl RGVjb2RlZFNhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlRGVjb21wcmVzc2lvblNl c3Npb246OnJlcXVlc3RNZWRpYURhdGFXaGVuUmVhZHkpOgorICAgICAgICAoV2ViQ29yZTo6V2Vi Q29yZURlY29tcHJlc3Npb25TZXNzaW9uOjpmbHVzaCk6CisKIDIwMTctMDctMTEgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBOQVZJR0FUT1JfSFdDT05D VVJSRU5DWQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IDAzZGU1Y2RiMGI3N2I4N2Y0MGU2NDM4YjYwZGIzODIxM2Zi ODc0MmEuLmI5YjdmYjE1YmRjNGExODJjNjQwYmQwOThhZjNkZDFiYjNmZDMzZjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNy0wNy0xMiAgSmVyZW15IEpvbmVzICA8amVyZW15akBh cHBsZS5jb20+CisKKyAgICAgICAgU3R5bGUgZml4LiBSZXBsYWNlIHN0cm9uZ1RoaXMgd2l0aCBw cm90ZWN0ZWRUaGlzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc0NDQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmVuYW1lLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L2NvY29hL1dlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZFNldHVwRnVsbHNjcmVlbik6CisgICAgICAgIChX ZWJLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZEVudGVyRnVsbHNjcmVlbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZEV4aXRGdWxsc2Ny ZWVuKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZGlkQ2xl YW51cEZ1bGxzY3JlZW4pOgorCiAyMDE3LTA3LTExICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW1vdmUgTkFWSUdBVE9SX0hXQ09OQ1VSUkVOQ1kKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9TY2hlZHVsZWRTb3VyY2VO b2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9TY2hlZHVsZWRT b3VyY2VOb2RlLmNwcAppbmRleCBlMmNmYzkwMDllNGIzNjI3ZjY1MWRhMWZkMmE2ZTdjZmY1NmUy MmM4Li5kYTA3NTY3ZmYxNWQ0Y2QyMTBhN2UwNzQzMjFhZDQ5N2YwOGY0Y2NjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvU2NoZWR1bGVkU291cmNlTm9k ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb1NjaGVkdWxl ZFNvdXJjZU5vZGUuY3BwCkBAIC0xNjcsOCArMTY3LDggQEAgdm9pZCBBdWRpb1NjaGVkdWxlZFNv dXJjZU5vZGU6OmZpbmlzaCgpCiAgICAgfQogCiAgICAgaWYgKG1faGFzRW5kZWRMaXN0ZW5lcikg ewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtzdHJvbmdUaGlzID0gbWFrZVJlZigqdGhpcyld ICgpIG11dGFibGUgewotICAgICAgICAgICAgc3Ryb25nVGhpcy0+ZGlzcGF0Y2hFdmVudChFdmVu dDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5lbmRlZEV2ZW50LCBmYWxzZSwgZmFsc2UpKTsKKyAgICAg ICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSAoKSBt dXRhYmxlIHsKKyAgICAgICAgICAgIHByb3RlY3RlZFRoaXMtPmRpc3BhdGNoRXZlbnQoRXZlbnQ6 OmNyZWF0ZShldmVudE5hbWVzKCkuZW5kZWRFdmVudCwgZmFsc2UsIGZhbHNlKSk7CiAgICAgICAg IH0pOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5tbQpp bmRleCAyNThmOTQ5NDIzNTMzODBhYWI3ZDI0OWU2MGM2ZTA2MjFiNjlkZTg5Li5lN2ZlYmM5Y2Uz MjdmMDkzNTBhNTgyMzAzM2FiMzc2YzAwZDA5ZjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24ubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29t cHJlc3Npb25TZXNzaW9uLm1tCkBAIC0xMDIsMTAgKzEwMiwxMCBAQCB2b2lkIFdlYkNvcmVEZWNv bXByZXNzaW9uU2Vzc2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGEoKQogICAg ICAgICByZXR1cm47CiAgICAgfQogCi0gICAgUmVmUHRyPFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vz c2lvbj4gc3Ryb25nVGhpcyB7IHRoaXMgfTsKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCBbc3Ryb25nVGhpc10gewotICAgICAgICBpZiAoc3Ryb25nVGhpcy0+ bV9ub3RpZmljYXRpb25DYWxsYmFjaykKLSAgICAgICAgICAgIHN0cm9uZ1RoaXMtPm1fbm90aWZp Y2F0aW9uQ2FsbGJhY2soKTsKKyAgICBSZWZQdHI8V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9u PiBwcm90ZWN0ZWRUaGlzIHsgdGhpcyB9OworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dl dF9tYWluX3F1ZXVlKCksIFtwcm90ZWN0ZWRUaGlzXSB7CisgICAgICAgIGlmIChwcm90ZWN0ZWRU aGlzLT5tX25vdGlmaWNhdGlvbkNhbGxiYWNrKQorICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+ bV9ub3RpZmljYXRpb25DYWxsYmFjaygpOwogICAgIH0pOwogfQogCkBAIC0xNzUsOCArMTc1LDgg QEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmVucXVldWVTYW1wbGUoQ01TYW1w bGVCdWZmZXJSZWYgc2FtcGxlQnVmZmVyLAogCiAgICAgTE9HKE1lZGlhLCAiV2ViQ29yZURlY29t cHJlc3Npb25TZXNzaW9uOjplbnF1ZXVlU2FtcGxlKCVwKSAtIGZyYW1lc0JlaW5nRGVjb2RlZCgl ZCkiLCB0aGlzLCBtX2ZyYW1lc0JlaW5nRGVjb2RlZCk7CiAKLSAgICBkaXNwYXRjaF9hc3luYyht X2RlY29tcHJlc3Npb25RdWV1ZS5nZXQoKSwgW3N0cm9uZ1RoaXMgPSBtYWtlUmVmUHRyKCp0aGlz KSwgc3Ryb25nQnVmZmVyID0gcmV0YWluUHRyKHNhbXBsZUJ1ZmZlciksIGRpc3BsYXlpbmddIHsK LSAgICAgICAgc3Ryb25nVGhpcy0+ZGVjb2RlU2FtcGxlKHN0cm9uZ0J1ZmZlci5nZXQoKSwgZGlz cGxheWluZyk7CisgICAgZGlzcGF0Y2hfYXN5bmMobV9kZWNvbXByZXNzaW9uUXVldWUuZ2V0KCks IFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cigqdGhpcyksIHN0cm9uZ0J1ZmZlciA9IHJldGFp blB0cihzYW1wbGVCdWZmZXIpLCBkaXNwbGF5aW5nXSB7CisgICAgICAgIHByb3RlY3RlZFRoaXMt PmRlY29kZVNhbXBsZShzdHJvbmdCdWZmZXIuZ2V0KCksIGRpc3BsYXlpbmcpOwogICAgIH0pOwog fQogCkBAIC0yMzgsMTEgKzIzOCwxMSBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lv bjo6aGFuZGxlRGVjb21wcmVzc2lvbk91dHB1dChib29sIGRpc3BsYXlpbmcsIE9TUwogICAgIENN U2FtcGxlQnVmZmVyUmVmIHJhd0ltYWdlU2FtcGxlQnVmZmVyID0gbnVsbHB0cjsKICAgICBpZiAo bm9FcnIgIT0gQ01TYW1wbGVCdWZmZXJDcmVhdGVSZWFkeVdpdGhJbWFnZUJ1ZmZlcihrQ0ZBbGxv Y2F0b3JEZWZhdWx0LCByYXdJbWFnZUJ1ZmZlciwgaW1hZ2VCdWZmZXJEZXNjcmlwdGlvbi5nZXQo KSwgJmltYWdlQnVmZmVyVGltaW5nLCAmcmF3SW1hZ2VTYW1wbGVCdWZmZXIpKQogICAgICAgICBy ZXR1cm47Ci0gICAgUmVmUHRyPFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbj4gc3Ryb25nVGhp cyB7IHRoaXMgfTsKKyAgICBSZWZQdHI8V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uPiBwcm90 ZWN0ZWRUaGlzIHsgdGhpcyB9OwogICAgIFJldGFpblB0cjxDTVNhbXBsZUJ1ZmZlclJlZj4gaW1h Z2VTYW1wbGVCdWZmZXIgPSBhZG9wdENGKHJhd0ltYWdlU2FtcGxlQnVmZmVyKTsKLSAgICBkaXNw YXRjaF9hc3luYyhtX2VucXVlaW5nUXVldWUuZ2V0KCksIFtzdHJvbmdUaGlzLCBzdGF0dXMsIGlt YWdlU2FtcGxlQnVmZmVyLCBpbmZvRmxhZ3MsIGRpc3BsYXlpbmddIHsKKyAgICBkaXNwYXRjaF9h c3luYyhtX2VucXVlaW5nUXVldWUuZ2V0KCksIFtwcm90ZWN0ZWRUaGlzLCBzdGF0dXMsIGltYWdl U2FtcGxlQnVmZmVyLCBpbmZvRmxhZ3MsIGRpc3BsYXlpbmddIHsKICAgICAgICAgVU5VU0VEX1BB UkFNKGluZm9GbGFncyk7Ci0gICAgICAgIHN0cm9uZ1RoaXMtPmVucXVldWVEZWNvZGVkU2FtcGxl KGltYWdlU2FtcGxlQnVmZmVyLmdldCgpLCBkaXNwbGF5aW5nKTsKKyAgICAgICAgcHJvdGVjdGVk VGhpcy0+ZW5xdWV1ZURlY29kZWRTYW1wbGUoaW1hZ2VTYW1wbGVCdWZmZXIuZ2V0KCksIGRpc3Bs YXlpbmcpOwogICAgIH0pOwogfQogCkBAIC0zMTQsOCArMzE0LDggQEAgdm9pZCBXZWJDb3JlRGVj b21wcmVzc2lvblNlc3Npb246OmVucXVldWVEZWNvZGVkU2FtcGxlKENNU2FtcGxlQnVmZmVyUmVm IHNhbXBsZSwKICAgICBpZiAobV9oYXNBdmFpbGFibGVGcmFtZUNhbGxiYWNrKSB7CiAgICAgICAg IHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBjYWxsYmFjayB7IG1faGFzQXZhaWxhYmxlRnJhbWVDYWxs YmFjayB9OwogICAgICAgICBtX2hhc0F2YWlsYWJsZUZyYW1lQ2FsbGJhY2sgPSBudWxscHRyOwot ICAgICAgICBSZWZQdHI8V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uPiBzdHJvbmdUaGlzIHsg dGhpcyB9OwotICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgp LCBbc3Ryb25nVGhpcywgY2FsbGJhY2tdIHsKKyAgICAgICAgUmVmUHRyPFdlYkNvcmVEZWNvbXBy ZXNzaW9uU2Vzc2lvbj4gcHJvdGVjdGVkVGhpcyB7IHRoaXMgfTsKKyAgICAgICAgZGlzcGF0Y2hf YXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3Byb3RlY3RlZFRoaXMsIGNhbGxiYWNr XSB7CiAgICAgICAgICAgICBjYWxsYmFjaygpOwogICAgICAgICB9KTsKICAgICB9CkBAIC0zMzMs MTAgKzMzMywxMCBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6cmVxdWVzdE1l ZGlhRGF0YVdoZW5SZWFkeShzdGQ6OmZ1bmN0aW9uPHZvaWQoKQogICAgIG1fbm90aWZpY2F0aW9u Q2FsbGJhY2sgPSBub3RpZmljYXRpb25DYWxsYmFjazsKIAogICAgIGlmIChub3RpZmljYXRpb25D YWxsYmFjayAmJiBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpKSB7Ci0gICAgICAgIFJlZlB0cjxX ZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24+IHN0cm9uZ1RoaXMgeyB0aGlzIH07Ci0gICAgICAg IGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFtzdHJvbmdUaGlzXSB7 Ci0gICAgICAgICAgICBpZiAoc3Ryb25nVGhpcy0+bV9ub3RpZmljYXRpb25DYWxsYmFjaykKLSAg ICAgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX25vdGlmaWNhdGlvbkNhbGxiYWNrKCk7CisgICAg ICAgIFJlZlB0cjxXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24+IHByb3RlY3RlZFRoaXMgeyB0 aGlzIH07CisgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCks IFtwcm90ZWN0ZWRUaGlzXSB7CisgICAgICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+bV9ub3Rp ZmljYXRpb25DYWxsYmFjaykKKyAgICAgICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5tX25vdGlm aWNhdGlvbkNhbGxiYWNrKCk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KQEAgLTQwNiwxMCArNDA2 LDEwIEBAIFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBXZWJDb3JlRGVjb21wcmVzc2lvblNl c3Npb246OmltYWdlRm9yVGltZShjb25zdCBNZWRpCiAKIHZvaWQgV2ViQ29yZURlY29tcHJlc3Np b25TZXNzaW9uOjpmbHVzaCgpCiB7Ci0gICAgZGlzcGF0Y2hfc3luYyhtX2RlY29tcHJlc3Npb25R dWV1ZS5nZXQoKSwgW3N0cm9uZ1RoaXMgPSBSZWZQdHI8V2ViQ29yZURlY29tcHJlc3Npb25TZXNz aW9uPih0aGlzKV0gewotICAgICAgICBDTUJ1ZmZlclF1ZXVlUmVzZXQoc3Ryb25nVGhpcy0+bV9w cm9kdWNlclF1ZXVlLmdldCgpKTsKLSAgICAgICAgZGlzcGF0Y2hfc3luYyhzdHJvbmdUaGlzLT5t X2VucXVlaW5nUXVldWUuZ2V0KCksIFtzdHJvbmdUaGlzXSB7Ci0gICAgICAgICAgICBDTUJ1ZmZl clF1ZXVlUmVzZXQoc3Ryb25nVGhpcy0+bV9jb25zdW1lclF1ZXVlLmdldCgpKTsKKyAgICBkaXNw YXRjaF9zeW5jKG1fZGVjb21wcmVzc2lvblF1ZXVlLmdldCgpLCBbcHJvdGVjdGVkVGhpcyA9IFJl ZlB0cjxXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24+KHRoaXMpXSB7CisgICAgICAgIENNQnVm ZmVyUXVldWVSZXNldChwcm90ZWN0ZWRUaGlzLT5tX3Byb2R1Y2VyUXVldWUuZ2V0KCkpOworICAg ICAgICBkaXNwYXRjaF9zeW5jKHByb3RlY3RlZFRoaXMtPm1fZW5xdWVpbmdRdWV1ZS5nZXQoKSwg W3Byb3RlY3RlZFRoaXNdIHsKKyAgICAgICAgICAgIENNQnVmZmVyUXVldWVSZXNldChwcm90ZWN0 ZWRUaGlzLT5tX2NvbnN1bWVyUXVldWUuZ2V0KCkpOwogICAgICAgICB9KTsKICAgICB9KTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViVmlkZW9GdWxs c2NyZWVuTWFuYWdlci5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViVmlk ZW9GdWxsc2NyZWVuTWFuYWdlci5tbQppbmRleCBkZjQ2MTc0ZWYzYWQ4M2UwOGY0M2FkOGUzN2Fi ZmI1MTI4OWE4MDY4Li4yNGM5OGNhOGVjNjMzYWU2ODY4OTU5NjUwZWU4MjEyOWUyMzhlYjcxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2NvY29hL1dlYlZpZGVvRnVsbHNj cmVlbk1hbmFnZXIubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJW aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCkBAIC0zMzksMTIgKzMzOSwxMiBAQCB2b2lkIFdlYlZp ZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZFNldHVwRnVsbHNjcmVlbih1aW50NjRfdCBjb250ZXh0 SWQpCiAKICAgICBpbnRlcmZhY2UtPmxheWVySG9zdGluZ0NvbnRleHQoKS0+c2V0Um9vdExheWVy KHZpZGVvTGF5ZXIpOwogCi0gICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI+IHN0 cm9uZ1RoaXModGhpcyk7CisgICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI+IHBy b3RlY3RlZFRoaXModGhpcyk7CiAgICAgCi0gICAgbW9kZWwtPnNldFZpZGVvRnVsbHNjcmVlbkxh eWVyKHZpZGVvTGF5ZXIsIFtzdHJvbmdUaGlzLCB0aGlzLCBjb250ZXh0SWRdIHsKLSAgICAgICAg ZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3N0cm9uZ1RoaXMsIHRo aXMsIGNvbnRleHRJZF0gewotICAgICAgICAgICAgaWYgKHN0cm9uZ1RoaXMtPm1fcGFnZSkKLSAg ICAgICAgICAgICAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlZpZGVvRnVsbHNjcmVlbk1h bmFnZXJQcm94eTo6RW50ZXJGdWxsc2NyZWVuKGNvbnRleHRJZCksIHN0cm9uZ1RoaXMtPm1fcGFn ZS0+cGFnZUlEKCkpOworICAgIG1vZGVsLT5zZXRWaWRlb0Z1bGxzY3JlZW5MYXllcih2aWRlb0xh eWVyLCBbcHJvdGVjdGVkVGhpcywgdGhpcywgY29udGV4dElkXSB7CisgICAgICAgIGRpc3BhdGNo X2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFtwcm90ZWN0ZWRUaGlzLCB0aGlzLCBj b250ZXh0SWRdIHsKKyAgICAgICAgICAgIGlmIChwcm90ZWN0ZWRUaGlzLT5tX3BhZ2UpCisgICAg ICAgICAgICAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJWaWRlb0Z1bGxzY3JlZW5NYW5h Z2VyUHJveHk6OkVudGVyRnVsbHNjcmVlbihjb250ZXh0SWQpLCBwcm90ZWN0ZWRUaGlzLT5tX3Bh Z2UtPnBhZ2VJRCgpKTsKICAgICAgICAgfSk7CiAgICAgfSk7CiAgICAgCkBAIC0zNjgsMTAgKzM2 OCwxMCBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZEVudGVyRnVsbHNjcmVl bih1aW50NjRfdCBjb250ZXh0SWQpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIGV4aXQgZnVs bHNjcmVlbiBub3cgaWYgaXQgd2FzIHByZXZpb3VzbHkgcmVxdWVzdGVkIGR1cmluZyBhbiBhbmlt YXRpb24uCi0gICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI+IHN0cm9uZ1RoaXMo dGhpcyk7Ci0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3N0 cm9uZ1RoaXMsIHZpZGVvRWxlbWVudF0gewotICAgICAgICBpZiAoc3Ryb25nVGhpcy0+bV9wYWdl KQotICAgICAgICAgICAgc3Ryb25nVGhpcy0+ZXhpdFZpZGVvRnVsbHNjcmVlbkZvclZpZGVvRWxl bWVudCgqdmlkZW9FbGVtZW50KTsKKyAgICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdl cj4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRf bWFpbl9xdWV1ZSgpLCBbcHJvdGVjdGVkVGhpcywgdmlkZW9FbGVtZW50XSB7CisgICAgICAgIGlm IChwcm90ZWN0ZWRUaGlzLT5tX3BhZ2UpCisgICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5leGl0 VmlkZW9GdWxsc2NyZWVuRm9yVmlkZW9FbGVtZW50KCp2aWRlb0VsZW1lbnQpOwogICAgIH0pOwog fQogCkBAIC0zODAsMTggKzM4MCwxOCBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6 OmRpZEV4aXRGdWxsc2NyZWVuKHVpbnQ2NF90IGNvbnRleHRJZCkKICAgICBSZWZQdHI8V2ViVmlk ZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ+IG1vZGVsOwogICAgIFJlZlB0cjxXZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VDb250ZXh0PiBpbnRlcmZhY2U7CiAgICAgc3RkOjp0aWUobW9k ZWwsIGludGVyZmFjZSkgPSBlbnN1cmVNb2RlbEFuZEludGVyZmFjZShjb250ZXh0SWQpOwotICAg IFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyPiBzdHJvbmdUaGlzKHRoaXMpOworICAg IFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyPiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwog ICAgIAotICAgIG1vZGVsLT53YWl0Rm9yUHJlcGFyZWRGb3JJbmxpbmVUaGVuKFtzdHJvbmdUaGlz LCBjb250ZXh0SWQsIGludGVyZmFjZSwgbW9kZWxdIHsKLSAgICAgICAgZGlzcGF0Y2hfYXN5bmMo ZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3N0cm9uZ1RoaXMsIGNvbnRleHRJZCwgaW50ZXJm YWNlLCBtb2RlbF0gewotICAgICAgICAgICAgbW9kZWwtPnNldFZpZGVvRnVsbHNjcmVlbkxheWVy KG5pbCwgW3N0cm9uZ1RoaXMsIGNvbnRleHRJZCwgaW50ZXJmYWNlXSB7Ci0gICAgICAgICAgICAg ICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3N0cm9uZ1RoaXMs IGNvbnRleHRJZCwgaW50ZXJmYWNlXSB7CisgICAgbW9kZWwtPndhaXRGb3JQcmVwYXJlZEZvcklu bGluZVRoZW4oW3Byb3RlY3RlZFRoaXMsIGNvbnRleHRJZCwgaW50ZXJmYWNlLCBtb2RlbF0gewor ICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbcHJvdGVj dGVkVGhpcywgY29udGV4dElkLCBpbnRlcmZhY2UsIG1vZGVsXSB7CisgICAgICAgICAgICBtb2Rl bC0+c2V0VmlkZW9GdWxsc2NyZWVuTGF5ZXIobmlsLCBbcHJvdGVjdGVkVGhpcywgY29udGV4dElk LCBpbnRlcmZhY2VdIHsKKyAgICAgICAgICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCBbcHJvdGVjdGVkVGhpcywgY29udGV4dElkLCBpbnRlcmZhY2VdIHsK ICAgICAgICAgICAgICAgICAgICAgaWYgKGludGVyZmFjZS0+bGF5ZXJIb3N0aW5nQ29udGV4dCgp KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcmZhY2UtPmxheWVySG9zdGluZ0NvbnRl eHQoKS0+c2V0Um9vdExheWVyKG51bGxwdHIpOwogICAgICAgICAgICAgICAgICAgICAgICAgaW50 ZXJmYWNlLT5zZXRMYXllckhvc3RpbmdDb250ZXh0KG51bGxwdHIpOwogICAgICAgICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIGlmIChzdHJvbmdUaGlzLT5tX3BhZ2UpCi0gICAg ICAgICAgICAgICAgICAgICAgICBzdHJvbmdUaGlzLT5tX3BhZ2UtPnNlbmQoTWVzc2FnZXM6Oldl YlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6Q2xlYW51cEZ1bGxzY3JlZW4oY29udGV4dElk KSwgc3Ryb25nVGhpcy0+bV9wYWdlLT5wYWdlSUQoKSk7CisgICAgICAgICAgICAgICAgICAgIGlm IChwcm90ZWN0ZWRUaGlzLT5tX3BhZ2UpCisgICAgICAgICAgICAgICAgICAgICAgICBwcm90ZWN0 ZWRUaGlzLT5tX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQ cm94eTo6Q2xlYW51cEZ1bGxzY3JlZW4oY29udGV4dElkKSwgcHJvdGVjdGVkVGhpcy0+bV9wYWdl LT5wYWdlSUQoKSk7CiAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9KTsKICAgICAg ICAgfSk7CkBAIC00MTgsMTAgKzQxOCwxMCBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFn ZXI6OmRpZENsZWFudXBGdWxsc2NyZWVuKHVpbnQ2NF90IGNvbnRleHRJZCkKICAgICBpZiAoIXZp ZGVvRWxlbWVudCB8fCAhdGFyZ2V0SXNGdWxsc2NyZWVuKQogICAgICAgICByZXR1cm47CiAKLSAg ICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcj4gc3Ryb25nVGhpcyh0aGlzKTsKLSAg ICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbc3Ryb25nVGhpcywg dmlkZW9FbGVtZW50LCBtb2RlXSB7Ci0gICAgICAgIGlmIChzdHJvbmdUaGlzLT5tX3BhZ2UpCi0g ICAgICAgICAgICBzdHJvbmdUaGlzLT5lbnRlclZpZGVvRnVsbHNjcmVlbkZvclZpZGVvRWxlbWVu dCgqdmlkZW9FbGVtZW50LCBtb2RlKTsKKyAgICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVuTWFu YWdlcj4gcHJvdGVjdGVkVGhpcyh0aGlzKTsKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCBbcHJvdGVjdGVkVGhpcywgdmlkZW9FbGVtZW50LCBtb2RlXSB7Cisg ICAgICAgIGlmIChwcm90ZWN0ZWRUaGlzLT5tX3BhZ2UpCisgICAgICAgICAgICBwcm90ZWN0ZWRU aGlzLT5lbnRlclZpZGVvRnVsbHNjcmVlbkZvclZpZGVvRWxlbWVudCgqdmlkZW9FbGVtZW50LCBt b2RlKTsKICAgICB9KTsKIH0KICAgICAK