177778 2017-10-02 13:57:41 -0700 PasteImage tests are failing on debug builds 2017-10-02 15:01:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa commit-queue jlewis3 ryanhaddad webkit-bug-importer wenson_hsieh oldest_to_newest 1355478 0 rniwa 2017-10-02 13:57:41 -0700 PasteImage tests are failing on debug builds 1355481 1 322433 rniwa 2017-10-02 13:59:56 -0700 Created attachment 322433 Fixes the bug 1355486 2 322433 wenson_hsieh 2017-10-02 14:08:17 -0700 Comment on attachment 322433 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=322433&action=review > Source/WebCore/ChangeLog:8 > + After r222702, we're not supposed to be adding "Files" as types. Removed the code to do this I think it'd be more accurate to say "...PlatformPasteboard is no longer responsible for adding "Files" as a type..." here, since "Files" is still added as a type, it's just that DataTransfer takes care of it now. > Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:1036 > +#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300 I think we'll also need to define out a couple of static helpers above that will no longer be used on iOS 11.0, otherwise the build will complain about unused code. I can take care of this in a separate change (as test gardening). 1355505 3 wenson_hsieh 2017-10-02 14:36:26 -0700 (In reply to Wenson Hsieh from comment #2) > Comment on attachment 322433 [details] > Fixes the bug > > View in context: > https://bugs.webkit.org/attachment.cgi?id=322433&action=review > > > Source/WebCore/ChangeLog:8 > > + After r222702, we're not supposed to be adding "Files" as types. Removed the code to do this > > I think it'd be more accurate to say "...PlatformPasteboard is no longer > responsible for adding "Files" as a type..." here, since "Files" is still > added as a type, it's just that DataTransfer takes care of it now. > > > Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm:1036 > > +#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300 > > I think we'll also need to define out a couple of static helpers above that > will no longer be used on iOS 11.0, otherwise the build will complain about > unused code. I can take care of this in a separate change (as test > gardening). Landed in https://trac.webkit.org/changeset/222743/webkit. 1355510 4 322442 rniwa 2017-10-02 14:39:57 -0700 Created attachment 322442 Patch for landing 1355519 5 322442 rniwa 2017-10-02 14:44:08 -0700 Comment on attachment 322442 Patch for landing Clearing flags on attachment: 322442 Committed r222746: <http://trac.webkit.org/changeset/222746> 1355520 6 rniwa 2017-10-02 14:44:10 -0700 All reviewed patches have been landed. Closing bug. 1355523 7 webkit-bug-importer 2017-10-02 14:45:35 -0700 <rdar://problem/34777058> 322433 2017-10-02 13:59:56 -0700 2017-10-02 14:39:55 -0700 Fixes the bug bug-177778-20171002135956.patch text/plain 5022 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWVmZDMyYjk5NDBkMDhl ODBiYWI1NTdhM2EwZGUyNDVkYWEzNzc3MC4uNDY5Zjg3ZGVhNThiOGM5MTM5YzFiZmVlM2QwMTM2 ZWY5ZjBkZmM5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTEwLTAyICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3RlSW1hZ2UgdGVzdHMg YXJlIGZhaWxpbmcgb24gZGVidWcgYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc3NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZnRlciByMjIyNzAyLCB3ZSdyZSBub3Qgc3VwcG9zZWQgdG8g YmUgYWRkaW5nICJGaWxlcyIgYXMgdHlwZXMuIFJlbW92ZWQgdGhlIGNvZGUgdG8gZG8gdGhpcwor ICAgICAgICBmcm9tIFBsYXRmb3JtUGFzdGVib2FyZElPUy5tbSBhbmQgUGxhdGZvcm1QYXN0ZWJv YXJkTWFjLm1tLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElP Uy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNhZmVUeXBlRm9yRE9NVG9SZWFkQW5kV3JpdGVGb3JQ bGF0Zm9ybVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QbGF0Zm9ybVBhc3RlYm9hcmRN YWMubW06CisgICAgICAgIChXZWJDb3JlOjpzYWZlVHlwZUZvckRPTVRvUmVhZEFuZFdyaXRlRm9y UGxhdGZvcm1UeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6dHlw ZXNTYWZlRm9yRE9NVG9SZWFkQW5kV3JpdGUgY29uc3QpOgorCiAyMDE3LTEwLTAyICBPbGl2aWVy IEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CiAKICAgICAgICAgW1dQRV0gUmVt b3ZlIEdudVRMUyBkZXBlbmRlbmN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQppbmRleCAyYjhhNDc3MjljOGFhZWNhZGFkYzY5 Y2I3YTMxNWQ3MzVlNjcwZjc2Li4zZWJlOGQwZDg4OWE2ZmZhYWU1MmMwZmU5Y2Y2NmNiY2ExNGU3 NjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0 ZWJvYXJkSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVBh c3RlYm9hcmRJT1MubW0KQEAgLTM0MCw5ICszNDAsNiBAQCBzdGF0aWMgY29uc3QgY2hhciAqc2Fm ZVR5cGVGb3JET01Ub1JlYWRBbmRXcml0ZUZvclBsYXRmb3JtVHlwZShjb25zdCBTdHJpbmcmIHBs YQogICAgIGlmIChVVFR5cGVDb25mb3Jtc1RvKGNmVHlwZS5nZXQoKSwga1VUVHlwZVVSTCkpCiAg ICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInRleHQvdXJpLWxpc3QiKTsKIAotICAgIGlmIChQ YXN0ZWJvYXJkOjpzaG91bGRUcmVhdENvY29hVHlwZUFzRmlsZShwbGF0Zm9ybVR5cGUpKQotICAg ICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJGaWxlcyIpOwotCiAgICAgcmV0dXJuIG51bGxwdHI7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVBh c3RlYm9hcmRNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1QYXN0 ZWJvYXJkTWFjLm1tCmluZGV4IGZkNTAwYTM4NDFiNTlmNTBkM2E1ZjRjZDcwZTRkNTg5YWFlYjdm YjcuLjc4NWEwMmUwNTM5ZTJjM2YwMzU2YTZkMTgwNjZkYWU5YTE3MzJkNDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVBhc3RlYm9hcmRNYWMubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3JtUGFzdGVib2FyZE1hYy5tbQpA QCAtMTA0LDkgKzEwNCw2IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBzYWZlVHlwZUZvckRPTVRvUmVh ZEFuZFdyaXRlRm9yUGxhdGZvcm1UeXBlKGNvbnN0IFN0cmluZyYgcGxhCiAgICAgaWYgKHBsYXRm b3JtVHlwZSA9PSBTdHJpbmcoTlNIVE1MUGJvYXJkVHlwZSkpCiAgICAgICAgIHJldHVybiBBU0NJ SUxpdGVyYWwoInRleHQvaHRtbCIpOwogCi0gICAgaWYgKHBsYXRmb3JtVHlwZSA9PSBTdHJpbmco TlNGaWxlbmFtZXNQYm9hcmRUeXBlKSB8fCBwbGF0Zm9ybVR5cGUgPT0gU3RyaW5nKE5TRmlsZXNQ cm9taXNlUGJvYXJkVHlwZSkgfHwgUGFzdGVib2FyZDo6c2hvdWxkVHJlYXRDb2NvYVR5cGVBc0Zp bGUocGxhdGZvcm1UeXBlKSkKLSAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKTsK LQogICAgIHJldHVybiBudWxscHRyOwogfQogCkBAIC0xMjYsMTIgKzEyMyw4IEBAIFZlY3RvcjxT dHJpbmc+IFBsYXRmb3JtUGFzdGVib2FyZDo6dHlwZXNTYWZlRm9yRE9NVG9SZWFkQW5kV3JpdGUo KSBjb25zdAogCiAgICAgICAgIGlmIChQYXN0ZWJvYXJkOjppc1NhZmVUeXBlRm9yRE9NVG9SZWFk QW5kV3JpdGUodHlwZSkpCiAgICAgICAgICAgICBkb21QYXN0ZWJvYXJkVHlwZXMuYWRkKHR5cGUp OwotICAgICAgICBlbHNlIGlmIChhdXRvKiBkb21UeXBlID0gc2FmZVR5cGVGb3JET01Ub1JlYWRB bmRXcml0ZUZvclBsYXRmb3JtVHlwZSh0eXBlKSkgewotICAgICAgICAgICAgYXV0byBjb2VyY2Vk VHlwZSA9IFN0cmluZzo6ZnJvbVVURjgoZG9tVHlwZSk7Ci0gICAgICAgICAgICBpZiAoY29lcmNl ZFR5cGUgPT0gIkZpbGVzIiAmJiAhbnVtYmVyT2ZGaWxlcygpKQotICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotICAgICAgICAgICAgZG9tUGFzdGVib2FyZFR5cGVzLmFkZChXVEZNb3ZlKGNvZXJj ZWRUeXBlKSk7Ci0gICAgICAgIH0KKyAgICAgICAgZWxzZSBpZiAoYXV0byogZG9tVHlwZSA9IHNh ZmVUeXBlRm9yRE9NVG9SZWFkQW5kV3JpdGVGb3JQbGF0Zm9ybVR5cGUodHlwZSkpCisgICAgICAg ICAgICBkb21QYXN0ZWJvYXJkVHlwZXMuYWRkKFN0cmluZzo6ZnJvbVVURjgoZG9tVHlwZSkpOwog ICAgIH0KIAogICAgIFZlY3RvcjxTdHJpbmc+IHJlc3VsdDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3ZGJhNDVlYzFjZjg5NmVjMDI0NjY4MTZk MmJjNmFlNTQ4NGI1ZWY5Li45ZWY3NTE5MjgyNDRlNmNjYzI5MTVmZmExMWVhOGEwMzBjOGU1ZDRi IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTctMTAtMDIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgUGFzdGVJbWFnZSB0ZXN0cyBhcmUgZmFpbGluZyBvbiBkZWJ1ZyBidWlsZHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Nzc3OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNraXAgRGF0 YUludGVyYWN0aW9uVGVzdHMuRXh0ZXJuYWxTb3VyY2VEYXRhVHJhbnNmZXJJdGVtR2V0UGxhaW5U ZXh0RmlsZUFzRW50cnkgb24gaU9TIDExLjAKKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVz dHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tOgorCiAyMDE3LTEwLTAyICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtHVEtdIENy YXNoIGluIHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGFfZmluaXNoKCkKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KaW5k ZXggMjAzNWNjMThmZTE3MWJlNTAxODBiZmQ3OWJkODliNmFhMjcyNjc5OC4uYzFhNTZjMDg1OTQz MzE4MDk1MmFjMDRhN2E0ZjQ2MjcyZDY2YjkyNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KQEAgLTEwMzMsNiArMTAz Myw4IEBAIFRFU1QoRGF0YUludGVyYWN0aW9uVGVzdHMsIEV4dGVybmFsU291cmNlRGF0YVRyYW5z ZmVySXRlbUdldEZvbGRlckFzRW50cnkpCiAgICAgRVhQRUNUX1dLX1NUUkVRKFtleHBlY3RlZE91 dHB1dCBjb21wb25lbnRzSm9pbmVkQnlTdHJpbmc6QCJcbiJdLCBbd2ViVmlldyBzdHJpbmdCeUV2 YWx1YXRpbmdKYXZhU2NyaXB0OkAib3V0cHV0LnZhbHVlIl0pOwogfQogCisjaWYgX19JUEhPTkVf T1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMzAwCisKIFRFU1QoRGF0YUludGVyYWN0aW9u VGVzdHMsIEV4dGVybmFsU291cmNlRGF0YVRyYW5zZmVySXRlbUdldFBsYWluVGV4dEZpbGVBc0Vu dHJ5KQogewogICAgIE5TQXJyYXk8TlNTdHJpbmcgKj4gKmV4cGVjdGVkT3V0cHV0ID0gQFsKQEAg LTEwNjMsNiArMTA2NSw4IEBAIFRFU1QoRGF0YUludGVyYWN0aW9uVGVzdHMsIEV4dGVybmFsU291 cmNlRGF0YVRyYW5zZmVySXRlbUdldFBsYWluVGV4dEZpbGVBc0VudHJ5CiAgICAgRVhQRUNUX1dL X1NUUkVRKFtleHBlY3RlZE91dHB1dCBjb21wb25lbnRzSm9pbmVkQnlTdHJpbmc6QCJcbiJdLCBb d2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAib3V0cHV0LnZhbHVlIl0pOwog fQogCisjZW5kaWYKKwogVEVTVChEYXRhSW50ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VP dmVycmlkZURyb3BJbnNlcnRVUkwpCiB7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rl c3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUw MCldKTsK 322442 2017-10-02 14:39:57 -0700 2017-10-02 14:44:08 -0700 Patch for landing bug-177778-20171002143956.patch text/plain 3289 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWVmZDMyYjk5NDBkMDhl ODBiYWI1NTdhM2EwZGUyNDVkYWEzNzc3MC4uYjRiODgzZjEyY2IxODQwYTg1NDgyYWM2MjA3MDll YTJhZTMxMDRmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTEwLTAyICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFBhc3RlSW1hZ2UgdGVzdHMg YXJlIGZhaWxpbmcgb24gZGVidWcgYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc3NzgKKworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24g SHNpZWguCisKKyAgICAgICAgQWZ0ZXIgcjIyMjcwMiwgUGxhdGZvcm1QYXN0ZWJvYXJkIGlzIG5v IGxvbmdlciByZXNwb25zaWJsZSBmb3IgYWRkaW5nICJGaWxlcyIgYXMgYSB0eXBlIgorICAgICAg ICBhcyBEYXRhVHJhbnNmZXIgdGFrZXMgY2FyZSBvZiBpdCBub3cuIFJlbW92ZWQgdGhlIGNvZGUg dG8gZG8gdGhpcyBmcm9tIFBsYXRmb3JtUGFzdGVib2FyZElPUy5tbQorICAgICAgICBhbmQgUGxh dGZvcm1QYXN0ZWJvYXJkTWFjLm1tIHNvIHRoYXQgd2UgZG9uJ3QgZmFpbCBhc3NlcnRpb25zIGlu IGRlYnVnIGJ1aWxkcy4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9QbGF0Zm9ybVBhc3RlYm9h cmRJT1MubW06CisgICAgICAgIChXZWJDb3JlOjpzYWZlVHlwZUZvckRPTVRvUmVhZEFuZFdyaXRl Rm9yUGxhdGZvcm1UeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGxhdGZvcm1QYXN0ZWJv YXJkTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6c2FmZVR5cGVGb3JET01Ub1JlYWRBbmRXcml0 ZUZvclBsYXRmb3JtVHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVBhc3RlYm9hcmQ6 OnR5cGVzU2FmZUZvckRPTVRvUmVhZEFuZFdyaXRlIGNvbnN0KToKKwogMjAxNy0xMC0wMiAgT2xp dmllciBCbGluICA8b2xpdmllci5ibGluQHNvZnRhdGhvbWUuY29tPgogCiAgICAgICAgIFtXUEVd IFJlbW92ZSBHbnVUTFMgZGVwZW5kZW5jeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9QbGF0Zm9ybVBhc3RlYm9hcmRJT1MubW0KaW5kZXggMmI4YTQ3NzI5YzhhYWVjYWRh ZGM2OWNiN2EzMTVkNzM1ZTY3MGY3Ni4uM2ViZThkMGQ4ODlhNmZmYWFlNTJjMGZlOWNmNjZjYmNh MTRlNzYzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3Jt UGFzdGVib2FyZElPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZv cm1QYXN0ZWJvYXJkSU9TLm1tCkBAIC0zNDAsOSArMzQwLDYgQEAgc3RhdGljIGNvbnN0IGNoYXIg KnNhZmVUeXBlRm9yRE9NVG9SZWFkQW5kV3JpdGVGb3JQbGF0Zm9ybVR5cGUoY29uc3QgU3RyaW5n JiBwbGEKICAgICBpZiAoVVRUeXBlQ29uZm9ybXNUbyhjZlR5cGUuZ2V0KCksIGtVVFR5cGVVUkwp KQogICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJ0ZXh0L3VyaS1saXN0Iik7CiAKLSAgICBp ZiAoUGFzdGVib2FyZDo6c2hvdWxkVHJlYXRDb2NvYVR5cGVBc0ZpbGUocGxhdGZvcm1UeXBlKSkK LSAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiRmlsZXMiKTsKLQogICAgIHJldHVybiBudWxs cHRyOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZv cm1QYXN0ZWJvYXJkTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3Jt UGFzdGVib2FyZE1hYy5tbQppbmRleCBmZDUwMGEzODQxYjU5ZjUwZDNhNWY0Y2Q3MGU0ZDU4OWFh ZWI3ZmI3Li43ODVhMDJlMDUzOWUyYzNmMDM1NmE2ZDE4MDY2ZGFlOWExNzMyZDQxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1QYXN0ZWJvYXJkTWFjLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVBhc3RlYm9hcmRNYWMu bW0KQEAgLTEwNCw5ICsxMDQsNiBAQCBzdGF0aWMgY29uc3QgY2hhciogc2FmZVR5cGVGb3JET01U b1JlYWRBbmRXcml0ZUZvclBsYXRmb3JtVHlwZShjb25zdCBTdHJpbmcmIHBsYQogICAgIGlmIChw bGF0Zm9ybVR5cGUgPT0gU3RyaW5nKE5TSFRNTFBib2FyZFR5cGUpKQogICAgICAgICByZXR1cm4g QVNDSUlMaXRlcmFsKCJ0ZXh0L2h0bWwiKTsKIAotICAgIGlmIChwbGF0Zm9ybVR5cGUgPT0gU3Ry aW5nKE5TRmlsZW5hbWVzUGJvYXJkVHlwZSkgfHwgcGxhdGZvcm1UeXBlID09IFN0cmluZyhOU0Zp bGVzUHJvbWlzZVBib2FyZFR5cGUpIHx8IFBhc3RlYm9hcmQ6OnNob3VsZFRyZWF0Q29jb2FUeXBl QXNGaWxlKHBsYXRmb3JtVHlwZSkpCi0gICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIkZpbGVz Iik7Ci0KICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIApAQCAtMTI2LDEyICsxMjMsOCBAQCBWZWN0 b3I8U3RyaW5nPiBQbGF0Zm9ybVBhc3RlYm9hcmQ6OnR5cGVzU2FmZUZvckRPTVRvUmVhZEFuZFdy aXRlKCkgY29uc3QKIAogICAgICAgICBpZiAoUGFzdGVib2FyZDo6aXNTYWZlVHlwZUZvckRPTVRv UmVhZEFuZFdyaXRlKHR5cGUpKQogICAgICAgICAgICAgZG9tUGFzdGVib2FyZFR5cGVzLmFkZCh0 eXBlKTsKLSAgICAgICAgZWxzZSBpZiAoYXV0byogZG9tVHlwZSA9IHNhZmVUeXBlRm9yRE9NVG9S ZWFkQW5kV3JpdGVGb3JQbGF0Zm9ybVR5cGUodHlwZSkpIHsKLSAgICAgICAgICAgIGF1dG8gY29l cmNlZFR5cGUgPSBTdHJpbmc6OmZyb21VVEY4KGRvbVR5cGUpOwotICAgICAgICAgICAgaWYgKGNv ZXJjZWRUeXBlID09ICJGaWxlcyIgJiYgIW51bWJlck9mRmlsZXMoKSkKLSAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgIGRvbVBhc3RlYm9hcmRUeXBlcy5hZGQoV1RGTW92ZShj b2VyY2VkVHlwZSkpOwotICAgICAgICB9CisgICAgICAgIGVsc2UgaWYgKGF1dG8qIGRvbVR5cGUg PSBzYWZlVHlwZUZvckRPTVRvUmVhZEFuZFdyaXRlRm9yUGxhdGZvcm1UeXBlKHR5cGUpKQorICAg ICAgICAgICAgZG9tUGFzdGVib2FyZFR5cGVzLmFkZChTdHJpbmc6OmZyb21VVEY4KGRvbVR5cGUp KTsKICAgICB9CiAKICAgICBWZWN0b3I8U3RyaW5nPiByZXN1bHQ7Cg==