163611 2016-10-18 12:32:46 -0700 [WebIDL] Allow sequences of dictionaries as members of other dictionaries and as parameters 2016-10-18 23:20:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 163624 1 zan zan cdumez commit-queue esprehn+autocc kondapallykalyan sam youennf oldest_to_newest 1241554 0 zan 2016-10-18 12:32:46 -0700 [WebIDL] Allow sequences of dictionaries as members of other dictionaries and as parameters 1241557 1 291970 zan 2016-10-18 12:44:53 -0700 Created attachment 291970 Patch 1241560 2 sam 2016-10-18 12:48:43 -0700 This makes me think that Converter<IDLDictionary<T>>::convert() should maybe return a T not Optional<T>. I need to think through what the consequences of this would be. 1241569 3 cdumez 2016-10-18 12:56:17 -0700 (In reply to comment #2) > This makes me think that Converter<IDLDictionary<T>>::convert() should maybe > return a T not Optional<T>. I need to think through what the consequences > of this would be. I think I made the switch to returning Optional a while back so we could return Nullopt in error cases. However, since then, we updated our dictionary code so that all our native dictionary structs must have a default constructor. Therefore, I think it is no longer necessary to return an Optional<>, we can just return { } instead. So I agree with Sam. 1241570 4 cdumez 2016-10-18 12:57:00 -0700 @Zan: I am happy to make the code change if you want. Just let me know. 1241851 5 zan 2016-10-18 23:19:37 -0700 (In reply to comment #4) > @Zan: I am happy to make the code change if you want. Just let me know. Saw it in bug #163624. Thanks! With that this patch isn't needed anymore. 291970 2016-10-18 12:44:53 -0700 2016-10-18 23:19:50 -0700 Patch bug-163611-20161018124118.patch text/plain 9658 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3NDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIyY2U2NTBmMThiNjM0 MWYyYzU2OTNhYjQyN2M5ZTRjOGMxNmNlMC4uMTI2NjEyNTkxYTM5OTcxZTQwNDVhYmRiYWQxM2Vl ODU0NzIzMTg5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE2LTEwLTE4ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbV2ViSURMXSBBbGxv dyBzZXF1ZW5jZXMgb2YgZGljdGlvbmFyaWVzIGFzIG1lbWJlcnMgb2Ygb3RoZXIgZGljdGlvbmFy aWVzIGFuZCBhcyBwYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjM2MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGp1c3QgaG93IHRoZSBkaWN0aW9uYXJ5IHZhbHVlcyBpbiBhIHNlcXVl bmNlIHRoYXQgaXMgYmVpbmcKKyAgICAgICAgY29udmVydGVkIGFyZSBhcHBlbmRlZCB0byB0aGUg cmVzdWxpbmcgVmVjdG9yLiBCZWNhdXNlIHRoZQorICAgICAgICByZXN1bHQgb2YgYSBkaWN0aW9u YXJ5IGNvbnZlcnNpb24gaXMgd3JhcHBlZCBpbiBhbiBPcHRpb25hbDw+CisgICAgICAgIG9iamVj dCwgdGhhdCBvYmplY3QgaGFzIHRvIGJlIGRlcmVmZXJlbmNlZC4KKworICAgICAgICBUaGlzIGlz IGRvbmUgYnkgdXNpbmcgYSBoZWxwZXIgdGVtcGxhdGUgc3RydWN0IHRoYXQgcHJvdmlkZXMKKyAg ICAgICAgYSBzdGF0aWMgZnVuY3Rpb24gdGhhdCBleGVjdXRlcyB0aGUgYXBwZW5kLiBBIHNwZWNp YWxpemF0aW9uCisgICAgICAgIGZvciBJRExEaWN0aW9uYXJ5IHNlcXVlbmNlcyBpcyB1c2VkIHRv IGNvcnJlY3RseSBhZGRyZXNzZXMKKyAgICAgICAgT3B0aW9uYWw8PiBiZWluZyB0aGUgcmV0dXJu IHR5cGUgb2YgZGljdGlvbmFyeSBjb252ZXJzaW9ucy4KKworICAgICAgICBObyBjaGFuZ2VzIHRv IHRoZSBiaW5kaW5ncyBnZW5lcmF0b3Igc2NyaXB0cyBhcmUgcmVxdWlyZWQsCisgICAgICAgIGJ1 dCB0ZXN0cyBhcmUgYWRkZWQgdG8gY292ZXIgc2VxdWVuY2VzIG9mIGRpY3Rpb25hcmllcyB0aGF0 CisgICAgICAgIGFyZSBtZW1iZXJzIG9mIG90aGVyIGRpY3Rpb25hcmllcywgYW5kIHNlcXVlbmNl cyBvZgorICAgICAgICBkaWN0aW9uYXJpZXMgYXMgb3BlcmF0aW9uIHBhcmFtZXRlcnMuIFRoZXNl IHR3byB1c2UgY2FzZXMKKyAgICAgICAgYXJlbid0IHByZXNlbnQgaW4gYW55IGV4aXN0aW5nIElE TCBmaWxlcyAoYXQgbGVhc3QgdG8gbXkKKyAgICAgICAga25vd2xlZGdlKSwgYnV0IHRoZXkgd2ls bCBiZSBuZWVkZWQgaW4gZnV0dXJlIEFQSXMuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RP TUNvbnZlcnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRldGFpbDo6QXJyYXlBcHBlbmRlcjo6YXBw ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkRldGFpbDo6QXJyYXlBcHBlbmRlcjxJRExEaWN0aW9u YXJ5PFQ+Pjo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkRldGFpbDo6QXJyYXlDb252ZXJ0 ZXI6OmNvbnZlcnQpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RP YmouY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6RGlj dGlvbmFyeT4pOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25P cGVyYXRpb25XaXRoRGljdGlvbmFyeVNlcXVlbmNlUGFyYW1ldGVyKToKKyAgICAgICAgKFdlYkNv cmU6OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uT3BlcmF0aW9uV2l0aERpY3Rpb25hcnlTZXF1 ZW5jZVBhcmFtZXRlckNhbGxlcik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rl c3RPYmouaWRsOgorCiAyMDE2LTEwLTE4ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3 YUBhcHBsZS5jb20+CiAKICAgICAgICAgU1ZHQ1NTUGFyc2VyOiBtX2ltcGxpY2l0U2hvcnRoYW5k IHZhbHVlIGlzIG5vdCByZXNldCBhZnRlciBhZGRpbmcgdGhlIHNob3J0aGFuZCBwcm9wZXJ0eQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01Db252ZXJ0LmggYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUNvbnZlcnQuaAppbmRleCBhZjYwNDNhODM5 MGI3OTc2ZTkzZjFkMWJhM2Y0N2FjOTQzMjA2MDRjLi45YTZhOGIxNjYzZGRiN2JhZmM1NTIxZTcx NGVmZjNkYzEwMmZmZmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RPTUNvbnZlcnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUNvbnZl cnQuaApAQCAtMzU4LDYgKzM1OCwyNSBAQCBuYW1lc3BhY2UgRGV0YWlsIHsKICAgICAgICAgdXNp bmcgUmV0dXJuVHlwZSA9IFZlY3RvcjxSZWZQdHI8VD4+OwogICAgIH07CiAKKyAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBUPgorICAgIHN0cnVjdCBBcnJheUFwcGVuZGVyIHsKKyAgICAgICAgc3RhdGlj IHZvaWQgYXBwZW5kKHR5cGVuYW1lIEFycmF5Q29udmVydGVyQmFzZTxUPjo6UmV0dXJuVHlwZSYg cmVzdWx0LCB0eXBlbmFtZSBDb252ZXJ0ZXI8VD46OlJldHVyblR5cGUmJiBjb252ZXJ0ZWRWYWx1 ZSkKKyAgICAgICAgeworICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChXVEZNb3ZlKGNvbnZlcnRl ZFZhbHVlKSk7CisgICAgICAgIH0KKyAgICB9OworCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4K KyAgICBzdHJ1Y3QgQXJyYXlBcHBlbmRlcjxJRExEaWN0aW9uYXJ5PFQ+PiB7CisgICAgICAgIHN0 YXRpY19hc3NlcnQoc3RkOjppc19zYW1lPHR5cGVuYW1lIENvbnZlcnRlcjxJRExEaWN0aW9uYXJ5 PFQ+Pjo6UmV0dXJuVHlwZSwgT3B0aW9uYWw8VD4+Ojp2YWx1ZSwgIlRoaXMgc3BlY2lhbGl6YXRp b24gZXhwZWN0cyB0aGUgQ29udmVydGVyJ3MgcmV0dXJuIHR5cGUgdG8gYmUgT3B0aW9uYWw8Pi4i KTsKKworICAgICAgICBzdGF0aWMgdm9pZCBhcHBlbmQodHlwZW5hbWUgQXJyYXlDb252ZXJ0ZXJC YXNlPElETERpY3Rpb25hcnk8VD4+OjpSZXR1cm5UeXBlJiByZXN1bHQsIHR5cGVuYW1lIENvbnZl cnRlcjxJRExEaWN0aW9uYXJ5PFQ+Pjo6UmV0dXJuVHlwZSYmIGNvbnZlcnRlZFZhbHVlKQorICAg ICAgICB7CisgICAgICAgICAgICBBU1NFUlQoY29udmVydGVkVmFsdWUpOworICAgICAgICAgICAg cmVzdWx0LmFwcGVuZChXVEZNb3ZlKCpjb252ZXJ0ZWRWYWx1ZSkpOworICAgICAgICB9CisgICAg fTsKKwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIElETFR5cGU+CiAgICAgc3RydWN0IEFycmF5Q29u dmVydGVyIDogQXJyYXlDb252ZXJ0ZXJCYXNlPElETFR5cGU+IHsKICAgICAgICAgdXNpbmcgUmV0 dXJuVHlwZSA9IHR5cGVuYW1lIEFycmF5Q29udmVydGVyQmFzZTxJRExUeXBlPjo6UmV0dXJuVHlw ZTsKQEAgLTM3OSw3ICszOTgsNyBAQCBuYW1lc3BhY2UgRGV0YWlsIHsKICAgICAgICAgICAgICAg ICBhdXRvIGNvbnZlcnRlZFZhbHVlID0gQ29udmVydGVyPElETFR5cGU+Ojpjb252ZXJ0KCpzdGF0 ZSwganNWYWx1ZSk7CiAgICAgICAgICAgICAgICAgaWYgKFVOTElLRUxZKHNjb3BlLmV4Y2VwdGlv bigpKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIHJlc3Vs dC5hcHBlbmQoV1RGTW92ZShjb252ZXJ0ZWRWYWx1ZSkpOworICAgICAgICAgICAgICAgIEFycmF5 QXBwZW5kZXI8SURMVHlwZT46OmFwcGVuZChyZXN1bHQsIFdURk1vdmUoY29udmVydGVkVmFsdWUp KTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT VGVzdE9iai5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNU ZXN0T2JqLmNwcAppbmRleCBjNTJhMzkwZjAxYTIwNDZkN2VlOWUxMWE2NWEzZGNiMTNkMDFjNjgw Li41OWM4NjgwNDI2NGY2YmVmZTgzMjMwODlhMWMxOTdkMDI5YjBmMmE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcApA QCAtNTE0LDYgKzUxNCwxMSBAQCB0ZW1wbGF0ZTw+IE9wdGlvbmFsPFRlc3RPYmo6OkRpY3Rpb25h cnk+IGNvbnZlcnREaWN0aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnk+KAogICAgICAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIE51bGxvcHQpOwogICAgICAgICByZXN1bHQuZGlj dGlvbmFyeU1lbWJlciA9IGRpY3Rpb25hcnlNZW1iZXJPcHRpb25hbC52YWx1ZSgpOwogICAgIH0K KyAgICBKU1ZhbHVlIGRpY3Rpb25hcnlTZXF1ZW5jZU1lbWJlclZhbHVlID0gaXNOdWxsT3JVbmRl ZmluZWQgPyBqc1VuZGVmaW5lZCgpIDogb2JqZWN0LT5nZXQoJnN0YXRlLCBJZGVudGlmaWVyOjpm cm9tU3RyaW5nKCZzdGF0ZSwgImRpY3Rpb25hcnlTZXF1ZW5jZU1lbWJlciIpKTsKKyAgICBpZiAo IWRpY3Rpb25hcnlTZXF1ZW5jZU1lbWJlclZhbHVlLmlzVW5kZWZpbmVkKCkpIHsKKyAgICAgICAg cmVzdWx0LmRpY3Rpb25hcnlTZXF1ZW5jZU1lbWJlciA9IGNvbnZlcnQ8SURMU2VxdWVuY2U8SURM RGljdGlvbmFyeTxUZXN0T2JqOjpEaWN0aW9uYXJ5VGhhdFNob3VsZFRvbGVyYXRlTnVsbD4+Pihz dGF0ZSwgZGljdGlvbmFyeVNlcXVlbmNlTWVtYmVyVmFsdWUpOworICAgICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHRocm93U2NvcGUsIE51bGxvcHQpOworICAgIH0KICAgICBKU1ZhbHVlIGVudW1l cmF0aW9uVmFsdWVXaXRoRGVmYXVsdFZhbHVlID0gaXNOdWxsT3JVbmRlZmluZWQgPyBqc1VuZGVm aW5lZCgpIDogb2JqZWN0LT5nZXQoJnN0YXRlLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKCZzdGF0 ZSwgImVudW1lcmF0aW9uVmFsdWVXaXRoRGVmYXVsdCIpKTsKICAgICBpZiAoIWVudW1lcmF0aW9u VmFsdWVXaXRoRGVmYXVsdFZhbHVlLmlzVW5kZWZpbmVkKCkpIHsKICAgICAgICAgcmVzdWx0LmVu dW1lcmF0aW9uVmFsdWVXaXRoRGVmYXVsdCA9IGNvbnZlcnQ8SURMRW51bWVyYXRpb248VGVzdE9i ajo6RW51bVR5cGU+PihzdGF0ZSwgZW51bWVyYXRpb25WYWx1ZVdpdGhEZWZhdWx0VmFsdWUpOwpA QCAtOTk5LDYgKzEwMDQsNyBAQCBKU0M6OkVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNU ZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25TaW5nbGVDb25kaXRpb25hbE92ZQogSlNDOjpFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQXR0YWNoU2hh ZG93Um9vdChKU0M6OkV4ZWNTdGF0ZSopOwogSlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9D QUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uT3BlcmF0aW9uV2l0aEV4dGVybmFsRGljdGlv bmFyeVBhcmFtZXRlcihKU0M6OkV4ZWNTdGF0ZSopOwogSlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0Nf SE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQnVmZmVyU291cmNlUGFyYW1ldGVy KEpTQzo6RXhlY1N0YXRlKik7CitKU0M6OkVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNU ZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25PcGVyYXRpb25XaXRoRGljdGlvbmFyeVNlcXVlbmNlUGFy YW1ldGVyKEpTQzo6RXhlY1N0YXRlKik7CiBKU0M6OkVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25Ub1N0cmluZyhKU0M6OkV4ZWNTdGF0ZSopOwog SlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0 aW9uVG9KU09OKEpTQzo6RXhlY1N0YXRlKik7CiAKQEAgLTE2MTEsNiArMTYxNyw3IEBAIHN0YXRp YyBjb25zdCBIYXNoVGFibGVWYWx1ZSBKU1Rlc3RPYmpQcm90b3R5cGVUYWJsZVZhbHVlc1tdID0K ICAgICB7ICJhdHRhY2hTaGFkb3dSb290IiwgSlNDOjpGdW5jdGlvbiwgTm9JbnRyaW5zaWMsIHsg KGludHB0cl90KXN0YXRpY19jYXN0PE5hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVG dW5jdGlvbkF0dGFjaFNoYWRvd1Jvb3QpLCAoaW50cHRyX3QpICgxKSB9IH0sCiAgICAgeyAib3Bl cmF0aW9uV2l0aEV4dGVybmFsRGljdGlvbmFyeVBhcmFtZXRlciIsIEpTQzo6RnVuY3Rpb24sIE5v SW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxOYXRpdmVGdW5jdGlvbj4oanNUZXN0 T2JqUHJvdG90eXBlRnVuY3Rpb25PcGVyYXRpb25XaXRoRXh0ZXJuYWxEaWN0aW9uYXJ5UGFyYW1l dGVyKSwgKGludHB0cl90KSAoMSkgfSB9LAogICAgIHsgImJ1ZmZlclNvdXJjZVBhcmFtZXRlciIs IEpTQzo6RnVuY3Rpb24sIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxOYXRp dmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25CdWZmZXJTb3VyY2VQYXJhbWV0 ZXIpLCAoaW50cHRyX3QpICgxKSB9IH0sCisgICAgeyAib3BlcmF0aW9uV2l0aERpY3Rpb25hcnlT ZXF1ZW5jZVBhcmFtZXRlciIsIEpTQzo6RnVuY3Rpb24sIE5vSW50cmluc2ljLCB7IChpbnRwdHJf dClzdGF0aWNfY2FzdDxOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25P cGVyYXRpb25XaXRoRGljdGlvbmFyeVNlcXVlbmNlUGFyYW1ldGVyKSwgKGludHB0cl90KSAoMSkg fSB9LAogICAgIHsgInRvU3RyaW5nIiwgSlNDOjpGdW5jdGlvbiwgTm9JbnRyaW5zaWMsIHsgKGlu dHB0cl90KXN0YXRpY19jYXN0PE5hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5j dGlvblRvU3RyaW5nKSwgKGludHB0cl90KSAoMCkgfSB9LAogICAgIHsgInRvSlNPTiIsIEpTQzo6 RnVuY3Rpb24sIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxOYXRpdmVGdW5j dGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25Ub0pTT04pLCAoaW50cHRyX3QpICgwKSB9 IH0sCiAjaWYgRU5BQkxFKENvbmRpdGlvbjEpCkBAIC03NzU2LDYgKzc3NjMsMjYgQEAgc3RhdGlj IGlubGluZSBKU0M6OkVuY29kZWRKU1ZhbHVlIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uQnVm ZmVyU291cmNlUGFyYW1ldGUKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVk KCkpOwogfQogCitzdGF0aWMgaW5saW5lIEpTQzo6RW5jb2RlZEpTVmFsdWUganNUZXN0T2JqUHJv dG90eXBlRnVuY3Rpb25PcGVyYXRpb25XaXRoRGljdGlvbmFyeVNlcXVlbmNlUGFyYW1ldGVyQ2Fs bGVyKEpTQzo6RXhlY1N0YXRlKiwgSlNUZXN0T2JqKiwgSlNDOjpUaHJvd1Njb3BlJik7CisKK0Vu Y29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25PcGVy YXRpb25XaXRoRGljdGlvbmFyeVNlcXVlbmNlUGFyYW1ldGVyKEV4ZWNTdGF0ZSogc3RhdGUpCit7 CisgICAgcmV0dXJuIEJpbmRpbmdDYWxsZXI8SlNUZXN0T2JqPjo6Y2FsbE9wZXJhdGlvbjxqc1Rl c3RPYmpQcm90b3R5cGVGdW5jdGlvbk9wZXJhdGlvbldpdGhEaWN0aW9uYXJ5U2VxdWVuY2VQYXJh bWV0ZXJDYWxsZXI+KHN0YXRlLCAib3BlcmF0aW9uV2l0aERpY3Rpb25hcnlTZXF1ZW5jZVBhcmFt ZXRlciIpOworfQorCitzdGF0aWMgaW5saW5lIEpTQzo6RW5jb2RlZEpTVmFsdWUganNUZXN0T2Jq UHJvdG90eXBlRnVuY3Rpb25PcGVyYXRpb25XaXRoRGljdGlvbmFyeVNlcXVlbmNlUGFyYW1ldGVy Q2FsbGVyKEpTQzo6RXhlY1N0YXRlKiBzdGF0ZSwgSlNUZXN0T2JqKiBjYXN0ZWRUaGlzLCBKU0M6 OlRocm93U2NvcGUmIHRocm93U2NvcGUpCit7CisgICAgVU5VU0VEX1BBUkFNKHN0YXRlKTsKKyAg ICBVTlVTRURfUEFSQU0odGhyb3dTY29wZSk7CisgICAgYXV0byYgaW1wbCA9IGNhc3RlZFRoaXMt PndyYXBwZWQoKTsKKyAgICBpZiAoVU5MSUtFTFkoc3RhdGUtPmFyZ3VtZW50Q291bnQoKSA8IDEp KQorICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKHN0YXRlLCB0aHJvd1Njb3BlLCBjcmVhdGVO b3RFbm91Z2hBcmd1bWVudHNFcnJvcihzdGF0ZSkpOworICAgIGF1dG8gZGljdFNlcXVlbmNlID0g Y29udmVydDxJRExTZXF1ZW5jZTxJRExEaWN0aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnk+Pj4o KnN0YXRlLCBzdGF0ZS0+dW5jaGVja2VkQXJndW1lbnQoMCkpOworICAgIFJFVFVSTl9JRl9FWENF UFRJT04odGhyb3dTY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgaW1wbC5vcGVyYXRpb25X aXRoRGljdGlvbmFyeVNlcXVlbmNlUGFyYW1ldGVyKFdURk1vdmUoZGljdFNlcXVlbmNlKSk7Cisg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKK30KKwogc3RhdGljIGlu bGluZSBKU0M6OkVuY29kZWRKU1ZhbHVlIGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uVG9TdHJp bmdDYWxsZXIoSlNDOjpFeGVjU3RhdGUqLCBKU1Rlc3RPYmoqLCBKU0M6OlRocm93U2NvcGUmKTsK IAogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlv blRvU3RyaW5nKEV4ZWNTdGF0ZSogc3RhdGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKaW5kZXggMTdlZGJmOWNjMjAwZDAzMmU2MWMxNDFi NjYwZjVmMDlhNTg0OTUyZi4uYWExNTZlNTUyZWMwM2EzNjUzOGJjYWRjYzk3YWRiMGY1YmFkNjFk NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RP YmouaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0T2Jq LmlkbApAQCAtNDE3LDYgKzQxNyw4IEBAIGVudW0gVGVzdENvbmZpZGVuY2UgeyAiaGlnaCIsICJr aW5kYS1sb3ciIH07CiAgICAgc2VyaWFsaXplciA9IHtjcmVhdGUsIHJlYWRPbmx5U3RyaW5nQXR0 ciwgZW51bUF0dHIsIGxvbmdBdHRyfTsKIAogICAgIHZvaWQgYnVmZmVyU291cmNlUGFyYW1ldGVy KEJ1ZmZlclNvdXJjZSBkYXRhKTsKKworICAgIHZvaWQgb3BlcmF0aW9uV2l0aERpY3Rpb25hcnlT ZXF1ZW5jZVBhcmFtZXRlcihzZXF1ZW5jZTxUZXN0RGljdGlvbmFyeT4gZGljdFNlcXVlbmNlKTsK IH07CiAKIC8vIFRoZSBmb2xsb3dpbmcgY29tbWVudCBzaG91bGQgbm90IGdlbmVyYXRlIGFueSBj b2RlLgpAQCAtNDYzLDYgKzQ2NSw3IEBAIGRpY3Rpb25hcnkgVGVzdERpY3Rpb25hcnkgewogICAg IChsb25nIG9yIE5vZGUpIHVuaW9uTWVtYmVyOwogICAgIChsb25nIG9yIE5vZGUpPyBudWxsYWJs ZVVuaW9uTWVtYmVyID0gbnVsbDsKICAgICBCdWZmZXJTb3VyY2UgYnVmZmVyU291cmNlVmFsdWU7 CisgICAgc2VxdWVuY2U8VGVzdERpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsPiBkaWN0 aW9uYXJ5U2VxdWVuY2VNZW1iZXI7CiB9OwogCiBkaWN0aW9uYXJ5IFRlc3REaWN0aW9uYXJ5VGhh dFNob3VsZE5vdFRvbGVyYXRlTnVsbCB7Cg==