196057 2019-03-20 22:46:30 -0700 Stop using LegacySync messages in WebPage 2019-03-21 14:05:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez thorton webkit-bug-importer oldest_to_newest 1519485 0 achristensen 2019-03-20 22:46:30 -0700 Stop using LegacySync messages in WebPage 1519487 1 365491 achristensen 2019-03-20 22:47:22 -0700 Created attachment 365491 Patch 1519922 2 achristensen 2019-03-21 14:04:51 -0700 http://trac.webkit.org/r243326 1519923 3 webkit-bug-importer 2019-03-21 14:05:24 -0700 <rdar://problem/49123110> 365491 2019-03-20 22:47:22 -0700 2019-03-21 13:52:24 -0700 Patch bug-196057-20190320224721.patch text/plain 16540 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDMyNzgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE5LTAzLTIwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3RvcCB1c2luZyBM ZWdhY3lTeW5jIG1lc3NhZ2VzIGluIFdlYlBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjA1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bWFya0xheWVyc1ZvbGF0aWxlKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpnZXRDZW50ZXJGb3Jab29tR2VzdHVyZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZWFkU2VsZWN0 aW9uRnJvbVBhc3RlYm9hcmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRTdHJpbmdT ZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0RGF0 YVNlbGVjdGlvbkZvclBhc3RlYm9hcmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzaG91 bGREZWxheVdpbmRvd09yZGVyaW5nRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjph Y2NlcHRzRmlyc3RNb3VzZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQ YWdlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXBsYWNlU2VsZWN0aW9uV2l0 aFBhc3RlYm9hcmREYXRhKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVhZFNlbGVjdGlv bkZyb21QYXN0ZWJvYXJkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0U3RyaW5nU2Vs ZWN0aW9uRm9yUGFzdGVib2FyZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmdldERhdGFT ZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2hvdWxk RGVsYXlXaW5kb3dPcmRlcmluZ0V2ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6YWNj ZXB0c0ZpcnN0TW91c2UpOgorCiAyMDE5LTAzLTIwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KIAogICAgICAgICBDb21wdXRlIHF1b3RhIGFmdGVyIG5ldHdvcmsgcHJvY2VzcyBy ZXN0YXJ0IGJhc2VkIG9uIGRlZmF1bHQgcXVvdGEgYW5kIHNwYWNlIHVzZWQKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDI0MzE4MCkK KysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBj b3B5KQpAQCAtNzA0LDcgKzcwNCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGZyZWV6ZUxheWVyVHJl ZShMYXllclRyZWVGcmVlemVSZWFzb24pOwogICAgIHZvaWQgdW5mcmVlemVMYXllclRyZWUoTGF5 ZXJUcmVlRnJlZXplUmVhc29uKTsKIAotICAgIHZvaWQgbWFya0xheWVyc1ZvbGF0aWxlKFdURjo6 RnVuY3Rpb248dm9pZCAoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIgPSB7IH0pOworICAgIHZv aWQgbWFya0xheWVyc1ZvbGF0aWxlKEZ1bmN0aW9uPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhh bmRsZXIgPSB7IH0pOwogICAgIHZvaWQgY2FuY2VsTWFya0xheWVyc1ZvbGF0aWxlKCk7CiAKICAg ICBOb3RpZmljYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIqIG5vdGlmaWNhdGlvblBlcm1p c3Npb25SZXF1ZXN0TWFuYWdlcigpOwpAQCAtNzUzLDcgKzc1Myw3IEBAIHB1YmxpYzoKICNlbmRp ZgogCiAjaWYgUExBVEZPUk0gKEdUSykgJiYgSEFWRShHVEtfR0VTVFVSRVMpCi0gICAgdm9pZCBn ZXRDZW50ZXJGb3Jab29tR2VzdHVyZShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY2VudGVySW5W aWV3Q29vcmRpbmF0ZXMsIFdlYkNvcmU6OkludFBvaW50JiByZXN1bHQpOworICAgIHZvaWQgZ2V0 Q2VudGVyRm9yWm9vbUdlc3R1cmUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGNlbnRlckluVmll d0Nvb3JkaW5hdGVzLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6OkludFBvaW50JiYp PiYmKTsKICNlbmRpZgogCiAgICAgdm9pZCBkaWRBcHBseVN0eWxlKCk7CkBAIC03ODEsMTEgKzc4 MSwxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb21wb3NpdGlvbkFzeW5jKGNvbnN0IFN0cmlu ZyYgdGV4dCwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYgdW5k ZXJsaW5lcywgY29uc3QgRWRpdGluZ1JhbmdlJiBzZWxlY3Rpb25SYW5nZSwgY29uc3QgRWRpdGlu Z1JhbmdlJiByZXBsYWNlbWVudFJhbmdlKTsKICAgICB2b2lkIGNvbmZpcm1Db21wb3NpdGlvbkFz eW5jKCk7CiAKLSAgICB2b2lkIHJlYWRTZWxlY3Rpb25Gcm9tUGFzdGVib2FyZChjb25zdCBXVEY6 OlN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGJvb2wmIHJlc3VsdCk7Ci0gICAgdm9pZCBnZXRTdHJp bmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKFdURjo6U3RyaW5nJiBzdHJpbmdWYWx1ZSk7Ci0gICAg dm9pZCBnZXREYXRhU2VsZWN0aW9uRm9yUGFzdGVib2FyZChjb25zdCBXVEY6OlN0cmluZyBwYXN0 ZWJvYXJkVHlwZSwgU2hhcmVkTWVtb3J5OjpIYW5kbGUmIGhhbmRsZSwgdWludDY0X3QmIHNpemUp OwotICAgIHZvaWQgc2hvdWxkRGVsYXlXaW5kb3dPcmRlcmluZ0V2ZW50KGNvbnN0IFdlYktpdDo6 V2ViTW91c2VFdmVudCYsIGJvb2wmIHJlc3VsdCk7Ci0gICAgdm9pZCBhY2NlcHRzRmlyc3RNb3Vz ZShpbnQgZXZlbnROdW1iZXIsIGNvbnN0IFdlYktpdDo6V2ViTW91c2VFdmVudCYsIGJvb2wmIHJl c3VsdCk7CisgICAgdm9pZCByZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQoY29uc3QgU3RyaW5n JiBwYXN0ZWJvYXJkTmFtZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sJiYpPiYmKTsKKyAg ICB2b2lkIGdldFN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQoQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChTdHJpbmcmJik+JiYpOworICAgIHZvaWQgZ2V0RGF0YVNlbGVjdGlvbkZvclBhc3RlYm9h cmQoY29uc3QgU3RyaW5nIHBhc3RlYm9hcmRUeXBlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFNo YXJlZE1lbW9yeTo6SGFuZGxlJiYsIHVpbnQ2NF90KT4mJik7CisgICAgdm9pZCBzaG91bGREZWxh eVdpbmRvd09yZGVyaW5nRXZlbnQoY29uc3QgV2ViS2l0OjpXZWJNb3VzZUV2ZW50JiwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChib29sKT4mJik7CisgICAgdm9pZCBhY2NlcHRzRmlyc3RNb3VzZShp bnQgZXZlbnROdW1iZXIsIGNvbnN0IFdlYktpdDo6V2ViTW91c2VFdmVudCYsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoYm9vbCk+JiYpOwogICAgIGJvb2wgcGVyZm9ybU5vbkVkaXRpbmdCZWhhdmlv ckZvclNlbGVjdG9yKGNvbnN0IFN0cmluZyYsIFdlYkNvcmU6OktleWJvYXJkRXZlbnQqKTsKICNl bmRpZgogCkBAIC0xMTIxLDcgKzExMjEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzaG91bGRBbGxv d0RldmljZU9yaWVudGF0aW9uQW5kTW90aW9uQWNjZXNzKHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYm KTsKICNlbmRpZgogCi0gICAgdm9pZCBzaG93U2hhcmVTaGVldChXZWJDb3JlOjpTaGFyZURhdGFX aXRoUGFyc2VkVVJMJiwgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNhbGxi YWNrKTsKKyAgICB2b2lkIHNob3dTaGFyZVNoZWV0KFdlYkNvcmU6OlNoYXJlRGF0YVdpdGhQYXJz ZWRVUkwmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNhbGxiYWNrKTsKICAgICB2 b2lkIGRpZENvbXBsZXRlU2hhcmVTaGVldChib29sIHdhc0NvbXBsZXRlZCwgU2hhcmVTaGVldENh bGxiYWNrSUQgY29udGV4dElkKTsKICAgICAKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5U KQpAQCAtMTgwNiw3ICsxODA2LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgV2ViQ29yZTo6 VGltZXIgbV9sYXllclZvbGF0aWxpdHlUaW1lcjsKLSAgICBWZWN0b3I8V1RGOjpGdW5jdGlvbjx2 b2lkIChib29sKT4+IG1fbWFya0xheWVyc0FzVm9sYXRpbGVDb21wbGV0aW9uSGFuZGxlcnM7Cisg ICAgVmVjdG9yPEZ1bmN0aW9uPHZvaWQoYm9vbCk+PiBtX21hcmtMYXllcnNBc1ZvbGF0aWxlQ29t cGxldGlvbkhhbmRsZXJzOwogICAgIGJvb2wgbV9pc1N1c3BlbmRlZFVuZGVyTG9jayB7IGZhbHNl IH07CiAKICAgICBIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPiBtX21p bWVUeXBlc1dpdGhDdXN0b21Db250ZW50UHJvdmlkZXJzOwpAQCAtMTg2MSw4ICsxODYxLDggQEAg cHJpdmF0ZToKICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPFdlYlVSTFNjaGVtZUhhbmRsZXJQ cm94eT4+IG1fc2NoZW1lVG9VUkxTY2hlbWVIYW5kbGVyUHJveHlNYXA7CiAgICAgSGFzaE1hcDx1 aW50NjRfdCwgV2ViVVJMU2NoZW1lSGFuZGxlclByb3h5Kj4gbV9pZGVudGlmaWVyVG9VUkxTY2hl bWVIYW5kbGVyUHJveHlNYXA7CiAKLSAgICBIYXNoTWFwPHVpbnQ2NF90LCBXVEY6OkZ1bmN0aW9u PHZvaWQoYm9vbCBncmFudGVkKT4+IG1fc3RvcmFnZUFjY2Vzc1Jlc3BvbnNlQ2FsbGJhY2tNYXA7 Ci0gICAgSGFzaE1hcDxTaGFyZVNoZWV0Q2FsbGJhY2tJRCwgV1RGOjpGdW5jdGlvbjx2b2lkKGJv b2wgY29tcGxldGVkKT4+IG1fc2hhcmVTaGVldFJlc3BvbnNlQ2FsbGJhY2tNYXA7CisgICAgSGFz aE1hcDx1aW50NjRfdCwgRnVuY3Rpb248dm9pZChib29sIGdyYW50ZWQpPj4gbV9zdG9yYWdlQWNj ZXNzUmVzcG9uc2VDYWxsYmFja01hcDsKKyAgICBIYXNoTWFwPFNoYXJlU2hlZXRDYWxsYmFja0lE LCBGdW5jdGlvbjx2b2lkKGJvb2wgY29tcGxldGVkKT4+IG1fc2hhcmVTaGVldFJlc3BvbnNlQ2Fs bGJhY2tNYXA7CiAKICNpZiBFTkFCTEUoQVBQTElDQVRJT05fTUFOSUZFU1QpCiAgICAgSGFzaE1h cDx1aW50NjRfdCwgdWludDY0X3Q+IG1fYXBwbGljYXRpb25NYW5pZmVzdEZldGNoQ2FsbGJhY2tN YXA7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3Nh Z2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDI0MzE4MCkKKysrIFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTQw Nyw3ICs0MDcsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICNlbmRp ZgogCiAjaWYgUExBVEZPUk0gKEdUSykgJiYgSEFWRShHVEtfR0VTVFVSRVMpCi0gICAgR2V0Q2Vu dGVyRm9yWm9vbUdlc3R1cmUoV2ViQ29yZTo6SW50UG9pbnQgY2VudGVySW5WaWV3Q29vcmRpbmF0 ZXMpIC0+IChXZWJDb3JlOjpJbnRQb2ludCBjZW50ZXIpIExlZ2FjeVN5bmMKKyAgICBHZXRDZW50 ZXJGb3Jab29tR2VzdHVyZShXZWJDb3JlOjpJbnRQb2ludCBjZW50ZXJJblZpZXdDb29yZGluYXRl cykgLT4gKFdlYkNvcmU6OkludFBvaW50IGNlbnRlcikgRGVsYXllZAogI2VuZGlmCiAKICNpZiBQ TEFURk9STShDT0NPQSkKQEAgLTQxNywxNiArNDE3LDE2IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2Ug TGVnYWN5UmVjZWl2ZXIgewogICAgIFdpbmRvd0FuZFZpZXdGcmFtZXNDaGFuZ2VkKFdlYkNvcmU6 OkZsb2F0UmVjdCB3aW5kb3dGcmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMsIFdlYkNvcmU6OkZsb2F0 UmVjdCB3aW5kb3dGcmFtZUluVW5mbGlwcGVkU2NyZWVuQ29vcmRpbmF0ZXMsIFdlYkNvcmU6OkZs b2F0UmVjdCB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzLCBXZWJDb3JlOjpGbG9hdFBvaW50 IGFjY2Vzc2liaWxpdHlWaWV3Q29vcmRpbmF0ZXMpCiAgICAgU2V0TWFpbkZyYW1lSXNTY3JvbGxh YmxlKGJvb2wgaXNTY3JvbGxhYmxlKQogICAgIFJlZ2lzdGVyVUlQcm9jZXNzQWNjZXNzaWJpbGl0 eVRva2VucyhJUEM6OkRhdGFSZWZlcmVuY2UgZWxlbWVuVG9rZW4sIElQQzo6RGF0YVJlZmVyZW5j ZSB3aW5kb3dUb2tlbikKLSAgICBHZXRTdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKCkgLT4g KFN0cmluZyBzdHJpbmdWYWx1ZSkgTGVnYWN5U3luYwotICAgIEdldERhdGFTZWxlY3Rpb25Gb3JQ YXN0ZWJvYXJkKFN0cmluZyBwYXN0ZWJvYXJkVHlwZSkgLT4gKFdlYktpdDo6U2hhcmVkTWVtb3J5 OjpIYW5kbGUgaGFuZGxlLCB1aW50NjRfdCBzaXplKSBMZWdhY3lTeW5jCi0gICAgUmVhZFNlbGVj dGlvbkZyb21QYXN0ZWJvYXJkKFN0cmluZyBwYXN0ZWJvYXJkTmFtZSkgLT4gKGJvb2wgcmVzdWx0 KSBMZWdhY3lTeW5jCisgICAgR2V0U3RyaW5nU2VsZWN0aW9uRm9yUGFzdGVib2FyZCgpIC0+IChT dHJpbmcgc3RyaW5nVmFsdWUpIERlbGF5ZWQKKyAgICBHZXREYXRhU2VsZWN0aW9uRm9yUGFzdGVi b2FyZChTdHJpbmcgcGFzdGVib2FyZFR5cGUpIC0+IChXZWJLaXQ6OlNoYXJlZE1lbW9yeTo6SGFu ZGxlIGhhbmRsZSwgdWludDY0X3Qgc2l6ZSkgRGVsYXllZAorICAgIFJlYWRTZWxlY3Rpb25Gcm9t UGFzdGVib2FyZChTdHJpbmcgcGFzdGVib2FyZE5hbWUpIC0+IChib29sIHJlc3VsdCkgRGVsYXll ZAogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAgUmVwbGFjZVNlbGVjdGlvbldp dGhQYXN0ZWJvYXJkRGF0YShWZWN0b3I8U3RyaW5nPiB0eXBlcywgSVBDOjpEYXRhUmVmZXJlbmNl IGRhdGEpCiAjZW5kaWYKIAotICAgIFNob3VsZERlbGF5V2luZG93T3JkZXJpbmdFdmVudChXZWJL aXQ6OldlYk1vdXNlRXZlbnQgZXZlbnQpIC0+IChib29sIHJlc3VsdCkgTGVnYWN5U3luYwotICAg IEFjY2VwdHNGaXJzdE1vdXNlKGludCBldmVudE51bWJlciwgV2ViS2l0OjpXZWJNb3VzZUV2ZW50 IGV2ZW50KSAtPiAoYm9vbCByZXN1bHQpIExlZ2FjeVN5bmMKKyAgICBTaG91bGREZWxheVdpbmRv d09yZGVyaW5nRXZlbnQoV2ViS2l0OjpXZWJNb3VzZUV2ZW50IGV2ZW50KSAtPiAoYm9vbCByZXN1 bHQpIERlbGF5ZWQKKyAgICBBY2NlcHRzRmlyc3RNb3VzZShpbnQgZXZlbnROdW1iZXIsIFdlYktp dDo6V2ViTW91c2VFdmVudCBldmVudCkgLT4gKGJvb2wgcmVzdWx0KSBEZWxheWVkCiAKICAgICBT ZXRUZXh0QXN5bmMoU3RyaW5nIHRleHQpCiAgICAgSW5zZXJ0VGV4dEFzeW5jKFN0cmluZyB0ZXh0 LCBzdHJ1Y3QgV2ViS2l0OjpFZGl0aW5nUmFuZ2UgcmVwbGFjZW1lbnRSYW5nZSwgYm9vbCByZWdp c3RlclVuZG9Hcm91cCwgdWludDMyX3QgZWRpdGluZ1JhbmdlSXNSZWxhdGl2ZVRvLCBib29sIHN1 cHByZXNzU2VsZWN0aW9uVXBkYXRlKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQYWdlR3RrLmNwcAkocmV2aXNpb24gMjQzMTgwKQorKysg U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBhZ2VHdGsuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNzYsMTEgKzE3NiwxMiBAQCBTdHJpbmcgV2ViUGFnZTo6cGxhdGZvcm1V c2VyQWdlbnQoY29uc3QgCiB9CiAKICNpZiBIQVZFKEdUS19HRVNUVVJFUykKLXZvaWQgV2ViUGFn ZTo6Z2V0Q2VudGVyRm9yWm9vbUdlc3R1cmUoY29uc3QgSW50UG9pbnQmIGNlbnRlckluVmlld0Nv b3JkaW5hdGVzLCBJbnRQb2ludCYgcmVzdWx0KQordm9pZCBXZWJQYWdlOjpnZXRDZW50ZXJGb3Ja b29tR2VzdHVyZShjb25zdCBJbnRQb2ludCYgY2VudGVySW5WaWV3Q29vcmRpbmF0ZXMsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoV2ViQ29yZTo6SW50UG9pbnQmJik+JiYgY29tcGxldGlvbkhhbmRs ZXIpCiB7Ci0gICAgcmVzdWx0ID0gbWFpbkZyYW1lVmlldygpLT5yb290Vmlld1RvQ29udGVudHMo Y2VudGVySW5WaWV3Q29vcmRpbmF0ZXMpOworICAgIEludFBvaW50IHJlc3VsdCA9IG1haW5GcmFt ZVZpZXcoKS0+cm9vdFZpZXdUb0NvbnRlbnRzKGNlbnRlckluVmlld0Nvb3JkaW5hdGVzKTsKICAg ICBkb3VibGUgc2NhbGUgPSBtX3BhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpOwogICAgIHJlc3VsdC5z Y2FsZSgxIC8gc2NhbGUsIDEgLyBzY2FsZSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92 ZShyZXN1bHQpKTsKIH0KICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQkocmV2aXNpb24gMjQzMTgwKQorKysg U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdvcmtp bmcgY29weSkKQEAgLTQ3OSwxOSArNDc5LDIyIEBAIHZvaWQgV2ViUGFnZTo6cmVnaXN0ZXJVSVBy b2Nlc3NBY2Nlc3NpYmkKICAgICBbbV9tb2NrQWNjZXNzaWJpbGl0eUVsZW1lbnQgc2V0UmVtb3Rl VG9rZW5EYXRhOmVsZW1lbnRUb2tlbkRhdGFdOwogfQogCi12b2lkIFdlYlBhZ2U6OnJlYWRTZWxl Y3Rpb25Gcm9tUGFzdGVib2FyZChjb25zdCBTdHJpbmcmLCBib29sJikKK3ZvaWQgV2ViUGFnZTo6 cmVhZFNlbGVjdGlvbkZyb21QYXN0ZWJvYXJkKGNvbnN0IFN0cmluZyYsIENvbXBsZXRpb25IYW5k bGVyPHZvaWQoYm9vbCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIGNvbXBsZXRpb25IYW5kbGVyKGZhbHNlKTsKIH0KIAotdm9pZCBXZWJQYWdl OjpnZXRTdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKFN0cmluZyYpCit2b2lkIFdlYlBhZ2U6 OmdldFN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChT dHJpbmcmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0pOwogfQogCi12b2lkIFdlYlBhZ2U6OmdldERhdGFT ZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKGNvbnN0IFN0cmluZywgU2hhcmVkTWVtb3J5OjpIYW5kbGUm LCB1aW50NjRfdCYpCit2b2lkIFdlYlBhZ2U6OmdldERhdGFTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJk KGNvbnN0IFN0cmluZywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTaGFyZWRNZW1vcnk6OkhhbmRs ZSYmLCB1aW50NjRfdCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgbm90SW1wbGVtZW50 ZWQoKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcih7IH0sIDApOwogfQogCiBXS0FjY2Vzc2liaWxp dHlXZWJQYWdlT2JqZWN0KiBXZWJQYWdlOjphY2Nlc3NpYmlsaXR5UmVtb3RlT2JqZWN0KCkKQEAg LTUwNiwxNCArNTA5LDE2IEBAIGJvb2wgV2ViUGFnZTo6cGxhdGZvcm1DYW5IYW5kbGVSZXF1ZXN0 KGMKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgV2ViUGFnZTo6c2hvdWxkRGVsYXlXaW5k b3dPcmRlcmluZ0V2ZW50KGNvbnN0IFdlYktpdDo6V2ViTW91c2VFdmVudCYsIGJvb2wmKQordm9p ZCBXZWJQYWdlOjpzaG91bGREZWxheVdpbmRvd09yZGVyaW5nRXZlbnQoY29uc3QgV2ViS2l0OjpX ZWJNb3VzZUV2ZW50JiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9u SGFuZGxlcikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGNvbXBsZXRpb25IYW5kbGVy KGZhbHNlKTsKIH0KIAotdm9pZCBXZWJQYWdlOjphY2NlcHRzRmlyc3RNb3VzZShpbnQsIGNvbnN0 IFdlYktpdDo6V2ViTW91c2VFdmVudCYsIGJvb2wmKQordm9pZCBXZWJQYWdlOjphY2NlcHRzRmly c3RNb3VzZShpbnQsIGNvbnN0IFdlYktpdDo6V2ViTW91c2VFdmVudCYsIENvbXBsZXRpb25IYW5k bGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgbm90SW1wbGVtZW50 ZWQoKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6 Y29tcHV0ZVBhZ2VzRm9yUHJpbnRpbmdQREZEb2N1bWVudCh1aW50NjRfdCwgY29uc3QgUHJpbnRJ bmZvJiwgVmVjdG9yPEludFJlY3Q+JikKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCShyZXZpc2lvbiAyNDMxODApCisrKyBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNTA0LDggKzUwNCw3IEBAIHZvaWQgV2ViUGFnZTo6cmVwbGFjZVNlbGVjdGlv bldpdGhQYXN0ZWIKICAgICBmb3IgKGF1dG8mIHR5cGUgOiB0eXBlcykKICAgICAgICAgV2ViUGFz dGVib2FyZE92ZXJyaWRlczo6c2hhcmVkUGFzdGVib2FyZE92ZXJyaWRlcygpLmFkZE92ZXJyaWRl KHJlcGxhY2VTZWxlY3Rpb25QYXN0ZWJvYXJkTmFtZSgpLCB0eXBlLCBkYXRhLnZlY3RvcigpKTsK IAotICAgIGJvb2wgcmVzdWx0OwotICAgIHJlYWRTZWxlY3Rpb25Gcm9tUGFzdGVib2FyZChyZXBs YWNlU2VsZWN0aW9uUGFzdGVib2FyZE5hbWUoKSwgcmVzdWx0KTsKKyAgICByZWFkU2VsZWN0aW9u RnJvbVBhc3RlYm9hcmQocmVwbGFjZVNlbGVjdGlvblBhc3RlYm9hcmROYW1lKCksIFtdKGJvb2wp IHsgfSk7CiAKICAgICBmb3IgKGF1dG8mIHR5cGUgOiB0eXBlcykKICAgICAgICAgV2ViUGFzdGVi b2FyZE92ZXJyaWRlczo6c2hhcmVkUGFzdGVib2FyZE92ZXJyaWRlcygpLnJlbW92ZU92ZXJyaWRl KHJlcGxhY2VTZWxlY3Rpb25QYXN0ZWJvYXJkTmFtZSgpLCB0eXBlKTsKQEAgLTUyOSw1MCArNTI4 LDQ2IEBAIHZvaWQgV2ViUGFnZTo6cmVnaXN0ZXJVSVByb2Nlc3NBY2Nlc3NpYmkKICAgICBbYWNj ZXNzaWJpbGl0eVJlbW90ZU9iamVjdCgpIHNldFJlbW90ZVBhcmVudDpyZW1vdGVFbGVtZW50Lmdl dCgpXTsKIH0KIAotdm9pZCBXZWJQYWdlOjpyZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQoY29u c3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCYgcmVzdWx0KQordm9pZCBXZWJQYWdlOjpy ZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewot ICAgIEZyYW1lJiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFp bkZyYW1lKCk7Ci0gICAgaWYgKGZyYW1lLnNlbGVjdGlvbigpLmlzTm9uZSgpKSB7Ci0gICAgICAg IHJlc3VsdCA9IGZhbHNlOwotICAgICAgICByZXR1cm47Ci0gICAgfQorICAgIGF1dG8mIGZyYW1l ID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBp ZiAoZnJhbWUuc2VsZWN0aW9uKCkuaXNOb25lKCkpCisgICAgICAgIHJldHVybiBjb21wbGV0aW9u SGFuZGxlcihmYWxzZSk7CiAgICAgZnJhbWUuZWRpdG9yKCkucmVhZFNlbGVjdGlvbkZyb21QYXN0 ZWJvYXJkKHBhc3RlYm9hcmROYW1lKTsKLSAgICByZXN1bHQgPSB0cnVlOworICAgIGNvbXBsZXRp b25IYW5kbGVyKHRydWUpOwogfQogCi12b2lkIFdlYlBhZ2U6OmdldFN0cmluZ1NlbGVjdGlvbkZv clBhc3RlYm9hcmQoU3RyaW5nJiBzdHJpbmdWYWx1ZSkKK3ZvaWQgV2ViUGFnZTo6Z2V0U3RyaW5n U2VsZWN0aW9uRm9yUGFzdGVib2FyZChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0cmluZyYmKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3Vz Q29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwogCi0gICAgaWYgKFBsdWdpblZpZXcq IHBsdWdpblZpZXcgPSBmb2N1c2VkUGx1Z2luVmlld0ZvckZyYW1lKGZyYW1lKSkgeworICAgIGlm IChhdXRvKiBwbHVnaW5WaWV3ID0gZm9jdXNlZFBsdWdpblZpZXdGb3JGcmFtZShmcmFtZSkpIHsK ICAgICAgICAgU3RyaW5nIHNlbGVjdGlvbiA9IHBsdWdpblZpZXctPmdldFNlbGVjdGlvblN0cmlu ZygpOwotICAgICAgICBpZiAoIXNlbGVjdGlvbi5pc051bGwoKSkgewotICAgICAgICAgICAgc3Ry aW5nVmFsdWUgPSBzZWxlY3Rpb247Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAg ICAgICAgaWYgKCFzZWxlY3Rpb24uaXNOdWxsKCkpCisgICAgICAgICAgICByZXR1cm4gY29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShzZWxlY3Rpb24pKTsKICAgICB9CiAKICAgICBpZiAoZnJhbWUu c2VsZWN0aW9uKCkuaXNOb25lKCkpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGNv bXBsZXRpb25IYW5kbGVyKHsgfSk7CiAKLSAgICBzdHJpbmdWYWx1ZSA9IGZyYW1lLmVkaXRvcigp LnN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQoKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihm cmFtZS5lZGl0b3IoKS5zdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKCkpOwogfQogCi12b2lk IFdlYlBhZ2U6OmdldERhdGFTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKGNvbnN0IFN0cmluZyBwYXN0 ZWJvYXJkVHlwZSwgU2hhcmVkTWVtb3J5OjpIYW5kbGUmIGhhbmRsZSwgdWludDY0X3QmIHNpemUp Cit2b2lkIFdlYlBhZ2U6OmdldERhdGFTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKGNvbnN0IFN0cmlu ZyBwYXN0ZWJvYXJkVHlwZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTaGFyZWRNZW1vcnk6Okhh bmRsZSYmLCB1aW50NjRfdCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgRnJhbWUmIGZy YW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAg ICBhdXRvJiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZy YW1lKCk7CiAgICAgaWYgKGZyYW1lLnNlbGVjdGlvbigpLmlzTm9uZSgpKQotICAgICAgICByZXR1 cm47CisgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcih7IH0sIDApOwogCiAgICAgUmVm UHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gZnJhbWUuZWRpdG9yKCkuZGF0YVNlbGVjdGlvbkZv clBhc3RlYm9hcmQocGFzdGVib2FyZFR5cGUpOwotICAgIGlmICghYnVmZmVyKSB7Ci0gICAgICAg IHNpemUgPSAwOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIHNpemUgPSBidWZmZXItPnNp emUoKTsKKyAgICBpZiAoIWJ1ZmZlcikKKyAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVy KHsgfSwgMCk7CisgICAgdWludDY0X3Qgc2l6ZSA9IGJ1ZmZlci0+c2l6ZSgpOwogICAgIFJlZlB0 cjxTaGFyZWRNZW1vcnk+IHNoYXJlZE1lbW9yeUJ1ZmZlciA9IFNoYXJlZE1lbW9yeTo6YWxsb2Nh dGUoc2l6ZSk7CiAgICAgbWVtY3B5KHNoYXJlZE1lbW9yeUJ1ZmZlci0+ZGF0YSgpLCBidWZmZXIt PmRhdGEoKSwgc2l6ZSk7CisgICAgU2hhcmVkTWVtb3J5OjpIYW5kbGUgaGFuZGxlOwogICAgIHNo YXJlZE1lbW9yeUJ1ZmZlci0+Y3JlYXRlSGFuZGxlKGhhbmRsZSwgU2hhcmVkTWVtb3J5OjpQcm90 ZWN0aW9uOjpSZWFkT25seSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShoYW5kbGUp LCBzaXplKTsKIH0KIAogV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdCogV2ViUGFnZTo6YWNj ZXNzaWJpbGl0eVJlbW90ZU9iamVjdCgpCkBAIC01ODksMzkgKzU4NCwzOSBAQCBib29sIFdlYlBh Z2U6OnBsYXRmb3JtQ2FuSGFuZGxlUmVxdWVzdChjCiAgICAgcmV0dXJuIHJlcXVlc3QudXJsKCku cHJvdG9jb2xJcygiYXBwbGV3ZWJkYXRhIik7CiB9CiAKLXZvaWQgV2ViUGFnZTo6c2hvdWxkRGVs YXlXaW5kb3dPcmRlcmluZ0V2ZW50KGNvbnN0IFdlYktpdDo6V2ViTW91c2VFdmVudCYgZXZlbnQs IGJvb2wmIHJlc3VsdCkKK3ZvaWQgV2ViUGFnZTo6c2hvdWxkRGVsYXlXaW5kb3dPcmRlcmluZ0V2 ZW50KGNvbnN0IFdlYktpdDo6V2ViTW91c2VFdmVudCYgZXZlbnQsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgRnJhbWUmIGZyYW1lID0g bV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBhdXRv JiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7 CiAKKyAgICBib29sIHJlc3VsdCA9IGZhbHNlOwogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAg ICAgSGl0VGVzdFJlc3VsdCBoaXRSZXN1bHQgPSBmcmFtZS5ldmVudEhhbmRsZXIoKS5oaXRUZXN0 UmVzdWx0QXRQb2ludChmcmFtZS52aWV3KCktPndpbmRvd1RvQ29udGVudHMoZXZlbnQucG9zaXRp b24oKSksIEhpdFRlc3RSZXF1ZXN0OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBY3RpdmUp OwogICAgIGlmIChoaXRSZXN1bHQuaXNTZWxlY3RlZCgpKQogICAgICAgICByZXN1bHQgPSBmcmFt ZS5ldmVudEhhbmRsZXIoKS5ldmVudE1heVN0YXJ0RHJhZyhwbGF0Zm9ybShldmVudCkpOwotICAg IGVsc2UKICNlbmRpZgotICAgICAgICByZXN1bHQgPSBmYWxzZTsKKyAgICBjb21wbGV0aW9uSGFu ZGxlcihyZXN1bHQpOwogfQogCi12b2lkIFdlYlBhZ2U6OmFjY2VwdHNGaXJzdE1vdXNlKGludCBl dmVudE51bWJlciwgY29uc3QgV2ViS2l0OjpXZWJNb3VzZUV2ZW50JiBldmVudCwgYm9vbCYgcmVz dWx0KQordm9pZCBXZWJQYWdlOjphY2NlcHRzRmlyc3RNb3VzZShpbnQgZXZlbnROdW1iZXIsIGNv bnN0IFdlYktpdDo6V2ViTW91c2VFdmVudCYgZXZlbnQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Ym9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgcmVzdWx0ID0gZmFsc2U7Ci0KICAg ICBpZiAoV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+ aW5TZW5kU3luYygpKSB7CiAgICAgICAgIC8vIEluIGNhc2Ugd2UncmUgYWxyZWFkeSBpbnNpZGUg YSBzZW5kU3luYyBtZXNzYWdlLCBpdCdzIHBvc3NpYmxlIHRoYXQgdGhlIHBhZ2UgaXMgaW4gYQog ICAgICAgICAvLyB0cmFuc2l0aW9uYXJ5IHN0YXRlLCBzbyBhbnkgaGl0LXRlc3RpbmcgY291bGQg Y2F1c2UgY3Jhc2hlcyAgc28gd2UganVzdCByZXR1cm4gZWFybHkgaW4gdGhhdCBjYXNlLgotICAg ICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSk7CiAg ICAgfQogCi0gICAgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1 c2VkT3JNYWluRnJhbWUoKTsKKyAgICBhdXRvJiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9s bGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7CiAKICAgICBIaXRUZXN0UmVzdWx0IGhpdFJlc3Vs dCA9IGZyYW1lLmV2ZW50SGFuZGxlcigpLmhpdFRlc3RSZXN1bHRBdFBvaW50KGZyYW1lLnZpZXco KS0+d2luZG93VG9Db250ZW50cyhldmVudC5wb3NpdGlvbigpKSwgSGl0VGVzdFJlcXVlc3Q6OlJl YWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6OkFjdGl2ZSk7CiAgICAgZnJhbWUuZXZlbnRIYW5kbGVy KCkuc2V0QWN0aXZhdGlvbkV2ZW50TnVtYmVyKGV2ZW50TnVtYmVyKTsKKyAgICBib29sIHJlc3Vs dCA9IGZhbHNlOwogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgaWYgKGhpdFJlc3VsdC5p c1NlbGVjdGVkKCkpCiAgICAgICAgIHJlc3VsdCA9IGZyYW1lLmV2ZW50SGFuZGxlcigpLmV2ZW50 TWF5U3RhcnREcmFnKHBsYXRmb3JtKGV2ZW50KSk7CiAgICAgZWxzZQogI2VuZGlmCiAgICAgICAg IHJlc3VsdCA9ICEhaGl0UmVzdWx0LnNjcm9sbGJhcigpOworICAgIGNvbXBsZXRpb25IYW5kbGVy KHJlc3VsdCk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6c2V0VG9wT3ZlcmhhbmdJbWFnZShXZWJJbWFn ZSogaW1hZ2UpCg==