115704 2013-05-06 20:25:10 -0700 Add an 'isReadOnly' member to IDL parse tree structure 2013-05-07 10:41:40 -0700 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez haraken sam webkit-bug-importer oldest_to_newest 885576 0 rniwa 2013-05-06 20:25:10 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/4ad98871532331133edfc121aed6b040c5eb5a24 885579 1 200868 rniwa 2013-05-06 20:40:59 -0700 Created attachment 200868 Cleanup 885580 2 200868 haraken 2013-05-06 20:42:53 -0700 Comment on attachment 200868 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=200868&action=review Thanks for merging! > Source/WebCore/ChangeLog:12 > + No new tests (OOPS!). Nit: Remove OOPS. 885817 3 rniwa 2013-05-07 10:41:40 -0700 Committed r149679: <http://trac.webkit.org/changeset/149679> 200868 2013-05-06 20:40:59 -0700 2013-05-06 20:42:53 -0700 Cleanup bug-115704-20130506204006.patch text/plain 12822 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTY1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA1LTA2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBhbiAnaXNSZWFkT25seScg bWVtYmVyIHRvIElETCBwYXJzZSB0cmVlIHN0cnVjdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NzA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuICdpc1JlYWRPbmx5JyBtZW1iZXIgdG8g SURMIHBhcnNlIHRyZWUgc3RydWN0dXJlIGJ5IG1lcmdpbmcKKyAgICAgICAgaHR0cHM6Ly9jaHJv bWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysvZDZhZGQ4MGVjZDA4YmNkODhh NmFlMGUxNjk4ZDkyOTgzMGIzYmQ4YgorICAgICAgICBhbmQgdXBkYXRlIE9iamVjdGl2ZS1DLCBD KyssIGFuZCBHT2JqZWN0IGJpbmRpbmcgZ2VuZXJhdG9ycyB0byB1c2UgaXNSZWFkT25seS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckNQUC5wbToKKyAgICAgICAgKEdlbmVyYXRlSGVhZGVyKToKKyAgICAg ICAgKEdlbmVyYXRlSW1wbGVtZW50YXRpb24pOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckdPYmplY3QucG06CisgICAgICAgIChHZXRXcml0ZWFibGVQcm9wZXJ0aWVz KToKKyAgICAgICAgKEdlbmVyYXRlUHJvcGVydHkpOgorICAgICAgICAoR2VuZXJhdGVGdW5jdGlv bnMpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAg ICAgICAoSXNSZWFkb25seSk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yT2JqQy5wbToKKyAgICAgICAgKEdlbmVyYXRlSGVhZGVyKToKKyAgICAgICAgKEdlbmVyYXRl SW1wbGVtZW50YXRpb24pOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBt OgorICAgICAgICAocGFyc2VBdHRyaWJ1dGVSZXN0KToKKyAgICAgICAgKHBhcnNlRXhjZXB0aW9u RmllbGQpOgorICAgICAgICAocGFyc2VBdHRyaWJ1dGVSZXN0T2xkKToKKwogMjAxMy0wNS0wNiAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIE93blB0ciBpbnN0 ZWFkIG9mIGRlbGV0ZUFsbFZhbHVlcyBpbiBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXIKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckNQUC5wbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JD UFAucG0JKHJldmlzaW9uIDE0OTY1NikKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckNQUC5wbQkod29ya2luZyBjb3B5KQpAQCAtNDM5LDcgKzQzOSw2IEBA IHN1YiBHZW5lcmF0ZUhlYWRlcgogICAgICAgICAgICAgbXkgJGF0dHJpYnV0ZUNvbmRpdGlvbmFs U3RyaW5nID0gJGNvZGVHZW5lcmF0b3ItPkdlbmVyYXRlQ29uZGl0aW9uYWxTdHJpbmcoJGF0dHJp YnV0ZS0+c2lnbmF0dXJlKTsKICAgICAgICAgICAgIG15ICRhdHRyaWJ1dGVOYW1lID0gJGF0dHJp YnV0ZS0+c2lnbmF0dXJlLT5uYW1lOwogICAgICAgICAgICAgbXkgJGF0dHJpYnV0ZVR5cGUgPSBH ZXRDUFBUeXBlKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+dHlwZSwgMCk7Ci0gICAgICAgICAgICBt eSAkYXR0cmlidXRlSXNSZWFkb25seSA9ICgkYXR0cmlidXRlLT50eXBlID1+IC9ecmVhZG9ubHkv KTsKICAgICAgICAgICAgIG15ICRwcm9wZXJ0eSA9ICIiOwogICAgICAgICAgICAgCiAgICAgICAg ICAgICAkcHJvcGVydHkgLj0gIiNpZiAke2F0dHJpYnV0ZUNvbmRpdGlvbmFsU3RyaW5nfVxuIiBp ZiAkYXR0cmlidXRlQ29uZGl0aW9uYWxTdHJpbmc7CkBAIC00NTUsNyArNDU0LDcgQEAgc3ViIEdl bmVyYXRlSGVhZGVyCiAKICAgICAgICAgICAgICRwcm9wZXJ0eSAuPSAkZGVjbGFyYXRpb25TdWZm aXg7CiAgICAgICAgICAgICBwdXNoKEBoZWFkZXJBdHRyaWJ1dGVzLCAkcHJvcGVydHkpOwotICAg ICAgICAgICAgaWYgKCEkYXR0cmlidXRlSXNSZWFkb25seSBhbmQgISRhdHRyaWJ1dGUtPnNpZ25h dHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlJlcGxhY2VhYmxlIn0pIHsKKyAgICAgICAgICAg IGlmICghJGF0dHJpYnV0ZS0+aXNSZWFkT25seSBhbmQgISRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlJlcGxhY2VhYmxlIn0pIHsKICAgICAgICAgICAgICAgICAk cHJvcGVydHkgPSAiICAgIHZvaWQgJHNldHRlck5hbWUoJGF0dHJpYnV0ZVR5cGUpIjsKICAgICAg ICAgICAgICAgICAkcHJvcGVydHkgLj0gJGRlY2xhcmF0aW9uU3VmZml4OwogICAgICAgICAgICAg ICAgIHB1c2goQGhlYWRlckF0dHJpYnV0ZXMsICRwcm9wZXJ0eSk7IApAQCAtNjk2LDcgKzY5NSw2 IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAKICAgICAgICAgICAgIG15ICRhdHRyaWJ1 dGVOYW1lID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1lOwogICAgICAgICAgICAgbXkgJGF0 dHJpYnV0ZVR5cGUgPSBHZXRDUFBUeXBlKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+dHlwZSwgMCk7 Ci0gICAgICAgICAgICBteSAkYXR0cmlidXRlSXNSZWFkb25seSA9ICgkYXR0cmlidXRlLT50eXBl ID1+IC9ecmVhZG9ubHkvKTsKICAgICAgICAgICAgIG15ICRhdHRyaWJ1dGVJc051bGxhYmxlID0g JGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5pc051bGxhYmxlOwogCiAgICAgICAgICAgICAkYXR0cmli dXRlTmFtZXN7JGF0dHJpYnV0ZU5hbWV9ID0gMTsKQEAgLTc2Myw3ICs3NjEsNyBAQCBzdWIgR2Vu ZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJ9XG5c biIpOwogCiAgICAgICAgICAgICAjIC0gU0VUVEVSCi0gICAgICAgICAgICBpZiAoISRhdHRyaWJ1 dGVJc1JlYWRvbmx5IGFuZCAhJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0 ZXMtPnsiUmVwbGFjZWFibGUifSkgeworICAgICAgICAgICAgaWYgKCEkYXR0cmlidXRlLT5pc1Jl YWRPbmx5IGFuZCAhJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi UmVwbGFjZWFibGUifSkgewogICAgICAgICAgICAgICAgICMgRXhjZXB0aW9uIGhhbmRsaW5nCiAg ICAgICAgICAgICAgICAgbXkgJGhhc1NldHRlckV4Y2VwdGlvbiA9IEB7JGF0dHJpYnV0ZS0+c2V0 dGVyRXhjZXB0aW9uc307CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckdPYmplY3QucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQkocmV2aXNpb24gMTQ5NjU2KQor KysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5w bQkod29ya2luZyBjb3B5KQpAQCAtMzg2LDcgKzM4Niw2IEBAIHN1YiBHZXRXcml0ZWFibGVQcm9w ZXJ0aWVzIHsKICAgICBteSBAcmVzdWx0ID0gKCk7CiAKICAgICBmb3JlYWNoIG15ICRwcm9wZXJ0 eSAoQHskcHJvcGVydGllc30pIHsKLSAgICAgICAgbXkgJHdyaXRlYWJsZSA9ICRwcm9wZXJ0eS0+ dHlwZSAhfiAvXnJlYWRvbmx5LzsKICAgICAgICAgbXkgJGd0eXBlID0gR2V0R1ZhbHVlVHlwZU5h bWUoJHByb3BlcnR5LT5zaWduYXR1cmUtPnR5cGUpOwogICAgICAgICBteSAkaGFzR3R5cGVTaWdu YXR1cmUgPSAoJGd0eXBlIGVxICJib29sZWFuIiB8fCAkZ3R5cGUgZXEgImZsb2F0IiB8fCAkZ3R5 cGUgZXEgImRvdWJsZSIgfHwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICRndHlw ZSBlcSAidWludDY0IiB8fCAkZ3R5cGUgZXEgInVsb25nIiB8fCAkZ3R5cGUgZXEgImxvbmciIHx8 IApAQCAtMzk1LDcgKzM5NCw3IEBAIHN1YiBHZXRXcml0ZWFibGVQcm9wZXJ0aWVzIHsKICAgICAg ICAgIyBGSVhNRTogV2UgYXJlIG5vdCBnZW5lcmF0aW5nIHNldHRlcnMgZm9yICdSZXBsYWNlYWJs ZScKICAgICAgICAgIyBhdHRyaWJ1dGVzIG5vdywgYnV0IHdlIHNob3VsZCBzb21laG93LgogICAg ICAgICBteSAkcmVwbGFjZWFibGUgPSAkcHJvcGVydHktPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IlJlcGxhY2VhYmxlIn07Ci0gICAgICAgIGlmICgkd3JpdGVhYmxlICYmICRoYXNH dHlwZVNpZ25hdHVyZSAmJiAhJHJlcGxhY2VhYmxlKSB7CisgICAgICAgIGlmICghJHByb3BlcnR5 LT5pc1JlYWRPbmx5ICYmICRoYXNHdHlwZVNpZ25hdHVyZSAmJiAhJHJlcGxhY2VhYmxlKSB7CiAg ICAgICAgICAgICBwdXNoKEByZXN1bHQsICRwcm9wZXJ0eSk7CiAgICAgICAgIH0KICAgICB9CkBA IC00NjAsNyArNDU5LDcgQEAgc3ViIEdlbmVyYXRlUHJvcGVydHkgewogCiAgICAgbXkgJGd0eXBl ID0gR2V0R1ZhbHVlVHlwZU5hbWUoJHByb3BUeXBlKTsKICAgICBteSAkZ3BhcmFtZmxhZyA9ICJX RUJLSVRfUEFSQU1fUkVBREFCTEUiOwotICAgIG15ICR3cml0ZWFibGUgPSAkYXR0cmlidXRlLT50 eXBlICF+IC9ecmVhZG9ubHkvOworICAgIG15ICR3cml0ZWFibGUgPSAhJGF0dHJpYnV0ZS0+aXNS ZWFkT25seTsKICAgICBteSAkY29uc3QgPSAicmVhZC1vbmx5ICI7CiAgICAgbXkgJGN1c3RvbSA9 ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3RvbSJ9Owog ICAgIGlmICgkd3JpdGVhYmxlICYmICRjdXN0b20pIHsKQEAgLTEyMzMsOCArMTIzMiw3IEBAIHN1 YiBHZW5lcmF0ZUZ1bmN0aW9ucyB7CiAKICAgICAgICAgIyBGSVhNRTogV2UgYXJlIG5vdCBnZW5l cmF0aW5nIHNldHRlcnMgZm9yICdSZXBsYWNlYWJsZScKICAgICAgICAgIyBhdHRyaWJ1dGVzIG5v dywgYnV0IHdlIHNob3VsZCBzb21laG93LgotICAgICAgICBpZiAoJGF0dHJpYnV0ZS0+dHlwZSA9 fiAvXnJlYWRvbmx5LyB8fAotICAgICAgICAgICAgJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiUmVwbGFjZWFibGUifSkgeworICAgICAgICBpZiAoJGF0dHJpYnV0 ZS0+aXNSZWFkT25seSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRl cy0+eyJSZXBsYWNlYWJsZSJ9KSB7CiAgICAgICAgICAgICBuZXh0IFRPUDsKICAgICAgICAgfQog ICAgICAgICAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckpTLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckpTLnBtCShyZXZpc2lvbiAxNDk2NTYpCisrKyBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkod29ya2luZyBjb3B5KQpAQCAtMjY1 LDcgKzI2NSw3IEBAIHN1YiBJc1NjcmlwdFByb2ZpbGVUeXBlCiBzdWIgSXNSZWFkb25seQogewog ICAgIG15ICRhdHRyaWJ1dGUgPSBzaGlmdDsKLSAgICByZXR1cm4gJGF0dHJpYnV0ZS0+dHlwZSA9 fiAvcmVhZG9ubHkvICYmICEkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRl cy0+eyJSZXBsYWNlYWJsZSJ9OworICAgIHJldHVybiAkYXR0cmlidXRlLT5pc1JlYWRPbmx5ICYm ICEkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJSZXBsYWNlYWJs ZSJ9OwogfQogCiBzdWIgQWRkVHlwZWRlZkZvclNjcmlwdFByb2ZpbGVUeXBlCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMu cG0JKHJldmlzaW9uIDE0OTY1NikKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvck9iakMucG0JKHdvcmtpbmcgY29weSkKQEAgLTc4OCw5ICs3ODgsNyBAQCBz dWIgR2VuZXJhdGVIZWFkZXIKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgbXkgJGF0dHJp YnV0ZVR5cGUgPSBHZXRPYmpDVHlwZSgkYXR0cmlidXRlLT5zaWduYXR1cmUtPnR5cGUpOwotICAg ICAgICAgICAgbXkgJGF0dHJpYnV0ZUlzUmVhZG9ubHkgPSAoJGF0dHJpYnV0ZS0+dHlwZSA9fiAv XnJlYWRvbmx5Lyk7Ci0KLSAgICAgICAgICAgIG15ICRwcm9wZXJ0eSA9ICJcQHByb3BlcnR5IiAu IEdldFByb3BlcnR5QXR0cmlidXRlcygkYXR0cmlidXRlLT5zaWduYXR1cmUtPnR5cGUsICRhdHRy aWJ1dGVJc1JlYWRvbmx5KTsKKyAgICAgICAgICAgIG15ICRwcm9wZXJ0eSA9ICJcQHByb3BlcnR5 IiAuIEdldFByb3BlcnR5QXR0cmlidXRlcygkYXR0cmlidXRlLT5zaWduYXR1cmUtPnR5cGUsICRh dHRyaWJ1dGUtPmlzUmVhZE9ubHkpOwogICAgICAgICAgICAgIyBTb21lIFNWR0ZFKkVsZW1lbnQu aWRsIHVzZSAnb3BlcmF0b3InIGFzIGF0dHJpYnV0ZSBuYW1lLCByZXdyaXRlIGFzICdfb3BlcmF0 b3InIHRvIGF2b2lkIGNsYXNoZXMgd2l0aCBDL0MrKwogICAgICAgICAgICAgJGF0dHJpYnV0ZU5h bWUgPX4gcy9vcGVyYXRvci9fb3BlcmF0b3IvIGlmICgkYXR0cmlidXRlTmFtZSA9fiAvb3BlcmF0 b3IvKTsKICAgICAgICAgICAgICRwcm9wZXJ0eSAuPSAiICIgLiAkYXR0cmlidXRlVHlwZSAuICgk YXR0cmlidXRlVHlwZSA9fiAvXCokLyA/ICIiIDogIiAiKSAuICRhdHRyaWJ1dGVOYW1lOwpAQCAt MTE2Niw3ICsxMTY0LDYgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KIAogICAgICAgICAg ICAgbXkgJGF0dHJpYnV0ZU5hbWUgPSAkYXR0cmlidXRlLT5zaWduYXR1cmUtPm5hbWU7CiAgICAg ICAgICAgICBteSAkYXR0cmlidXRlVHlwZSA9IEdldE9iakNUeXBlKCRhdHRyaWJ1dGUtPnNpZ25h dHVyZS0+dHlwZSk7Ci0gICAgICAgICAgICBteSAkYXR0cmlidXRlSXNSZWFkb25seSA9ICgkYXR0 cmlidXRlLT50eXBlID1+IC9ecmVhZG9ubHkvKTsKICAgICAgICAgICAgIG15ICRhdHRyaWJ1dGVD bGFzc05hbWUgPSBHZXRDbGFzc05hbWUoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT50eXBlKTsKIAog ICAgICAgICAgICAgbXkgJGF0dHJpYnV0ZUludGVyZmFjZU5hbWUgPSAkYXR0cmlidXRlTmFtZTsK QEAgLTEzODEsNyArMTM3OCw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAg ICAgICBwdXNoKEBpbXBsQ29udGVudCwgIn1cbiIpOwogCiAgICAgICAgICAgICAjIC0gU0VUVEVS Ci0gICAgICAgICAgICBpZiAoISRhdHRyaWJ1dGVJc1JlYWRvbmx5KSB7CisgICAgICAgICAgICBp ZiAoISRhdHRyaWJ1dGUtPmlzUmVhZE9ubHkpIHsKICAgICAgICAgICAgICAgICAjIEV4Y2VwdGlv biBoYW5kbGluZwogICAgICAgICAgICAgICAgIG15ICRoYXNTZXR0ZXJFeGNlcHRpb24gPSBAeyRh dHRyaWJ1dGUtPnNldHRlckV4Y2VwdGlvbnN9OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQkocmV2aXNpb24gMTQ5NjU2KQorKysgU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0JKHdvcmtpbmcgY29weSkKQEAg LTY2LDYgKzY2LDcgQEAgc3RydWN0KCBkb21GdW5jdGlvbiA9PiB7CiBzdHJ1Y3QoIGRvbUF0dHJp YnV0ZSA9PiB7CiAgICAgdHlwZSA9PiAnJCcsICAgICAgICAgICAgICAjIEF0dHJpYnV0ZSB0eXBl IChpbmNsdWRpbmcgbmFtZXNwYWNlKQogICAgIGlzU3RhdGljID0+ICckJywKKyAgICBpc1JlYWRP bmx5ID0+ICckJywKICAgICBzaWduYXR1cmUgPT4gJyQnLCAgICAgICAgICMgQXR0cmlidXRlIHNp Z25hdHVyZQogICAgIGdldHRlckV4Y2VwdGlvbnMgPT4gJ0AnLCAgIyBQb3NzaWJseSByYWlzZWQg ZXhjZXB0aW9ucy4KICAgICBzZXR0ZXJFeGNlcHRpb25zID0+ICdAJywgICMgUG9zc2libHkgcmFp c2VkIGV4Y2VwdGlvbnMuCkBAIC0xMTQxLDcgKzExNDIsOCBAQCBzdWIgcGFyc2VBdHRyaWJ1dGVS ZXN0CiAgICAgaWYgKCRuZXh0LT52YWx1ZSgpID1+IC8kbmV4dEF0dHJpYnV0ZVJlc3RfMS8pIHsK ICAgICAgICAgbXkgJG5ld0RhdGFOb2RlID0gZG9tQXR0cmlidXRlLT5uZXcoKTsKICAgICAgICAg aWYgKCRzZWxmLT5wYXJzZVJlYWRPbmx5KCkpIHsKLSAgICAgICAgICAgICRuZXdEYXRhTm9kZS0+ dHlwZSgicmVhZG9ubHkgYXR0cmlidXRlIik7CisgICAgICAgICAgICAkbmV3RGF0YU5vZGUtPnR5 cGUoImF0dHJpYnV0ZSIpOworICAgICAgICAgICAgJG5ld0RhdGFOb2RlLT5pc1JlYWRPbmx5KDEp OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgJG5ld0RhdGFOb2RlLT50eXBlKCJhdHRy aWJ1dGUiKTsKICAgICAgICAgfQpAQCAtMTQ5OCw3ICsxNTAwLDggQEAgc3ViIHBhcnNlRXhjZXB0 aW9uRmllbGQKICAgICBteSAkbmV4dCA9ICRzZWxmLT5uZXh0VG9rZW4oKTsKICAgICBpZiAoJG5l eHQtPnR5cGUoKSA9PSBJZGVudGlmaWVyVG9rZW4gfHwgJG5leHQtPnZhbHVlKCkgPX4gLyRuZXh0 RXhjZXB0aW9uRmllbGRfMS8pIHsKICAgICAgICAgbXkgJG5ld0RhdGFOb2RlID0gZG9tQXR0cmli dXRlLT5uZXcoKTsKLSAgICAgICAgJG5ld0RhdGFOb2RlLT50eXBlKCJyZWFkb25seSBhdHRyaWJ1 dGUiKTsKKyAgICAgICAgJG5ld0RhdGFOb2RlLT50eXBlKCJhdHRyaWJ1dGUiKTsKKyAgICAgICAg JG5ld0RhdGFOb2RlLT5pc1JlYWRPbmx5KDEpOwogICAgICAgICAkbmV3RGF0YU5vZGUtPnNpZ25h dHVyZShkb21TaWduYXR1cmUtPm5ldygpKTsKICAgICAgICAgJG5ld0RhdGFOb2RlLT5zaWduYXR1 cmUtPnR5cGUoJHNlbGYtPnBhcnNlVHlwZSgpKTsKICAgICAgICAgbXkgJHRva2VuID0gJHNlbGYt PmdldFRva2VuKCk7CkBAIC0yNDE0LDcgKzI0MTcsOCBAQCBzdWIgcGFyc2VBdHRyaWJ1dGVSZXN0 T2xkCiAgICAgaWYgKCRuZXh0LT52YWx1ZSgpID1+IC8kbmV4dEF0dHJpYnV0ZVJlc3RfMS8pIHsK ICAgICAgICAgbXkgJG5ld0RhdGFOb2RlID0gZG9tQXR0cmlidXRlLT5uZXcoKTsKICAgICAgICAg aWYgKCRzZWxmLT5wYXJzZVJlYWRPbmx5KCkpIHsKLSAgICAgICAgICAgICRuZXdEYXRhTm9kZS0+ dHlwZSgicmVhZG9ubHkgYXR0cmlidXRlIik7CisgICAgICAgICAgICAkbmV3RGF0YU5vZGUtPnR5 cGUoImF0dHJpYnV0ZSIpOworICAgICAgICAgICAgJG5ld0RhdGFOb2RlLT5pc1JlYWRPbmx5KDEp OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgJG5ld0RhdGFOb2RlLT50eXBlKCJhdHRy aWJ1dGUiKTsKICAgICAgICAgfQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ5NjU4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDUtMDYgIFJ5b3N1a2UgTml3YSAg PHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGFuICdpc1JlYWRPbmx5JyBtZW1iZXIg dG8gSURMIHBhcnNlIHRyZWUgc3RydWN0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgbmV3bHkgYWRkZWQgaXNSZWFkT25seSBhdHRyaWJ1dGUu CisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0JpbmRpbmdzL0Nv ZGVHZW5lcmF0b3JUZXN0UnVubmVyLnBtOgorICAgICAgICAoX2dlbmVyYXRlSGVhZGVyRmlsZSk6 CisgICAgICAgIChfZ2VuZXJhdGVJbXBsZW1lbnRhdGlvbkZpbGUpOgorICAgICAgICAoX3N0YXRp Y1ZhbHVlc0dldHRlckltcGxlbWVudGF0aW9uKToKKwogMjAxMy0wNS0wNiAgQ29tbWl0IFF1ZXVl ICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjE0OTU0Ny4KSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvQmluZGluZ3MvQ29kZUdlbmVyYXRvclRlc3RSdW5uZXIucG0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9CaW5kaW5ncy9Db2RlR2VuZXJhdG9y VGVzdFJ1bm5lci5wbQkocmV2aXNpb24gMTQ5NjU2KQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9CaW5kaW5ncy9Db2RlR2VuZXJhdG9yVGVzdFJ1bm5lci5wbQkod29y a2luZyBjb3B5KQpAQCAtMTg2LDcgKzE4Niw3IEBAIEVPRgogICAgICAgICBwdXNoKEBjb250ZW50 cywgIlxuICAgIC8vIEF0dHJpYnV0ZXNcblxuIik7CiAgICAgICAgIGZvcmVhY2ggbXkgJGF0dHJp YnV0ZSAoQGF0dHJpYnV0ZXMpIHsKICAgICAgICAgICAgIHB1c2goQGNvbnRlbnRzLCAiICAgIHN0 YXRpYyBKU1ZhbHVlUmVmIEB7WyRzZWxmLT5fZ2V0dGVyTmFtZSgkYXR0cmlidXRlKV19KEpTQ29u dGV4dFJlZiwgSlNPYmplY3RSZWYsIEpTU3RyaW5nUmVmLCBKU1ZhbHVlUmVmKik7XG4iKTsKLSAg ICAgICAgICAgIHB1c2goQGNvbnRlbnRzLCAiICAgIHN0YXRpYyBib29sIEB7WyRzZWxmLT5fc2V0 dGVyTmFtZSgkYXR0cmlidXRlKV19KEpTQ29udGV4dFJlZiwgSlNPYmplY3RSZWYsIEpTU3RyaW5n UmVmLCBKU1ZhbHVlUmVmLCBKU1ZhbHVlUmVmKik7XG4iKSB1bmxlc3MgJGF0dHJpYnV0ZS0+dHlw ZSA9fiAvXnJlYWRvbmx5LzsKKyAgICAgICAgICAgIHB1c2goQGNvbnRlbnRzLCAiICAgIHN0YXRp YyBib29sIEB7WyRzZWxmLT5fc2V0dGVyTmFtZSgkYXR0cmlidXRlKV19KEpTQ29udGV4dFJlZiwg SlNPYmplY3RSZWYsIEpTU3RyaW5nUmVmLCBKU1ZhbHVlUmVmLCBKU1ZhbHVlUmVmKik7XG4iKSB1 bmxlc3MgJGF0dHJpYnV0ZS0+aXNSZWFkT25seTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMzMw LDcgKzMzMCw3IEBAIEpTVmFsdWVSZWYgJHtjbGFzc05hbWV9Ojoke2dldHRlck5hbWV9KEoKIH0K IEVPRgogCi0gICAgICAgICAgICB1bmxlc3MgKCRhdHRyaWJ1dGUtPnR5cGUgPX4gL15yZWFkb25s eS8pIHsKKyAgICAgICAgICAgIHVubGVzcyAoJGF0dHJpYnV0ZS0+aXNSZWFkT25seSkgewogICAg ICAgICAgICAgICAgIHB1c2goQGNvbnRlbnRzLCA8PEVPRik7CiAKIGJvb2wgJHtjbGFzc05hbWV9 OjpAe1skc2VsZi0+X3NldHRlck5hbWUoJGF0dHJpYnV0ZSldfShKU0NvbnRleHRSZWYgY29udGV4 dCwgSlNPYmplY3RSZWYgb2JqZWN0LCBKU1N0cmluZ1JlZiwgSlNWYWx1ZVJlZiB2YWx1ZSwgSlNW YWx1ZVJlZiogZXhjZXB0aW9uKQpAQCAtNTU1LDExICs1NTUsMTAgQEAgc3ViIF9zdGF0aWNWYWx1 ZXNHZXR0ZXJJbXBsZW1lbnRhdGlvbgogICAgICAgICByZXR1cm4gaWYgJF8tPnNpZ25hdHVyZS0+ ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Ik5vSW1wbGVtZW50YXRpb24ifTsKIAogICAgICAgICBteSAk YXR0cmlidXRlTmFtZSA9ICRfLT5zaWduYXR1cmUtPm5hbWU7Ci0gICAgICAgIG15ICRhdHRyaWJ1 dGVJc1JlYWRvbmx5ID0gJF8tPnR5cGUgPX4gL15yZWFkb25seS87CiAgICAgICAgIG15ICRnZXR0 ZXJOYW1lID0gJHNlbGYtPl9nZXR0ZXJOYW1lKCRfKTsKLSAgICAgICAgbXkgJHNldHRlck5hbWUg PSAkYXR0cmlidXRlSXNSZWFkb25seSA/ICIwIiA6ICRzZWxmLT5fc2V0dGVyTmFtZSgkXyk7Cisg ICAgICAgIG15ICRzZXR0ZXJOYW1lID0gJF8tPmlzUmVhZE9ubHkgPyAiMCIgOiAkc2VsZi0+X3Nl dHRlck5hbWUoJF8pOwogICAgICAgICBteSBAYXR0cmlidXRlcyA9IHF3KGtKU1Byb3BlcnR5QXR0 cmlidXRlRG9udERlbGV0ZSk7Ci0gICAgICAgIHB1c2goQGF0dHJpYnV0ZXMsICJrSlNQcm9wZXJ0 eUF0dHJpYnV0ZVJlYWRPbmx5IikgaWYgJGF0dHJpYnV0ZUlzUmVhZG9ubHk7CisgICAgICAgIHB1 c2goQGF0dHJpYnV0ZXMsICJrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IikgaWYgJF8tPmlz UmVhZE9ubHk7CiAgICAgICAgIHB1c2goQGF0dHJpYnV0ZXMsICJrSlNQcm9wZXJ0eUF0dHJpYnV0 ZURvbnRFbnVtIikgaWYgJF8tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkRvbnRF bnVtIn07CiAKICAgICAgICAgcmV0dXJuICJ7IFwiJGF0dHJpYnV0ZU5hbWVcIiwgJGdldHRlck5h bWUsICRzZXR0ZXJOYW1lLCAiIC4gam9pbigiIHwgIiwgQGF0dHJpYnV0ZXMpIC4gIiB9IjsK