164901 2016-11-17 17:27:54 -0800 [WebIDL] Add support for ByteString 2016-11-17 21:07:29 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam cdumez commit-queue oldest_to_newest 1252546 0 sam 2016-11-17 17:27:54 -0800 [WebIDL] Add support for ByteString 1252547 1 295114 sam 2016-11-17 17:32:30 -0800 Created attachment 295114 Patch 1252589 2 295114 darin 2016-11-17 20:12:48 -0800 Comment on attachment 295114 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295114&action=review > Source/WebCore/bindings/js/JSDOMConvert.h:734 > + if (configuration == StringConversionConfiguration::TreatNullAsEmptyString) { > + if (value.isNull()) Maybe && instead of nested if statements? > Source/WebCore/bindings/js/JSDOMConvert.h:743 > + static constexpr bool needsState = true; > + static constexpr bool needsGlobalObject = false; Does a constexpr really need to also be marked static? > Source/WebCore/bindings/scripts/CodeGenerator.pm:70 > "DOMString" => 1, > + "ByteString" => 1, > "USVString" => 1, Alphabetical instead? 1252600 3 sam 2016-11-17 21:07:29 -0800 Committed r208876: <http://trac.webkit.org/changeset/208876> 295114 2016-11-17 17:32:30 -0800 2016-11-17 20:12:48 -0800 Patch bug-164901-20161117173224.patch text/plain 13618 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODg3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw3ICsxLDQ3IEBACiAyMDE2LTExLTE3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKLSAgICAgICAgVHJ5IHRvIGZpeCB0aGUgd2luZG93cyBi dWlsZCBhZ2Fpbi4KKyAgICAgICAgW1dlYklETF0gQWRkIHN1cHBvcnQgZm9yIEJ5dGVTdHJpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDkwMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmluZGlu Z3MvZ2VuZXJpYy9JRExUeXBlcy5oOgorICAgICAgICBNYWtlIElETEJ5dGVTdHJpbmcgYSBJRExT dHJpbmcuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6dmFsdWVUb0J5dGVTdHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6dmFsdWVU b1VTVlN0cmluZyk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmg6CisgICAg ICAgIEFkZCBjb252ZXJzaW9uIGZ1bmN0aW9uIGZvciBCeXRlU3RyaW5nIGFuZCBmaXggdmFsdWVU b1VTVlN0cmluZyB0byB0YWtlIGFuIEV4ZWNTdGF0ZSByZWZlcmVuY2UuCisKKyAgICAgICAgKiBi aW5kaW5ncy9qcy9KU0RPTUNvbnZlcnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnZlcnRlcjxJ RExCeXRlU3RyaW5nPjo6Y29udmVydCk6CisgICAgICAgIChXZWJDb3JlOjpKU0NvbnZlcnRlcjxJ RExCeXRlU3RyaW5nPjo6Y29udmVydCk6CisgICAgICAgIEFkZCBjb252ZXJzaW9uIGZ1bmN0aW9u cyBmb3IgQnl0ZVN0cmluZywgdXNpbmcgdmFsdWVUb0J5dGVTdHJpbmcuCisKKyAgICAgICAgKFdl YkNvcmU6OkNvbnZlcnRlcjxJRExVU1ZTdHJpbmc+Ojpjb252ZXJ0KToKKyAgICAgICAgVXBkYXRl IHRvIHBhc3MgdGhlIEV4ZWNTdGF0ZSBieSByZWZlcmVuY2UuCisKKyAgICAgICAgKiBiaW5kaW5n cy9qcy9KU01lc3NhZ2VFdmVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoYW5kbGVJ bml0TWVzc2FnZUV2ZW50KToKKyAgICAgICAgVXBkYXRlIHRvIHBhc3MgdGhlIEV4ZWNTdGF0ZSBi eSByZWZlcmVuY2UuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1dvcmtlckdsb2JhbFNjb3Bl Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTV29ya2VyR2xvYmFsU2NvcGU6OmltcG9y dFNjcmlwdHMpOgorICAgICAgICBVcGRhdGUgdG8gcGFzcyB0aGUgRXhlY1N0YXRlIGJ5IHJlZmVy ZW5jZS4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbToKKyAg ICAgICAgQWRkIEJ5dGVTdHJpbmcgYXMgYSBzdHJpbmcgdHlwZS4KIAorICAgICAgICAqIHRlc3Rp bmcvVHlwZUNvbnZlcnNpb25zLmg6CisgICAgICAgIChXZWJDb3JlOjpUeXBlQ29udmVyc2lvbnM6 OnRlc3RCeXRlU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlR5cGVDb252ZXJzaW9uczo6c2V0 VGVzdEJ5dGVTdHJpbmcpOgorICAgICAgICAqIHRlc3RpbmcvVHlwZUNvbnZlcnNpb25zLmlkbDoK KyAgICAgICAgQWRkIGEgdGVzdEJ5dGVTdHJpbmcgYXR0cmlidXRlIGZvciB0ZXN0aW5nLgorCisy MDE2LTExLTE3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVHJ5IHRv IGZpeCB0aGUgd2luZG93cyBidWlsZCBhZ2Fpbi4KIAogICAgICAgICAqIHN2Zy9TVkdTdHJpbmdM aXN0Lmg6CiAgICAgICAgICogc3ZnL3Byb3BlcnRpZXMvU1ZHU3RhdGljTGlzdFByb3BlcnR5VGVh ck9mZi5oOgpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ2VuZXJpYy9JRExUeXBlcy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2dlbmVyaWMvSURMVHlwZXMu aAkocmV2aXNpb24gMjA4ODYyKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvZ2VuZXJpYy9J RExUeXBlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC04Niw3ICs4Niw3IEBAIHN0cnVjdCBJRExTdHJp bmcgOiBJRExUeXBlPFN0cmluZz4gewogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPiBzdGF0aWMg VSYmIGV4dHJhY3RWYWx1ZUZyb21OdWxsYWJsZShVJiYgdmFsdWUpIHsgcmV0dXJuIHN0ZDo6Zm9y d2FyZDxVPih2YWx1ZSk7IH0KIH07CiBzdHJ1Y3QgSURMRE9NU3RyaW5nIDogSURMU3RyaW5nIHsg fTsKLXN0cnVjdCBJRExCeXRlU3RyaW5nIDogSURMVW5zdXBwb3J0ZWRUeXBlIHsgfTsKK3N0cnVj dCBJRExCeXRlU3RyaW5nIDogSURMU3RyaW5nIHsgfTsKIHN0cnVjdCBJRExVU1ZTdHJpbmcgOiBJ RExTdHJpbmcgeyB9OwogCiBzdHJ1Y3QgSURMT2JqZWN0IDogSURMVW5zdXBwb3J0ZWRUeXBlIHsg fTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcAko cmV2aXNpb24gMjA4ODYyKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5k aW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAyLDEyICsxMDIsMjggQEAgc3RhdGljIGlubGlu ZSBib29sIGhhc1VucGFpcmVkU3Vycm9nYXRlKAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotU3Ry aW5nIHZhbHVlVG9VU1ZTdHJpbmcoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlKQorU3Ry aW5nIHZhbHVlVG9CeXRlU3RyaW5nKEV4ZWNTdGF0ZSYgc3RhdGUsIEpTVmFsdWUgdmFsdWUpCiB7 Ci0gICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKKyAgICBWTSYgdm0gPSBzdGF0ZS52bSgpOworICAg IGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKworICAgIFN0cmluZyBzdHJp bmcgPSB2YWx1ZS50b1dURlN0cmluZygmc3RhdGUpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04o c2NvcGUsIHsgfSk7CisKKyAgICBpZiAoIXN0cmluZy5jb250YWluc09ubHlMYXRpbjEoKSkgewor ICAgICAgICB0aHJvd1R5cGVFcnJvcigmc3RhdGUsIHNjb3BlKTsKKyAgICAgICAgcmV0dXJuIHsg fTsKKyAgICB9CisKKyAgICByZXR1cm4gc3RyaW5nOworfQorCitTdHJpbmcgdmFsdWVUb1VTVlN0 cmluZyhFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVlIHZhbHVlKQoreworICAgIFZNJiB2bSA9IHN0 YXRlLnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogCi0g ICAgU3RyaW5nIHN0cmluZyA9IHZhbHVlLnRvV1RGU3RyaW5nKGV4ZWMpOworICAgIFN0cmluZyBz dHJpbmcgPSB2YWx1ZS50b1dURlN0cmluZygmc3RhdGUpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJ T04oc2NvcGUsIHsgfSk7CiAKICAgICAvLyBGYXN0IHBhdGggZm9yIHRoZSBjYXNlIHdoZXJlIHRo ZXJlIGFyZSBubyB1bnBhaXJlZCBzdXJyb2dhdGVzLgpJbmRleDogU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNET01CaW5kaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNET01CaW5kaW5nLmgJKHJldmlzaW9uIDIwODg2MikKKysrIFNvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTUsNyAr MjE1LDggQEAgU3RyaW5nIHByb3BlcnR5TmFtZVRvU3RyaW5nKEpTQzo6UHJvcGVydAogCiBBdG9t aWNTdHJpbmcgcHJvcGVydHlOYW1lVG9BdG9taWNTdHJpbmcoSlNDOjpQcm9wZXJ0eU5hbWUpOwog Ci1XRUJDT1JFX0VYUE9SVCBTdHJpbmcgdmFsdWVUb1VTVlN0cmluZyhKU0M6OkV4ZWNTdGF0ZSos IEpTQzo6SlNWYWx1ZSk7CitXRUJDT1JFX0VYUE9SVCBTdHJpbmcgdmFsdWVUb0J5dGVTdHJpbmco SlNDOjpFeGVjU3RhdGUmLCBKU0M6OkpTVmFsdWUpOworV0VCQ09SRV9FWFBPUlQgU3RyaW5nIHZh bHVlVG9VU1ZTdHJpbmcoSlNDOjpFeGVjU3RhdGUmLCBKU0M6OkpTVmFsdWUpOwogCiBpbnQzMl90 IGZpbml0ZUludDMyVmFsdWUoSlNDOjpKU1ZhbHVlLCBKU0M6OkV4ZWNTdGF0ZSosIGJvb2wmIG9r YXkpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUNvbnZlcnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUNvbnZlcnQuaAko cmV2aXNpb24gMjA4ODYyKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01Db252 ZXJ0LmgJKHdvcmtpbmcgY29weSkKQEAgLTcyNyw2ICs3MjcsMjcgQEAgdGVtcGxhdGU8PiBzdHJ1 Y3QgSlNDb252ZXJ0ZXI8SURMRE9NU3RyaQogICAgIH0KIH07CiAKK3RlbXBsYXRlPD4gc3RydWN0 IENvbnZlcnRlcjxJRExCeXRlU3RyaW5nPiA6IERlZmF1bHRDb252ZXJ0ZXI8SURMQnl0ZVN0cmlu Zz4geworICAgIHN0YXRpYyBTdHJpbmcgY29udmVydChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpT Qzo6SlNWYWx1ZSB2YWx1ZSwgU3RyaW5nQ29udmVyc2lvbkNvbmZpZ3VyYXRpb24gY29uZmlndXJh dGlvbiA9IFN0cmluZ0NvbnZlcnNpb25Db25maWd1cmF0aW9uOjpOb3JtYWwpCisgICAgeworICAg ICAgICBpZiAoY29uZmlndXJhdGlvbiA9PSBTdHJpbmdDb252ZXJzaW9uQ29uZmlndXJhdGlvbjo6 VHJlYXROdWxsQXNFbXB0eVN0cmluZykgeworICAgICAgICAgICAgaWYgKHZhbHVlLmlzTnVsbCgp KQorICAgICAgICAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOworICAgICAgICB9CisgICAg ICAgIHJldHVybiB2YWx1ZVRvQnl0ZVN0cmluZyhzdGF0ZSwgdmFsdWUpOworICAgIH0KK307CisK K3RlbXBsYXRlPD4gc3RydWN0IEpTQ29udmVydGVyPElETEJ5dGVTdHJpbmc+IHsKKyAgICBzdGF0 aWMgY29uc3RleHByIGJvb2wgbmVlZHNTdGF0ZSA9IHRydWU7CisgICAgc3RhdGljIGNvbnN0ZXhw ciBib29sIG5lZWRzR2xvYmFsT2JqZWN0ID0gZmFsc2U7CisKKyAgICBzdGF0aWMgSlNDOjpKU1Zh bHVlIGNvbnZlcnQoSlNDOjpFeGVjU3RhdGUmIHN0YXRlLCBjb25zdCBTdHJpbmcmIHZhbHVlKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIEpTQzo6anNTdHJpbmdXaXRoQ2FjaGUoJnN0YXRlLCB2YWx1 ZSk7CisgICAgfQorfTsKKwogdGVtcGxhdGU8PiBzdHJ1Y3QgQ29udmVydGVyPElETFVTVlN0cmlu Zz4gOiBEZWZhdWx0Q29udmVydGVyPElETFVTVlN0cmluZz4gewogICAgIHN0YXRpYyBTdHJpbmcg Y29udmVydChKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgU3RyaW5n Q29udmVyc2lvbkNvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbiA9IFN0cmluZ0NvbnZlcnNpb25D b25maWd1cmF0aW9uOjpOb3JtYWwpCiAgICAgewpAQCAtNzM0LDcgKzc1NSw3IEBAIHRlbXBsYXRl PD4gc3RydWN0IENvbnZlcnRlcjxJRExVU1ZTdHJpbmcKICAgICAgICAgICAgIGlmICh2YWx1ZS5p c051bGwoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKICAgICAgICAg fQotICAgICAgICByZXR1cm4gdmFsdWVUb1VTVlN0cmluZygmc3RhdGUsIHZhbHVlKTsKKyAgICAg ICAgcmV0dXJuIHZhbHVlVG9VU1ZTdHJpbmcoc3RhdGUsIHZhbHVlKTsKICAgICB9CiB9OwogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU01lc3NhZ2VFdmVudEN1c3RvbS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNNZXNzYWdlRXZlbnRD dXN0b20uY3BwCShyZXZpc2lvbiAyMDg4NjIpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU01lc3NhZ2VFdmVudEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOSw3ICsxMTks NyBAQCBzdGF0aWMgSlNDOjpKU1ZhbHVlIGhhbmRsZUluaXRNZXNzYWdlRXZlCiAKICAgICBKU1Zh bHVlIGRhdGFBcmcgPSBzdGF0ZS5hcmd1bWVudCgzKTsKIAotICAgIGNvbnN0IFN0cmluZyBvcmln aW5BcmcgPSB2YWx1ZVRvVVNWU3RyaW5nKCZzdGF0ZSwgc3RhdGUuYXJndW1lbnQoNCkpOworICAg IGNvbnN0IFN0cmluZyBvcmlnaW5BcmcgPSBjb252ZXJ0PElETFVTVlN0cmluZz4oc3RhdGUsIHN0 YXRlLmFyZ3VtZW50KDQpKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU1ZhbHVl KCkpOwogCiAgICAgY29uc3QgU3RyaW5nIGxhc3RFdmVudElkQXJnID0gc3RhdGUuYXJndW1lbnQo NSkudG9TdHJpbmcoJnN0YXRlKS0+dmFsdWUoJnN0YXRlKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTV29ya2VyR2xvYmFsU2NvcGVDdXN0b20uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyR2xvYmFsU2NvcGVDdXN0b20uY3Bw CShyZXZpc2lvbiAyMDg4NjIpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dvcmtl ckdsb2JhbFNjb3BlQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkpTV29ya2VyR2xvYmFsU2NvcGUuaCIKIAor I2luY2x1ZGUgIkpTRE9NQ29udmVydC5oIgogI2luY2x1ZGUgIlNjaGVkdWxlZEFjdGlvbi5oIgog I2luY2x1ZGUgIldvcmtlckdsb2JhbFNjb3BlLmgiCiAKQEAgLTU0LDcgKzU1LDcgQEAgSlNWYWx1 ZSBKU1dvcmtlckdsb2JhbFNjb3BlOjppbXBvcnRTY3JpcAogICAgIFZlY3RvcjxTdHJpbmc+IHVy bHM7CiAgICAgdXJscy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHN0YXRlLmFyZ3VtZW50Q291bnQo KSk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHN0YXRlLmFyZ3VtZW50Q291bnQoKTsg KytpKSB7Ci0gICAgICAgIHVybHMudW5jaGVja2VkQXBwZW5kKHZhbHVlVG9VU1ZTdHJpbmcoJnN0 YXRlLCBzdGF0ZS51bmNoZWNrZWRBcmd1bWVudChpKSkpOworICAgICAgICB1cmxzLnVuY2hlY2tl ZEFwcGVuZChjb252ZXJ0PElETFVTVlN0cmluZz4oc3RhdGUsIHN0YXRlLnVuY2hlY2tlZEFyZ3Vt ZW50KGkpKSk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7 CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3IucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yLnBtCShyZXZpc2lvbiAyMDg4NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0JKHdvcmtpbmcgY29weSkKQEAgLTY2LDYgKzY2 LDcgQEAgbXkgJWZsb2F0aW5nUG9pbnRUeXBlSGFzaCA9ICgKIAogbXkgJXN0cmluZ1R5cGVIYXNo ID0gKAogICAgICJET01TdHJpbmciID0+IDEsCisgICAgIkJ5dGVTdHJpbmciID0+IDEsCiAgICAg IlVTVlN0cmluZyIgPT4gMSwKICk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvVHlw ZUNvbnZlcnNpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvdGVzdGluZy9UeXBl Q29udmVyc2lvbnMuaAkocmV2aXNpb24gMjA4ODYyKQorKysgU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9UeXBlQ29udmVyc2lvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtOTgsNiArOTgsOCBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRUZXN0U3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nKSB7IG1fc3Ry aW5nID0gc3RyaW5nOyB9CiAgICAgY29uc3QgU3RyaW5nJiB0ZXN0VVNWU3RyaW5nKCkgY29uc3Qg eyByZXR1cm4gbV91c3ZzdHJpbmc7IH0KICAgICB2b2lkIHNldFRlc3RVU1ZTdHJpbmcoY29uc3Qg U3RyaW5nJiB1c3ZzdHJpbmcpIHsgbV91c3ZzdHJpbmcgPSB1c3ZzdHJpbmc7IH0KKyAgICBjb25z dCBTdHJpbmcmIHRlc3RCeXRlU3RyaW5nKCkgY29uc3QgeyByZXR1cm4gbV9ieXRlU3RyaW5nOyB9 CisgICAgdm9pZCBzZXRUZXN0Qnl0ZVN0cmluZyhjb25zdCBTdHJpbmcmIGJ5dGVTdHJpbmcpIHsg bV9ieXRlU3RyaW5nID0gYnl0ZVN0cmluZzsgfQogCiAgICAgdXNpbmcgVGVzdFVuaW9uID0gVmFy aWFudDxTdHJpbmcsIGludCwgYm9vbCwgUmVmUHRyPE5vZGU+LCBWZWN0b3I8aW50Pj47CiAgICAg Y29uc3QgVGVzdFVuaW9uJiB0ZXN0VW5pb24oKSBjb25zdCB7IHJldHVybiBtX3VuaW9uOyB9CkBA IC0xMzksNiArMTQxLDcgQEAgcHJpdmF0ZToKICAgICB1aW50MTZfdCBtX1Vuc2lnbmVkU2hvcnQg eyAwIH07CiAgICAgU3RyaW5nIG1fc3RyaW5nOwogICAgIFN0cmluZyBtX3VzdnN0cmluZzsKKyAg ICBTdHJpbmcgbV9ieXRlU3RyaW5nOwogICAgIFRlc3RVbmlvbiBtX3VuaW9uOwogICAgIAogICAg IGludCBtX3R5cGVDb252ZXJzaW9uc0RpY3Rpb25hcnlMb25nVmFsdWUgeyAwIH07CkluZGV4OiBT b3VyY2UvV2ViQ29yZS90ZXN0aW5nL1R5cGVDb252ZXJzaW9ucy5pZGwKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvdGVzdGluZy9UeXBlQ29udmVyc2lvbnMuaWRsCShyZXZpc2lvbiAyMDg4 NjIpCisrKyBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL1R5cGVDb252ZXJzaW9ucy5pZGwJKHdvcmtp bmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgZW51bSBVbmlvblR5cGUgeyAibm9kZSIsICJzZXF1 ZW5jZSIsICJkaQogICAgIFtFbmZvcmNlUmFuZ2VdIGF0dHJpYnV0ZSB1bnNpZ25lZCBzaG9ydCB0 ZXN0RW5mb3JjZVJhbmdlVW5zaWduZWRTaG9ydDsKIAogICAgIGF0dHJpYnV0ZSBET01TdHJpbmcg dGVzdFN0cmluZzsKKyAgICBhdHRyaWJ1dGUgQnl0ZVN0cmluZyB0ZXN0Qnl0ZVN0cmluZzsKICAg ICBhdHRyaWJ1dGUgVVNWU3RyaW5nIHRlc3RVU1ZTdHJpbmc7CiAKICAgICBhdHRyaWJ1dGUgKERP TVN0cmluZyBvciBsb25nIG9yIGJvb2xlYW4gb3IgTm9kZSBvciBzZXF1ZW5jZTxsb25nPikgdGVz dFVuaW9uOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4ODYyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTYtMTEtMTcgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBbV2ViSURMXSBBZGQgc3VwcG9ydCBmb3Ig Qnl0ZVN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTY0OTAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBqcy9kb20vd2ViaWRsLXR5cGUtbWFwcGluZy1leHBlY3RlZC50eHQ6CisgICAgICAgICog anMvZG9tL3dlYmlkbC10eXBlLW1hcHBpbmcuaHRtbDoKKyAgICAgICAgQWRkIHRlc3RzIGZvciBC eXRlU3RyaW5nIHVzaW5nIHRoZSBuZXcgVHlwZUNvbnZlcnNpb25zLnRlc3RCeXRlU3RyaW5nIGF0 dHJpYnV0ZS4KKwogMjAxNi0xMS0xNyAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNv bT4KIAogICAgICAgICBDb3JyZWN0IGEgdHlwbyBpbiBhIFRlc3RFeHBlY3RhdGlvbnMgZmlsZS4K SW5kZXg6IExheW91dFRlc3RzL2pzL2RvbS93ZWJpZGwtdHlwZS1tYXBwaW5nLWV4cGVjdGVkLnR4 dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9qcy9kb20vd2ViaWRsLXR5cGUtbWFwcGluZy1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDIwODg2MikKKysrIExheW91dFRlc3RzL2pzL2RvbS93ZWJp ZGwtdHlwZS1tYXBwaW5nLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTA0MywyMiAr MTA0MywzOCBAQCBjb252ZXJ0ZXIudGVzdFVTVlN0cmluZyA9ICLDsMKdwoTCniIKIGNvbnZlcnRl ci50ZXN0U3RyaW5nID0gIsOwwp3ChMKeIgogUEFTUyBjb252ZXJ0ZXIudGVzdFVTVlN0cmluZyBp cyAiw7DCncKEwp4iCiBQQVNTIGNvbnZlcnRlci50ZXN0U3RyaW5nIGlzICLDsMKdwoTCniIKK2Nv bnZlcnRlci50ZXN0Qnl0ZVN0cmluZyA9ICchQCMxMjNBQkNhYmNceDAwXHg4MFx4RkZcclxuXHQn CitQQVNTIGNvbnZlcnRlci50ZXN0Qnl0ZVN0cmluZyBpcyAiIUAjMTIzQUJDYWJjXHUwMDAww4LC gMODwr9cclxuXHQiCitjb252ZXJ0ZXIudGVzdEJ5dGVTdHJpbmcgPSAnXHUwMEZGJworUEFTUyBj b252ZXJ0ZXIudGVzdEJ5dGVTdHJpbmcgaXMgIsODwr8iCitQQVNTIGNvbnZlcnRlci50ZXN0Qnl0 ZVN0cmluZyA9ICdcdTAxMDAnIHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5cGUgZXJyb3Iu CitQQVNTIGNvbnZlcnRlci50ZXN0Qnl0ZVN0cmluZyBpcyAiw4PCvyIKK1BBU1MgY29udmVydGVy LnRlc3RCeXRlU3RyaW5nID0ge3RvU3RyaW5nOiBmdW5jdGlvbigpIHsgdGhyb3cgRXJyb3IoKTsg fX0gdGhyZXcgZXhjZXB0aW9uIEVycm9yLgorUEFTUyBjb252ZXJ0ZXIudGVzdEJ5dGVTdHJpbmcg aXMgIsODwr8iCiBjb252ZXJ0ZXIudGVzdFVTVlN0cmluZyA9IHRydWUKIGNvbnZlcnRlci50ZXN0 U3RyaW5nID0gdHJ1ZQorY29udmVydGVyLnRlc3RCeXRlU3RyaW5nID0gdHJ1ZQogUEFTUyBjb252 ZXJ0ZXIudGVzdFVTVlN0cmluZyBpcyAidHJ1ZSIKIFBBU1MgY29udmVydGVyLnRlc3RTdHJpbmcg aXMgInRydWUiCitQQVNTIGNvbnZlcnRlci50ZXN0Qnl0ZVN0cmluZyBpcyAidHJ1ZSIKIGNvbnZl cnRlci50ZXN0VVNWU3RyaW5nID0gMTIzCiBjb252ZXJ0ZXIudGVzdFN0cmluZyA9IDEyMworY29u dmVydGVyLnRlc3RCeXRlU3RyaW5nID0gMTIzCiBQQVNTIGNvbnZlcnRlci50ZXN0VVNWU3RyaW5n IGlzICIxMjMiCiBQQVNTIGNvbnZlcnRlci50ZXN0U3RyaW5nIGlzICIxMjMiCitQQVNTIGNvbnZl cnRlci50ZXN0Qnl0ZVN0cmluZyBpcyAiMTIzIgogY29udmVydGVyLnRlc3RVU1ZTdHJpbmcgPSBu dWxsCiBjb252ZXJ0ZXIudGVzdFN0cmluZyA9IG51bGwKK2NvbnZlcnRlci50ZXN0Qnl0ZVN0cmlu ZyA9IG51bGwKIFBBU1MgY29udmVydGVyLnRlc3RVU1ZTdHJpbmcgaXMgIm51bGwiCiBQQVNTIGNv bnZlcnRlci50ZXN0U3RyaW5nIGlzICJudWxsIgorUEFTUyBjb252ZXJ0ZXIudGVzdEJ5dGVTdHJp bmcgaXMgIm51bGwiCiBjb252ZXJ0ZXIudGVzdFVTVlN0cmluZyA9IHVuZGVmaW5lZAogY29udmVy dGVyLnRlc3RTdHJpbmcgPSB1bmRlZmluZWQKK2NvbnZlcnRlci50ZXN0Qnl0ZVN0cmluZyA9IHVu ZGVmaW5lZAogUEFTUyBjb252ZXJ0ZXIudGVzdFVTVlN0cmluZyBpcyAidW5kZWZpbmVkIgogUEFT UyBjb252ZXJ0ZXIudGVzdFN0cmluZyBpcyAidW5kZWZpbmVkIgorUEFTUyBjb252ZXJ0ZXIudGVz dEJ5dGVTdHJpbmcgaXMgInVuZGVmaW5lZCIKIGNvbnZlcnRlci50ZXN0VW5pb24gPSAnaGVsbG8n CiBQQVNTIGNvbnZlcnRlci50ZXN0VW5pb24gaXMgJ2hlbGxvJwogUEFTUyB0eXBlb2YgY29udmVy dGVyLnRlc3RVbmlvbiBpcyAnc3RyaW5nJwpJbmRleDogTGF5b3V0VGVzdHMvanMvZG9tL3dlYmlk bC10eXBlLW1hcHBpbmcuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9qcy9kb20vd2Vi aWRsLXR5cGUtbWFwcGluZy5odG1sCShyZXZpc2lvbiAyMDg4NjIpCisrKyBMYXlvdXRUZXN0cy9q cy9kb20vd2ViaWRsLXR5cGUtbWFwcGluZy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC01NzksMTMg KzU3OSwyNiBAQCBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImNvbnZlcnRlci50ZXN0U3RyCiAgICAg c2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJjb252ZXJ0ZXIudGVzdFVTVlN0cmluZyIsIHRlc3QuZXhw ZWN0ZWQpOwogICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiY29udmVydGVyLnRlc3RTdHJpbmci LCB0ZXN0LmlucHV0KTsKIH0pOworCitldmFsQW5kTG9nKCJjb252ZXJ0ZXIudGVzdEJ5dGVTdHJp bmcgPSAnIUAjMTIzQUJDYWJjXFx4MDBcXHg4MFxceEZGXFxyXFxuXFx0JyIpOworc2hvdWxkQmVF cXVhbFRvU3RyaW5nKCJjb252ZXJ0ZXIudGVzdEJ5dGVTdHJpbmciLCAiIUAjMTIzQUJDYWJjXHgw MFx4ODBceEZGXHJcblx0Iik7CitldmFsQW5kTG9nKCJjb252ZXJ0ZXIudGVzdEJ5dGVTdHJpbmcg PSAnXFx1MDBGRiciKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygiY29udmVydGVyLnRlc3RCeXRl U3RyaW5nIiwgIlx1MDBGRiIpOworc2hvdWxkVGhyb3coImNvbnZlcnRlci50ZXN0Qnl0ZVN0cmlu ZyA9ICdcXHUwMTAwJyIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJjb252ZXJ0ZXIudGVzdEJ5 dGVTdHJpbmciLCAiXHUwMEZGIik7CitzaG91bGRUaHJvdygiY29udmVydGVyLnRlc3RCeXRlU3Ry aW5nID0ge3RvU3RyaW5nOiBmdW5jdGlvbigpIHsgdGhyb3cgRXJyb3IoKTsgfX0iKTsKK3Nob3Vs ZEJlRXF1YWxUb1N0cmluZygiY29udmVydGVyLnRlc3RCeXRlU3RyaW5nIiwgIlx1MDBGRiIpOwor CiBbInRydWUiLCAiMTIzIiwgIm51bGwiLCAidW5kZWZpbmVkIl0uZm9yRWFjaChmdW5jdGlvbih2 YWx1ZSkgewogICAgIGV2YWxBbmRMb2coImNvbnZlcnRlci50ZXN0VVNWU3RyaW5nID0gIiArIHZh bHVlKTsKICAgICBldmFsQW5kTG9nKCJjb252ZXJ0ZXIudGVzdFN0cmluZyA9ICIgKyB2YWx1ZSk7 CisgICAgZXZhbEFuZExvZygiY29udmVydGVyLnRlc3RCeXRlU3RyaW5nID0gIiArIHZhbHVlKTsK ICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImNvbnZlcnRlci50ZXN0VVNWU3RyaW5nIiwgdmFs dWUpOwogICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiY29udmVydGVyLnRlc3RTdHJpbmciLCB2 YWx1ZSk7CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJjb252ZXJ0ZXIudGVzdEJ5dGVTdHJp bmciLCB2YWx1ZSk7CiB9KTsKIAorCiBldmFsQW5kTG9nKCJjb252ZXJ0ZXIudGVzdFVuaW9uID0g J2hlbGxvJyIpOwogc2hvdWxkQmUoImNvbnZlcnRlci50ZXN0VW5pb24iLCAiJ2hlbGxvJyIpOwog c2hvdWxkQmUoInR5cGVvZiBjb252ZXJ0ZXIudGVzdFVuaW9uIiwgIidzdHJpbmcnIik7Cg==