206960 2020-01-29 13:16:27 -0800 [PlayStation] Fix MIMETypeRegistry 2020-01-29 15:10:14 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=206478 InRadar P2 Normal --- 1 ross.kirsling ross.kirsling aboxhall apinheiro cfleizach commit-queue dmazzoni don.olmstead ews-watchlist jcraig jdiggs samuel_white stephan.szabo webkit-bug-importer oldest_to_newest 1612628 0 ross.kirsling 2020-01-29 13:16:27 -0800 [PlayStation] Fix WebCore build 1612629 1 389176 ross.kirsling 2020-01-29 13:17:45 -0800 Created attachment 389176 Patch 1612644 2 389176 stephan.szabo 2020-01-29 13:37:01 -0800 Comment on attachment 389176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389176&action=review > Source/WebCore/platform/playstation/MIMETypeRegistryPlayStation.cpp:31 > +const std::initializer_list<TypeExtensionPair> platformMediaTypes = { It's probably better to do this as a function with a static like static std::initializer_list<TypeExtensionPair> &platformMediaTypes() { static std::initializer_list<TypeExtensionPair> list = { /* ... */ }; return list; } 1612665 3 389183 ross.kirsling 2020-01-29 14:09:25 -0800 Created attachment 389183 Patch 1612719 4 389183 commit-queue 2020-01-29 15:09:56 -0800 Comment on attachment 389183 Patch Clearing flags on attachment: 389183 Committed r255391: <https://trac.webkit.org/changeset/255391> 1612720 5 commit-queue 2020-01-29 15:09:58 -0800 All reviewed patches have been landed. Closing bug. 1612721 6 webkit-bug-importer 2020-01-29 15:10:14 -0800 <rdar://problem/59008687> 389176 2020-01-29 13:17:45 -0800 2020-01-29 14:09:23 -0800 Patch bug-206960-20200129131744.patch text/plain 4709 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2EwMDFjMmFmNDMwYmFm NWUwNzVhYTI5YWJmMzBlNzA1MTA5N2M3My4uMWIwY2RmNzFkOWZlZWU5ZTg1OTljNDBiZGE2N2Ji MjA4ZTgwOTMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAxLTI5ICBSb3Nz IEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KKworICAgICAgICBbUGxheVN0YXRp b25dIEZpeCBXZWJDb3JlIGJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDY5NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFj ZS5oOgorICAgICAgICBBZGQgbWlzc2luZyBFTkFCTEUgZ3VhcmQuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9wbGF5c3RhdGlvbi9NSU1FVHlwZVJlZ2lzdHJ5UGxheVN0YXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24pOgor ICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0UHJlZmVycmVkRXh0ZW5zaW9u Rm9yTUlNRVR5cGUpOgorICAgICAgICBBZGRyZXNzIHJlZGVjbGFyYXRpb25zIGFuZCBmaXggdGhl IGtleS92YWx1ZSBvcmRlciBvZiB0aGUgcGxhdGZvcm0tc3BlY2lmaWMgTUlNRSB0eXBlIG1hcC4K KwogMjAyMC0wMS0yOCAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK ICAgICAgICAgUHJvcGVybHkgY2xlYXIgcGVuZGluZyBjaGFuZ2VzIGR1cmluZyBBWElzb2xhdGVk VHJlZSByZW1vdmFsIGFuZCBhcHBseVBlbmRpbmdDaGFuZ2VzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmggYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aAppbmRleCA0NGQyOTVkN2M5YzQzNThlOTViNWIzYWVlMzhlOGNhNjMyMjU3OGI5Li5jN2FiNmM0 YmRiY2RlZThmMTg1NTFmMjk3ZWY3MDU5YzhhMTJlMTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2UuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3RJbnRlcmZhY2Uu aApAQCAtMTE1MiwxMSArMTE1MiwxMyBAQCBpbmxpbmUgdm9pZCBBWENvcmVPYmplY3Q6OmRldGFj aChBY2Nlc3NpYmlsaXR5RGV0YWNobWVudFR5cGUgZGV0YWNobWVudFR5cGUpCiAgICAgc2V0T2Jq ZWN0SUQoSW52YWxpZEFYSUQpOwogfQogCisjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFkpCiBpbmxp bmUgdm9pZCBBWENvcmVPYmplY3Q6OmRldGFjaFdyYXBwZXIoQWNjZXNzaWJpbGl0eURldGFjaG1l bnRUeXBlIGRldGFjaG1lbnRUeXBlKQogewogICAgIGRldGFjaFBsYXRmb3JtV3JhcHBlcihkZXRh Y2htZW50VHlwZSk7CiAgICAgbV93cmFwcGVyID0gbnVsbHB0cjsKIH0KKyNlbmRpZgogCiBuYW1l c3BhY2UgQWNjZXNzaWJpbGl0eSB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3BsYXlzdGF0aW9uL01JTUVUeXBlUmVnaXN0cnlQbGF5U3RhdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9wbGF5c3RhdGlvbi9NSU1FVHlwZVJlZ2lzdHJ5UGxheVN0YXRpb24u Y3BwCmluZGV4IDEzMmM0M2U2MjRlYWQ0M2I2YjdlYjY1YzM4MmZlYzVhNTk3ODA5MGQuLmVjYmY0 NDFiNjEyOTI5MDJiMmViYTkzN2MzNzI0ZGE5ZDU5YTFmOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3BsYXlzdGF0aW9uL01JTUVUeXBlUmVnaXN0cnlQbGF5U3RhdGlvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcGxheXN0YXRpb24vTUlNRVR5cGVSZWdp c3RyeVBsYXlTdGF0aW9uLmNwcApAQCAtMjgsMzkgKzI4LDM0IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotc3RydWN0IFR5cGVFeHRlbnNpb25QYWlyIHsKLSAgICBBU0NJSUxpdGVyYWwgdHlw ZTsKLSAgICBBU0NJSUxpdGVyYWwgZXh0ZW5zaW9uOwotfTsKLQotY29uc3QgVHlwZUV4dGVuc2lv blBhaXIgY29tbW9uTWVkaWFUeXBlc1tdID0gewotICAgIHsgImJtcCJfcywgImltYWdlL2JtcCJf cyB9LAotICAgIHsgImNzcyJfcywgInRleHQvY3NzIl9zIH0sCi0gICAgeyAiZ2lmIl9zLCAiaW1h Z2UvZ2lmIl9zIH0sCi0gICAgeyAiaHRtbCJfcywgInRleHQvaHRtbCJfcyB9LAotICAgIHsgImh0 bSJfcywgInRleHQvaHRtbCJfcyB9LAotICAgIHsgImljbyJfcywgImltYWdlL3gtaWNvbiJfcyB9 LAotICAgIHsgImpwZWciX3MsICJpbWFnZS9qcGVnIl9zIH0sCi0gICAgeyAianBnIl9zLCAiaW1h Z2UvanBlZyJfcyB9LAotICAgIHsgImpzIl9zLCAiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0Il9z IH0sCi0gICAgeyAicGRmIl9zLCAiYXBwbGljYXRpb24vcGRmIl9zIH0sCi0gICAgeyAicG5nIl9z LCAiaW1hZ2UvcG5nIl9zIH0sCi0gICAgeyAicnNzIl9zLCAiYXBwbGljYXRpb24vcnNzK3htbCJf cyB9LAotICAgIHsgInN2ZyJfcywgImltYWdlL3N2Zyt4bWwiX3MgfSwKLSAgICB7ICJzd2YiX3Ms ICJhcHBsaWNhdGlvbi94LXNob2Nrd2F2ZS1mbGFzaCJfcyB9LAotICAgIHsgInRleHQiX3MsICJ0 ZXh0L3BsYWluIl9zIH0sCi0gICAgeyAidHh0Il9zLCAidGV4dC9wbGFpbiJfcyB9LAotICAgIHsg InhibSJfcywgImltYWdlL3gteGJpdG1hcCJfcyB9LAotICAgIHsgInhtbCJfcywgInRleHQveG1s Il9zIH0sCi0gICAgeyAieHNsIl9zLCAidGV4dC94c2wiX3MgfSwKLSAgICB7ICJ4aHRtbCJfcywg ImFwcGxpY2F0aW9uL3hodG1sK3htbCJfcyB9LAotICAgIHsgIndtbCJfcywgInRleHQvdm5kLndh cC53bWwiX3MgfSwKLSAgICB7ICJ3bWxjIl9zLCAiYXBwbGljYXRpb24vdm5kLndhcC53bWxjIl9z IH0sCitjb25zdCBzdGQ6OmluaXRpYWxpemVyX2xpc3Q8VHlwZUV4dGVuc2lvblBhaXI+IHBsYXRm b3JtTWVkaWFUeXBlcyA9IHsKKyAgICB7ICJpbWFnZS9ibXAiX3MsICJibXAiX3MgfSwKKyAgICB7 ICJ0ZXh0L2NzcyJfcywgImNzcyJfcyB9LAorICAgIHsgImltYWdlL2dpZiJfcywgImdpZiJfcyB9 LAorICAgIHsgInRleHQvaHRtbCJfcywgImh0bSJfcyB9LAorICAgIHsgInRleHQvaHRtbCJfcywg Imh0bWwiX3MgfSwKKyAgICB7ICJpbWFnZS94LWljb24iX3MsICJpY28iX3MgfSwKKyAgICB7ICJp bWFnZS9qcGVnIl9zLCAianBlZyJfcyB9LAorICAgIHsgImltYWdlL2pwZWciX3MsICJqcGciX3Mg fSwKKyAgICB7ICJhcHBsaWNhdGlvbi94LWphdmFzY3JpcHQiX3MsICJqcyJfcyB9LAorICAgIHsg ImFwcGxpY2F0aW9uL3BkZiJfcywgInBkZiJfcyB9LAorICAgIHsgImltYWdlL3BuZyJfcywgInBu ZyJfcyB9LAorICAgIHsgImFwcGxpY2F0aW9uL3Jzcyt4bWwiX3MsICJyc3MiX3MgfSwKKyAgICB7 ICJpbWFnZS9zdmcreG1sIl9zLCAic3ZnIl9zIH0sCisgICAgeyAiYXBwbGljYXRpb24veC1zaG9j a3dhdmUtZmxhc2giX3MsICJzd2YiX3MgfSwKKyAgICB7ICJ0ZXh0L3BsYWluIl9zLCAidGV4dCJf cyB9LAorICAgIHsgInRleHQvcGxhaW4iX3MsICJ0eHQiX3MgfSwKKyAgICB7ICJ0ZXh0L3ZuZC53 YXAud21sIl9zLCAid21sIl9zIH0sCisgICAgeyAiYXBwbGljYXRpb24vdm5kLndhcC53bWxjIl9z LCAid21sYyJfcyB9LAorICAgIHsgImltYWdlL3gteGJpdG1hcCJfcywgInhibSJfcyB9LAorICAg IHsgImFwcGxpY2F0aW9uL3hodG1sK3htbCJfcywgInhodG1sIl9zIH0sCisgICAgeyAidGV4dC94 bWwiX3MsICJ4bWwiX3MgfSwKKyAgICB7ICJ0ZXh0L3hzbCJfcywgInhzbCJfcyB9LAogfTsKIAog U3RyaW5nIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0 cmluZyYgZXh0ZW5zaW9uKQogewotICAgIGZvciAoYXV0byYgZW50cnkgOiBjb21tb25NZWRpYVR5 cGVzKSB7CisgICAgZm9yIChhdXRvJiBlbnRyeSA6IHBsYXRmb3JtTWVkaWFUeXBlcykgewogICAg ICAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShleHRlbnNpb24sIGVudHJ5LmV4dGVuc2lv bi5jaGFyYWN0ZXJzKCkpKQogICAgICAgICAgICAgcmV0dXJuIGVudHJ5LnR5cGU7CiAgICAgfQpA QCAtNzQsNyArNjksNyBAQCBib29sIE1JTUVUeXBlUmVnaXN0cnk6OmlzQXBwbGljYXRpb25QbHVn aW5NSU1FVHlwZShjb25zdCBTdHJpbmcmKQogCiBTdHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0 UHJlZmVycmVkRXh0ZW5zaW9uRm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKIHsK LSAgICBmb3IgKGF1dG8mIGVudHJ5IDogY29tbW9uTWVkaWFUeXBlcykgeworICAgIGZvciAoYXV0 byYgZW50cnkgOiBwbGF0Zm9ybU1lZGlhVHlwZXMpIHsKICAgICAgICAgaWYgKGVxdWFsSWdub3Jp bmdBU0NJSUNhc2UobWltZVR5cGUsIGVudHJ5LnR5cGUuY2hhcmFjdGVycygpKSkKICAgICAgICAg ICAgIHJldHVybiBlbnRyeS5leHRlbnNpb247CiAgICAgfQo= 389183 2020-01-29 14:09:25 -0800 2020-01-29 15:09:56 -0800 Patch bug-206960-20200129140924.patch text/plain 4131 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1MzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThmZjE0NDViZTc3NzZj MmNjNjU4NDI1MjkwNmI2OTY2Y2Q5MDBmYi4uYmRlYTZlMjRiOTMwMTM1ZGM1ZGYxZWUyOGM4YTg5 MGNiZmQ4OGMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAxLTI5ICBSb3Nz IEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KKworICAgICAgICBbUGxheVN0YXRp b25dIEZpeCBNSU1FVHlwZVJlZ2lzdHJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDY5NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL3BsYXlzdGF0aW9uL01JTUVUeXBlUmVnaXN0cnlQ bGF5U3RhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwbGF0Zm9ybU1lZGlhVHlwZXMpOgor ICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNp b24pOgorICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6Z2V0UHJlZmVycmVkRXh0 ZW5zaW9uRm9yTUlNRVR5cGUpOgorICAgICAgICBBZGRyZXNzIHJlZGVjbGFyYXRpb25zLCB0aGVu IGZpeCBrZXkvdmFsdWUgb3JkZXIgb2YgcGxhdGZvcm0tc3BlY2lmaWMgTUlNRSB0eXBlIG1hcCBh bmQgbWFrZSBpdCBhIHN0YXRpYyBsb2NhbC4KKwogMjAyMC0wMS0yOSAgUm9zcyBLaXJzbGluZyAg PHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCAhRU5BQkxFKEFD Q0VTU0lCSUxJVFkpIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3BsYXlzdGF0aW9uL01JTUVUeXBlUmVnaXN0cnlQbGF5U3RhdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9wbGF5c3RhdGlvbi9NSU1FVHlwZVJlZ2lzdHJ5UGxheVN0YXRpb24u Y3BwCmluZGV4IDEzMmM0M2U2MjRlYWQ0M2I2YjdlYjY1YzM4MmZlYzVhNTk3ODA5MGQuLmYzNzJj ZTMwMDVmNjdmODdlMzg0OTA1MWIxNjUzMmQzZDBhNDZhNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3BsYXlzdGF0aW9uL01JTUVUeXBlUmVnaXN0cnlQbGF5U3RhdGlvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcGxheXN0YXRpb24vTUlNRVR5cGVSZWdp c3RyeVBsYXlTdGF0aW9uLmNwcApAQCAtMjgsMzkgKzI4LDM4IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotc3RydWN0IFR5cGVFeHRlbnNpb25QYWlyIHsKLSAgICBBU0NJSUxpdGVyYWwgdHlw ZTsKLSAgICBBU0NJSUxpdGVyYWwgZXh0ZW5zaW9uOwotfTsKLQotY29uc3QgVHlwZUV4dGVuc2lv blBhaXIgY29tbW9uTWVkaWFUeXBlc1tdID0gewotICAgIHsgImJtcCJfcywgImltYWdlL2JtcCJf cyB9LAotICAgIHsgImNzcyJfcywgInRleHQvY3NzIl9zIH0sCi0gICAgeyAiZ2lmIl9zLCAiaW1h Z2UvZ2lmIl9zIH0sCi0gICAgeyAiaHRtbCJfcywgInRleHQvaHRtbCJfcyB9LAotICAgIHsgImh0 bSJfcywgInRleHQvaHRtbCJfcyB9LAotICAgIHsgImljbyJfcywgImltYWdlL3gtaWNvbiJfcyB9 LAotICAgIHsgImpwZWciX3MsICJpbWFnZS9qcGVnIl9zIH0sCi0gICAgeyAianBnIl9zLCAiaW1h Z2UvanBlZyJfcyB9LAotICAgIHsgImpzIl9zLCAiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0Il9z IH0sCi0gICAgeyAicGRmIl9zLCAiYXBwbGljYXRpb24vcGRmIl9zIH0sCi0gICAgeyAicG5nIl9z LCAiaW1hZ2UvcG5nIl9zIH0sCi0gICAgeyAicnNzIl9zLCAiYXBwbGljYXRpb24vcnNzK3htbCJf cyB9LAotICAgIHsgInN2ZyJfcywgImltYWdlL3N2Zyt4bWwiX3MgfSwKLSAgICB7ICJzd2YiX3Ms ICJhcHBsaWNhdGlvbi94LXNob2Nrd2F2ZS1mbGFzaCJfcyB9LAotICAgIHsgInRleHQiX3MsICJ0 ZXh0L3BsYWluIl9zIH0sCi0gICAgeyAidHh0Il9zLCAidGV4dC9wbGFpbiJfcyB9LAotICAgIHsg InhibSJfcywgImltYWdlL3gteGJpdG1hcCJfcyB9LAotICAgIHsgInhtbCJfcywgInRleHQveG1s Il9zIH0sCi0gICAgeyAieHNsIl9zLCAidGV4dC94c2wiX3MgfSwKLSAgICB7ICJ4aHRtbCJfcywg ImFwcGxpY2F0aW9uL3hodG1sK3htbCJfcyB9LAotICAgIHsgIndtbCJfcywgInRleHQvdm5kLndh cC53bWwiX3MgfSwKLSAgICB7ICJ3bWxjIl9zLCAiYXBwbGljYXRpb24vdm5kLndhcC53bWxjIl9z IH0sCi19Oworc3RhdGljIGNvbnN0IHN0ZDo6aW5pdGlhbGl6ZXJfbGlzdDxUeXBlRXh0ZW5zaW9u UGFpcj4mIHBsYXRmb3JtTWVkaWFUeXBlcygpCit7CisgICAgc3RhdGljIHN0ZDo6aW5pdGlhbGl6 ZXJfbGlzdDxUeXBlRXh0ZW5zaW9uUGFpcj4gcGxhdGZvcm1NZWRpYVR5cGVzID0geworICAgICAg ICB7ICJpbWFnZS9ibXAiX3MsICJibXAiX3MgfSwKKyAgICAgICAgeyAidGV4dC9jc3MiX3MsICJj c3MiX3MgfSwKKyAgICAgICAgeyAiaW1hZ2UvZ2lmIl9zLCAiZ2lmIl9zIH0sCisgICAgICAgIHsg InRleHQvaHRtbCJfcywgImh0bSJfcyB9LAorICAgICAgICB7ICJ0ZXh0L2h0bWwiX3MsICJodG1s Il9zIH0sCisgICAgICAgIHsgImltYWdlL3gtaWNvbiJfcywgImljbyJfcyB9LAorICAgICAgICB7 ICJpbWFnZS9qcGVnIl9zLCAianBlZyJfcyB9LAorICAgICAgICB7ICJpbWFnZS9qcGVnIl9zLCAi anBnIl9zIH0sCisgICAgICAgIHsgImFwcGxpY2F0aW9uL3gtamF2YXNjcmlwdCJfcywgImpzIl9z IH0sCisgICAgICAgIHsgImFwcGxpY2F0aW9uL3BkZiJfcywgInBkZiJfcyB9LAorICAgICAgICB7 ICJpbWFnZS9wbmciX3MsICJwbmciX3MgfSwKKyAgICAgICAgeyAiYXBwbGljYXRpb24vcnNzK3ht bCJfcywgInJzcyJfcyB9LAorICAgICAgICB7ICJpbWFnZS9zdmcreG1sIl9zLCAic3ZnIl9zIH0s CisgICAgICAgIHsgImFwcGxpY2F0aW9uL3gtc2hvY2t3YXZlLWZsYXNoIl9zLCAic3dmIl9zIH0s CisgICAgICAgIHsgInRleHQvcGxhaW4iX3MsICJ0ZXh0Il9zIH0sCisgICAgICAgIHsgInRleHQv cGxhaW4iX3MsICJ0eHQiX3MgfSwKKyAgICAgICAgeyAidGV4dC92bmQud2FwLndtbCJfcywgIndt bCJfcyB9LAorICAgICAgICB7ICJhcHBsaWNhdGlvbi92bmQud2FwLndtbGMiX3MsICJ3bWxjIl9z IH0sCisgICAgICAgIHsgImltYWdlL3gteGJpdG1hcCJfcywgInhibSJfcyB9LAorICAgICAgICB7 ICJhcHBsaWNhdGlvbi94aHRtbCt4bWwiX3MsICJ4aHRtbCJfcyB9LAorICAgICAgICB7ICJ0ZXh0 L3htbCJfcywgInhtbCJfcyB9LAorICAgICAgICB7ICJ0ZXh0L3hzbCJfcywgInhzbCJfcyB9LAor ICAgIH07CisgICAgcmV0dXJuIHBsYXRmb3JtTWVkaWFUeXBlczsKK30KIAogU3RyaW5nIE1JTUVU eXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5z aW9uKQogewotICAgIGZvciAoYXV0byYgZW50cnkgOiBjb21tb25NZWRpYVR5cGVzKSB7CisgICAg Zm9yIChhdXRvJiBlbnRyeSA6IHBsYXRmb3JtTWVkaWFUeXBlcygpKSB7CiAgICAgICAgIGlmIChl cXVhbElnbm9yaW5nQVNDSUlDYXNlKGV4dGVuc2lvbiwgZW50cnkuZXh0ZW5zaW9uLmNoYXJhY3Rl cnMoKSkpCiAgICAgICAgICAgICByZXR1cm4gZW50cnkudHlwZTsKICAgICB9CkBAIC03NCw3ICs3 Myw3IEBAIGJvb2wgTUlNRVR5cGVSZWdpc3RyeTo6aXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBl KGNvbnN0IFN0cmluZyYpCiAKIFN0cmluZyBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRQcmVmZXJyZWRF eHRlbnNpb25Gb3JNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQogewotICAgIGZvciAo YXV0byYgZW50cnkgOiBjb21tb25NZWRpYVR5cGVzKSB7CisgICAgZm9yIChhdXRvJiBlbnRyeSA6 IHBsYXRmb3JtTWVkaWFUeXBlcygpKSB7CiAgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQVNDSUlD YXNlKG1pbWVUeXBlLCBlbnRyeS50eXBlLmNoYXJhY3RlcnMoKSkpCiAgICAgICAgICAgICByZXR1 cm4gZW50cnkuZXh0ZW5zaW9uOwogICAgIH0K