38699 2010-05-06 15:43:08 -0700 Improve code generator scripts to support converting ScriptString 2010-05-06 17:02:02 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli jianli abarth eric webkit.review.bot oldest_to_newest 222018 0 jianli 2010-05-06 15:43:08 -0700 Improve code generator scripts to support converting ScriptString This is needed in order to avoid custom bindings code for FileReader interface. 222055 1 55319 jianli 2010-05-06 16:43:41 -0700 Created attachment 55319 Proposed Patch 222057 2 webkit.review.bot 2010-05-06 16:49:03 -0700 Attachment 55319 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:473: Extra space before ( in function call [whitespace/parens] [4] WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:475: Extra space before ( in function call [whitespace/parens] [4] WebCore/bindings/scripts/test/JS/JSTestObj.cpp:63: Missing spaces around | [whitespace/operators] [3] WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h:173: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 222064 3 55319 abarth 2010-05-06 16:53:10 -0700 Comment on attachment 55319 Proposed Patch Thanks! 222068 4 jianli 2010-05-06 17:02:02 -0700 Committed as http://trac.webkit.org/changeset/58921. 55319 2010-05-06 16:43:41 -0700 2010-05-06 16:53:10 -0700 Proposed Patch 38699 text/plain 12463 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmVkYWM1Mi4uMzU3NjI4NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOCBAQAogMjAxMC0wNS0wNiAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW1wcm92ZSBjb2RlIGdlbmVyYXRvciBzY3JpcHRzIHRvIHN1cHBvcnQgY29u dmVydGluZyBTY3JpcHRTdHJpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zODY5OQorCisgICAgICAgIENoYW5nZSBib3RoIEpTQyBhbmQgVjggZ2Vu ZXJhdG9ycyB0byBpbnRyb2R1Y2UgIkNvbnZlcnRTY3JpcHRTdHJpbmciCisgICAgICAgIGF0dHJp YnV0ZSB0byBhbGxvdyBjb252ZXJ0aW5nIGZyb20gU2NyaXB0U3RyaW5nLiBBbHNvIHVwZGF0ZWQg dGhlCisgICAgICAgIGJpbmRpbmdzIHRlc3QgcmVzdWx0LgorCisgICAgICAgIFRoZXNlIGNoYW5n ZXMgYXJlIG5lY2Vzc2FyeSBpbiBvcmRlciB0byBhdm9pZCBhZGRpbmcgY3VzdG9tIGJpbmRpbmcg Y29kZXMKKyAgICAgICAgd2hlbiB3ZSBhZGQgdGhlIEZpbGVSZWFkZXIgaW50ZXJmYWNlLgorCisg ICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG06CisgICAgICAgICog YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgICogYmluZGluZ3Mv c2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5jcHA6CisgICAgICAgICh3ZWJr aXRfZG9tX3Rlc3Rfb2JqX2dldF9zY3JpcHRfc3RyaW5nX2F0dHIpOgorICAgICAgICAod2Via2l0 X2RvbV90ZXN0X29ial9nZXRfcHJvcGVydHkpOgorICAgICAgICAod2Via2l0X2RvbV90ZXN0X29i al9jbGFzc19pbml0KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9X ZWJLaXRET01UZXN0T2JqLmg6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT VGVzdE9iai5jcHA6CisgICAgICAgIChXZWJDb3JlOjopOgorICAgICAgICAoV2ViQ29yZTo6anNU ZXN0T2JqU2NyaXB0U3RyaW5nQXR0cik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0pTL0pTVGVzdE9iai5oOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9PYmpDL0RP TVRlc3RPYmouaDoKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0 T2JqLm1tOgorICAgICAgICAoLVtET01UZXN0T2JqIHNjcmlwdFN0cmluZ0F0dHJdKToKKyAgICAg ICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGw6CisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXN0 T2JqSW50ZXJuYWw6OnNjcmlwdFN0cmluZ0F0dHJBdHRyR2V0dGVyKToKKyAgICAgICAgKFdlYkNv cmU6Oik6CisKKzIwMTAtMDUtMDYgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCiAKICAgICAgICAgSW1wcm92ZSBjb2RlIGdl bmVyYXRvciBzY3JpcHRzIHRvIHBhc3MgYWRkaXRpb25hbCBTY3JpcHRFeGVjdXRpb25Db250ZXh0 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt IGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQppbmRleCA0MDIw OGFhLi5kYzIxMzE0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvckpTLnBtCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG0KQEAgLTIyMzMsNiArMjIzMyw4IEBAIHN1YiBOYXRpdmVUb0pTVmFsdWUKIAogICAgICAg ICAgICAgZGllICJVbmtub3duIHZhbHVlIGZvciBDb252ZXJ0TnVsbFN0cmluZ1RvIGV4dGVuZGVk IGF0dHJpYnV0ZSI7CiAgICAgICAgIH0KKyAgICAgICAgJGNvbnYgPSAkc2lnbmF0dXJlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiQ29udmVydFNjcmlwdFN0cmluZyJ9OworICAgICAgICByZXR1cm4g ImpzT3duZWRTdHJpbmdPck51bGwoZXhlYywgJHZhbHVlKSIgaWYgJGNvbnY7CiAgICAgICAgICRp bXBsSW5jbHVkZXN7IjxydW50aW1lL0pTU3RyaW5nLmg+In0gPSAxOwogICAgICAgICByZXR1cm4g ImpzU3RyaW5nKGV4ZWMsICR2YWx1ZSkiOwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IDZkOTUwYjAuLjk1NTNiOGIgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KKysrIGIvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAtMzA2Niw2ICszMDY2LDgg QEAgc3ViIFJldHVybk5hdGl2ZVRvSlNWYWx1ZQogCiAgICAgICAgICAgICBkaWUgIlVua25vd24g dmFsdWUgZm9yIENvbnZlcnROdWxsU3RyaW5nVG8gZXh0ZW5kZWQgYXR0cmlidXRlIjsKICAgICAg ICAgfQorICAgICAgICAkY29udiA9ICRzaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJD b252ZXJ0U2NyaXB0U3RyaW5nIn07CisgICAgICAgIHJldHVybiAidjhTdHJpbmdPck51bGwoZXhl YywgJHZhbHVlKSIgaWYgJGNvbnY7CiAgICAgICAgIHJldHVybiAicmV0dXJuIHY4U3RyaW5nKCR2 YWx1ZSkiOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmNwcCBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5jcHAKaW5kZXggOTJiYzViZi4uOGMxYmFl MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJL aXRET01UZXN0T2JqLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2Jq ZWN0L1dlYktpdERPTVRlc3RPYmouY3BwCkBAIC00NjksNiArNDY5LDE2IEBAIHdlYmtpdF9kb21f dGVzdF9vYmpfc2V0X2F0dHJfd2l0aF9nZXR0ZXJfZXhjZXB0aW9uIChXZWJLaXRET01UZXN0T2Jq ICpzZWxmLCBnbG9uCiAKIH0KIAorZ2NoYXIqIAord2Via2l0X2RvbV90ZXN0X29ial9nZXRfc2Ny aXB0X3N0cmluZ19hdHRyIChXZWJLaXRET01UZXN0T2JqICpzZWxmKQoreworICAgIGdfcmV0dXJu X3ZhbF9pZl9mYWlsIChzZWxmLCAwKTsKKyAgICBXZWJDb3JlOjpUZXN0T2JqICogaXRlbSA9IFdl YktpdDo6Y29yZShzZWxmKTsKKyAgICBnY2hhciogIHJlcyA9IGNvbnZlcnRUb1VURjhTdHJpbmco aXRlbS0+c2NyaXB0U3RyaW5nQXR0cigpKTsKKyAgICByZXR1cm4gcmVzOworCit9CisKIAogR19E RUZJTkVfVFlQRShXZWJLaXRET01UZXN0T2JqLCB3ZWJraXRfZG9tX3Rlc3Rfb2JqLCBXRUJLSVRf VFlQRV9ET01fT0JKRUNUKQogCkBAIC01MTcsNiArNTI3LDcgQEAgZW51bSB7CiAgICAgUFJPUF9B VFRSX1dJVEhfU0VUVEVSX0VYQ0VQVElPTiwKICAgICBQUk9QX0FUVFJfV0lUSF9HRVRURVJfRVhD RVBUSU9OLAogICAgIFBST1BfQ1VTVE9NX0FUVFIsCisgICAgUFJPUF9TQ1JJUFRfU1RSSU5HX0FU VFIsCiB9OwogCiAKQEAgLTY0MCw2ICs2NTEsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0X2RvbV90 ZXN0X29ial9nZXRfcHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBHVmEK ICAgICAgICAgIGdfdmFsdWVfc2V0X2xvbmcodmFsdWUsIGNvcmVTZWxmLT5hdHRyV2l0aEdldHRl ckV4Y2VwdGlvbigpKTsKICAgICAgICAgIGJyZWFrOwogICAgIH0KKyAgICBjYXNlIFBST1BfU0NS SVBUX1NUUklOR19BVFRSOgorICAgIHsKKyAgICAgICAgIGdfdmFsdWVfdGFrZV9zdHJpbmcodmFs dWUsIGNvbnZlcnRUb1VURjhTdHJpbmcoY29yZVNlbGYtPnNjcmlwdFN0cmluZ0F0dHIoKSkpOwor ICAgICAgICAgYnJlYWs7CisgICAgfQogICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9X QVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CiAgICAgICAg IGJyZWFrOwpAQCAtNzQ1LDYgKzc2MSwxMyBAQCBHX01BWExPTkcsIC8qIG1heCAqLwogR19NQVhM T05HLCAvKiBtYXggKi8KIDAsIC8qIGRlZmF1bHQgKi8KICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JFQURXUklU RSkpOworICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdvYmplY3RDbGFzcywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1BfU0NSSVBUX1NUUklOR19B VFRSLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVjX3N0 cmluZygic2NyaXB0LXN0cmluZy1hdHRyIiwgLyogbmFtZSAqLworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGVzdF9vYmpfc2NyaXB0 LXN0cmluZy1hdHRyIiwgLyogc2hvcnQgZGVzY3JpcHRpb24gKi8KKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInJlYWQtb25seSAgZ2No YXIqICBUZXN0T2JqLnNjcmlwdC1zdHJpbmctYXR0ciIsIC8qIGxvbmdlciAtIGNvdWxkIGRvIHdp dGggc29tZSBleHRyYSBkb2Mgc3R1ZmYgaGVyZSAqLworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiIiwgLyogZGVmYXVsdCAqLworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBX RUJLSVRfUEFSQU1fUkVBREFCTEUpKTsKIAogCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5oIGIvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmgKaW5kZXggZWM3YWE1 My4uZjhhZDljNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09i amVjdC9XZWJLaXRET01UZXN0T2JqLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmgKQEAgLTE2OSw2ICsxNjksOSBAQCB3ZWJraXRf ZG9tX3Rlc3Rfb2JqX2dldF9hdHRyX3dpdGhfZ2V0dGVyX2V4Y2VwdGlvbiAoV2ViS2l0RE9NVGVz dE9iaiAqc2VsZik7CiBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF9kb21fdGVzdF9vYmpfc2V0X2F0 dHJfd2l0aF9nZXR0ZXJfZXhjZXB0aW9uIChXZWJLaXRET01UZXN0T2JqICpzZWxmLCBnbG9uZyB2 YWx1ZSk7CiAKK1dFQktJVF9BUEkgZ2NoYXIqIAord2Via2l0X2RvbV90ZXN0X29ial9nZXRfc2Ny aXB0X3N0cmluZ19hdHRyIChXZWJLaXRET01UZXN0T2JqICpzZWxmKTsKKwogR19FTkRfREVDTFMK IAogI2VuZGlmIC8qIFdlYktpdERPTVRlc3RPYmpfaCAqLwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcCBiL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAKaW5kZXggZDY4MDQxZS4uZGE5OWRlMiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcAor KysgYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCkBAIC00 Niw3ICs0Niw3IEBAIEFTU0VSVF9DTEFTU19GSVRTX0lOX0NFTEwoSlNUZXN0T2JqKTsKICNkZWZp bmUgVEhVTktfR0VORVJBVE9SKGdlbmVyYXRvcikKICNlbmRpZgogCi1zdGF0aWMgY29uc3QgSGFz aFRhYmxlVmFsdWUgSlNUZXN0T2JqVGFibGVWYWx1ZXNbMTRdID0KK3N0YXRpYyBjb25zdCBIYXNo VGFibGVWYWx1ZSBKU1Rlc3RPYmpUYWJsZVZhbHVlc1sxNV0gPQogewogICAgIHsgInJlYWRPbmx5 SW50QXR0ciIsIERvbnREZWxldGV8UmVhZE9ubHksIChpbnRwdHJfdClzdGF0aWNfY2FzdDxQcm9w ZXJ0eVNsb3Q6OkdldFZhbHVlRnVuYz4oanNUZXN0T2JqUmVhZE9ubHlJbnRBdHRyKSwgKGludHB0 cl90KTAgVEhVTktfR0VORVJBVE9SKDApIH0sCiAgICAgeyAicmVhZE9ubHlTdHJpbmdBdHRyIiwg RG9udERlbGV0ZXxSZWFkT25seSwgKGludHB0cl90KXN0YXRpY19jYXN0PFByb3BlcnR5U2xvdDo6 R2V0VmFsdWVGdW5jPihqc1Rlc3RPYmpSZWFkT25seVN0cmluZ0F0dHIpLCAoaW50cHRyX3QpMCBU SFVOS19HRU5FUkFUT1IoMCkgfSwKQEAgLTYwLDYgKzYwLDcgQEAgc3RhdGljIGNvbnN0IEhhc2hU YWJsZVZhbHVlIEpTVGVzdE9ialRhYmxlVmFsdWVzWzE0XSA9CiAgICAgeyAiYXR0cldpdGhTZXR0 ZXJFeGNlcHRpb24iLCBEb250RGVsZXRlLCAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8UHJvcGVydHlT bG90OjpHZXRWYWx1ZUZ1bmM+KGpzVGVzdE9iakF0dHJXaXRoU2V0dGVyRXhjZXB0aW9uKSwgKGlu dHB0cl90KXNldEpTVGVzdE9iakF0dHJXaXRoU2V0dGVyRXhjZXB0aW9uIFRIVU5LX0dFTkVSQVRP UigwKSB9LAogICAgIHsgImF0dHJXaXRoR2V0dGVyRXhjZXB0aW9uIiwgRG9udERlbGV0ZSwgKGlu dHB0cl90KXN0YXRpY19jYXN0PFByb3BlcnR5U2xvdDo6R2V0VmFsdWVGdW5jPihqc1Rlc3RPYmpB dHRyV2l0aEdldHRlckV4Y2VwdGlvbiksIChpbnRwdHJfdClzZXRKU1Rlc3RPYmpBdHRyV2l0aEdl dHRlckV4Y2VwdGlvbiBUSFVOS19HRU5FUkFUT1IoMCkgfSwKICAgICB7ICJjdXN0b21BdHRyIiwg RG9udERlbGV0ZSwgKGludHB0cl90KXN0YXRpY19jYXN0PFByb3BlcnR5U2xvdDo6R2V0VmFsdWVG dW5jPihqc1Rlc3RPYmpDdXN0b21BdHRyKSwgKGludHB0cl90KXNldEpTVGVzdE9iakN1c3RvbUF0 dHIgVEhVTktfR0VORVJBVE9SKDApIH0sCisgICAgeyAic2NyaXB0U3RyaW5nQXR0ciIsIERvbnRE ZWxldGV8UmVhZE9ubHksIChpbnRwdHJfdClzdGF0aWNfY2FzdDxQcm9wZXJ0eVNsb3Q6OkdldFZh bHVlRnVuYz4oanNUZXN0T2JqU2NyaXB0U3RyaW5nQXR0ciksIChpbnRwdHJfdCkwIFRIVU5LX0dF TkVSQVRPUigwKSB9LAogICAgIHsgImNvbnN0cnVjdG9yIiwgRG9udEVudW18UmVhZE9ubHksIChp bnRwdHJfdClzdGF0aWNfY2FzdDxQcm9wZXJ0eVNsb3Q6OkdldFZhbHVlRnVuYz4oanNUZXN0T2Jq Q29uc3RydWN0b3IpLCAoaW50cHRyX3QpMCBUSFVOS19HRU5FUkFUT1IoMCkgfSwKICAgICB7IDAs IDAsIDAsIDAgVEhVTktfR0VORVJBVE9SKDApIH0KIH07CkBAIC0zMjAsNiArMzIxLDE1IEBAIEpT VmFsdWUganNUZXN0T2JqQ3VzdG9tQXR0cihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJh c2UsIGNvbnN0IElkZW50aWZpZXImCiAgICAgcmV0dXJuIGNhc3RlZFRoaXMtPmN1c3RvbUF0dHIo ZXhlYyk7CiB9CiAKK0pTVmFsdWUganNUZXN0T2JqU2NyaXB0U3RyaW5nQXR0cihFeGVjU3RhdGUq IGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50aWZpZXImKQoreworICAgIEpTVGVz dE9iaiogY2FzdGVkVGhpcyA9IHN0YXRpY19jYXN0PEpTVGVzdE9iaio+KGFzT2JqZWN0KHNsb3RC YXNlKSk7CisgICAgVU5VU0VEX1BBUkFNKGV4ZWMpOworICAgIFRlc3RPYmoqIGltcCA9IHN0YXRp Y19jYXN0PFRlc3RPYmoqPihjYXN0ZWRUaGlzLT5pbXBsKCkpOworICAgIEpTVmFsdWUgcmVzdWx0 ID0ganNPd25lZFN0cmluZ09yTnVsbChleGVjLCBpbXAtPnNjcmlwdFN0cmluZ0F0dHIoKSk7Cisg ICAgcmV0dXJuIHJlc3VsdDsKK30KKwogSlNWYWx1ZSBqc1Rlc3RPYmpDb25zdHJ1Y3RvcihFeGVj U3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElkZW50aWZpZXImKQogewogICAg IEpTVGVzdE9iaiogZG9tT2JqZWN0ID0gc3RhdGljX2Nhc3Q8SlNUZXN0T2JqKj4oYXNPYmplY3Qo c2xvdEJhc2UpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pT L0pTVGVzdE9iai5oIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2Jq LmgKaW5kZXggNzA0NjIyZi4uZjcyNmVmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvSlMvSlNUZXN0T2JqLmgKQEAgLTEzMyw2ICsxMzMsNyBAQCBKU0M6OkpTVmFsdWUganNU ZXN0T2JqQXR0cldpdGhHZXR0ZXJFeGNlcHRpb24oSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFs dWUsIGNvbgogdm9pZCBzZXRKU1Rlc3RPYmpBdHRyV2l0aEdldHRlckV4Y2VwdGlvbihKU0M6OkV4 ZWNTdGF0ZSosIEpTQzo6SlNPYmplY3QqLCBKU0M6OkpTVmFsdWUpOwogSlNDOjpKU1ZhbHVlIGpz VGVzdE9iakN1c3RvbUF0dHIoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIGNvbnN0IEpT Qzo6SWRlbnRpZmllciYpOwogdm9pZCBzZXRKU1Rlc3RPYmpDdXN0b21BdHRyKEpTQzo6RXhlY1N0 YXRlKiwgSlNDOjpKU09iamVjdCosIEpTQzo6SlNWYWx1ZSk7CitKU0M6OkpTVmFsdWUganNUZXN0 T2JqU2NyaXB0U3RyaW5nQXR0cihKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZSwgY29uc3Qg SlNDOjpJZGVudGlmaWVyJik7CiBKU0M6OkpTVmFsdWUganNUZXN0T2JqQ29uc3RydWN0b3IoSlND OjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIGNvbnN0IEpTQzo6SWRlbnRpZmllciYpOwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9PYmpDL0RPTVRlc3RPYmouaCBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L09iakMvRE9NVGVzdE9iai5oCmluZGV4IGQxM2ZmNTIuLmRkOWQyZWUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVzdE9iai5oCisrKyBiL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVzdE9iai5oCkBAIC01NSw2ICs1NSw3 IEBACiAtICh2b2lkKXNldEF0dHJXaXRoR2V0dGVyRXhjZXB0aW9uOihpbnQpbmV3QXR0cldpdGhH ZXR0ZXJFeGNlcHRpb247CiAtIChpbnQpY3VzdG9tQXR0cjsKIC0gKHZvaWQpc2V0Q3VzdG9tQXR0 cjooaW50KW5ld0N1c3RvbUF0dHI7CistIChOU1N0cmluZyAqKXNjcmlwdFN0cmluZ0F0dHI7CiAt ICh2b2lkKXZvaWRNZXRob2Q7CiAtICh2b2lkKXZvaWRNZXRob2RXaXRoQXJnczooaW50KWludEFy ZyBzdHJBcmc6KE5TU3RyaW5nICopc3RyQXJnIG9iakFyZzooRE9NVGVzdE9iaiAqKW9iakFyZzsK IC0gKGludClpbnRNZXRob2Q7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv dGVzdC9PYmpDL0RPTVRlc3RPYmoubW0gYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9P YmpDL0RPTVRlc3RPYmoubW0KaW5kZXggNzI1NzQ2OS4uYjk2NGUzNiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0T2JqLm1tCisrKyBiL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVzdE9iai5tbQpAQCAtMTc3LDYgKzE3 NywxMSBAQAogICAgIElNUEwtPnNldEN1c3RvbUF0dHIobmV3Q3VzdG9tQXR0cik7CiB9CiAKKy0g KE5TU3RyaW5nICopc2NyaXB0U3RyaW5nQXR0cgoreworICAgIHJldHVybiBJTVBMLT5zY3JpcHRT dHJpbmdBdHRyKCk7Cit9CisKIC0gKHZvaWQpdm9pZE1ldGhvZAogewogICAgIElNUEwtPnZvaWRN ZXRob2QoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RP YmouaWRsIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKaW5kZXgg NWY5ZWNlMy4uYjE0MzI4ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVGVzdE9iai5pZGwKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9i ai5pZGwKQEAgLTg5LDYgKzg5LDkgQEAgbW9kdWxlIHRlc3QgewogICAgICAgICB2b2lkICAgIG1l dGhvZFdpdGhOb25PcHRpb25hbEFyZ0FuZE9wdGlvbmFsQXJnKGluIGxvbmcgbm9uT3B0LCBpbiBb T3B0aW9uYWxdIGxvbmcgb3B0KTsKICAgICAgICAgdm9pZCAgICBtZXRob2RXaXRoTm9uT3B0aW9u YWxBcmdBbmRUd29PcHRpb25hbEFyZ3MoaW4gbG9uZyBub25PcHQsIGluIFtPcHRpb25hbF0gbG9u ZyBvcHQxLCBpbiBsb25nIG9wdDIpOwogCisgICAgICAgIC8vICdDb252ZXJ0U2NyaXB0U3RyaW5n JyBleHRlbmRlZCBhdHRyaWJ1dGUKKyAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFtDb252ZXJ0 U2NyaXB0U3RyaW5nXSBET01TdHJpbmcgc2NyaXB0U3RyaW5nQXR0cjsKKwogI2lmZGVmIFRFU1RJ TkdfVjgKICAgICAgICAgLy8gT3ZlcmxvYWRzCiAgICAgICAgIHZvaWQgICAgb3ZlcmxvYWRlZE1l dGhvZChpbiBUZXN0T2JqIG9iakFyZywgaW4gRE9NU3RyaW5nIHN0ckFyZyk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwIGIvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcAppbmRleCBmNWExY2M2Li45 NGRjZDVlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRl c3RPYmouY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9i ai5jcHAKQEAgLTE5OSw2ICsxOTksMTMgQEAgc3RhdGljIHZvaWQgYXR0cldpdGhHZXR0ZXJFeGNl cHRpb25BdHRyU2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCB2ODo6TG8KICAgICBy ZXR1cm47CiB9CiAKK3N0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gc2NyaXB0U3RyaW5nQXR0 ckF0dHJHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nlc3Nv ckluZm8mIGluZm8pCit7CisgICAgSU5DX1NUQVRTKCJET00uVGVzdE9iai5zY3JpcHRTdHJpbmdB dHRyLl9nZXQiKTsKKyAgICBUZXN0T2JqKiBpbXAgPSBWOFRlc3RPYmo6OnRvTmF0aXZlKGluZm8u SG9sZGVyKCkpOworICAgIHY4U3RyaW5nT3JOdWxsKGV4ZWMsIGltcC0+c2NyaXB0U3RyaW5nQXR0 cigpKTsKK30KKwogc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2b2lkTWV0aG9kQ2FsbGJh Y2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKIHsKICAgICBJTkNfU1RBVFMoIkRPTS5UZXN0 T2JqLnZvaWRNZXRob2QiKTsKQEAgLTU4Myw2ICs1OTAsOCBAQCBzdGF0aWMgY29uc3QgQmF0Y2hl ZEF0dHJpYnV0ZSBUZXN0T2JqQXR0cnNbXSA9IHsKICAgICB7ImF0dHJXaXRoR2V0dGVyRXhjZXB0 aW9uIiwgVGVzdE9iakludGVybmFsOjphdHRyV2l0aEdldHRlckV4Y2VwdGlvbkF0dHJHZXR0ZXIs IFRlc3RPYmpJbnRlcm5hbDo6YXR0cldpdGhHZXR0ZXJFeGNlcHRpb25BdHRyU2V0dGVyLCAwIC8q IG5vIGRhdGEgKi8sIHN0YXRpY19jYXN0PHY4OjpBY2Nlc3NDb250cm9sPih2ODo6REVGQVVMVCks IHN0YXRpY19jYXN0PHY4OjpQcm9wZXJ0eUF0dHJpYnV0ZT4odjg6Ok5vbmUpLCAwIC8qIG9uIGlu c3RhbmNlICovfSwKICAgICAvLyBBdHRyaWJ1dGUgJ2N1c3RvbUF0dHInIChUeXBlOiAnYXR0cmli dXRlJyBFeHRBdHRyOiAnQ3VzdG9tJykKICAgICB7ImN1c3RvbUF0dHIiLCBWOFRlc3RPYmo6OmN1 c3RvbUF0dHJBY2Nlc3NvckdldHRlciwgVjhUZXN0T2JqOjpjdXN0b21BdHRyQWNjZXNzb3JTZXR0 ZXIsIDAgLyogbm8gZGF0YSAqLywgc3RhdGljX2Nhc3Q8djg6OkFjY2Vzc0NvbnRyb2w+KHY4OjpE RUZBVUxUKSwgc3RhdGljX2Nhc3Q8djg6OlByb3BlcnR5QXR0cmlidXRlPih2ODo6Tm9uZSksIDAg Lyogb24gaW5zdGFuY2UgKi99LAorICAgIC8vIEF0dHJpYnV0ZSAnc2NyaXB0U3RyaW5nQXR0cicg KFR5cGU6ICdyZWFkb25seSBhdHRyaWJ1dGUnIEV4dEF0dHI6ICdDb252ZXJ0U2NyaXB0U3RyaW5n JykKKyAgICB7InNjcmlwdFN0cmluZ0F0dHIiLCBUZXN0T2JqSW50ZXJuYWw6OnNjcmlwdFN0cmlu Z0F0dHJBdHRyR2V0dGVyLCAwLCAwIC8qIG5vIGRhdGEgKi8sIHN0YXRpY19jYXN0PHY4OjpBY2Nl c3NDb250cm9sPih2ODo6REVGQVVMVCksIHN0YXRpY19jYXN0PHY4OjpQcm9wZXJ0eUF0dHJpYnV0 ZT4odjg6Ok5vbmUpLCAwIC8qIG9uIGluc3RhbmNlICovfSwKIH07CiBzdGF0aWMgY29uc3QgQmF0 Y2hlZENhbGxiYWNrIFRlc3RPYmpDYWxsYmFja3NbXSA9IHsKICAgICB7InZvaWRNZXRob2QiLCBU ZXN0T2JqSW50ZXJuYWw6OnZvaWRNZXRob2RDYWxsYmFja30sCg==