124948 2013-11-27 13:24:26 -0800 Make WKBrowsingContextGroup work with WKObject wrapping 2013-11-27 14:45:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue oldest_to_newest 954605 0 sam 2013-11-27 13:24:26 -0800 Make WKBrowsingContextGroup work with WKObject wrapping 954606 1 217966 sam 2013-11-27 13:32:10 -0800 Created attachment 217966 Patch 954607 2 commit-queue 2013-11-27 13:33:58 -0800 Attachment 217966 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/Shared/APIObject.h', u'Source/WebKit2/Shared/Cocoa/APIObject.mm', u'Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm', u'Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroupInternal.h', u'Source/WebKit2/UIProcess/WebPageGroup.cpp', u'Source/WebKit2/UIProcess/WebPageGroup.h', u'Source/WebKit2/WebKit2.xcodeproj/project.pbxproj']" exit_code: 1 Source/WebKit2/Shared/APIObject.h:173: Missing spaces around && [whitespace/operators] [3] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 954608 3 217966 mitz 2013-11-27 13:39:51 -0800 Comment on attachment 217966 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=217966&action=review > Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm:30 > #if WK_API_ENABLED Can we remove some of the following imports, now that we don’t use C SPI here? > Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm:56 > +#pragma mark WKObject protocol implementation > + > +- (API::Object&)_apiObject > +{ > + return *reinterpret_cast<API::Object*>(&_pageGroup); > +} > + I’d stick this at the bottom (then it’s also clear that the following methods aren’t part of WKObject conformance. Or use “#pragma mark -” to separate the rest. 954611 4 sam 2013-11-27 14:45:52 -0800 Committed r159824: <http://trac.webkit.org/changeset/159824> 217966 2013-11-27 13:32:10 -0800 2013-11-27 13:39:51 -0800 Patch bug-124948-20131127133212.patch text/plain 19172 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTgyMykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU2IEBACisyMDEzLTExLTI3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBXS0Jyb3dzaW5nQ29udGV4dEdy b3VwIHdvcmsgd2l0aCBXS09iamVjdCB3cmFwcGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0OTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgLSBBZGRzIG1lY2hhbmlzbSB0byB1c2UgdGhlIGlubGlu ZSBkYXRhIHdyYXBwaW5nIG1lY2hhbmlzbSB3aGVuIHRoZSBPYmplY3RpdmUtQyB3cmFwcGVyIGlz IGNyZWF0ZWQKKyAgICAgICAgICBieSB0aGUgY2FsbGVyIChyYXRoZXIgdGhhbiBieSBPYmplY3Q6 Om5ld09iamVjdCkuCisgICAgICAgIC0gQWRvcHRzIHRoZSBtZWNoYW5pc20gZm9yIFdLQnJvd3Np bmdDb250ZXh0R3JvdXAuCisKKyAgICAgICAgKiBTaGFyZWQvQVBJT2JqZWN0Lmg6CisgICAgICAg IChBUEk6Ok9iamVjdDo6Y29uc3RydWN0SW5XcmFwcGVyKToKKyAgICAgICAgQWRkIGEgaGVscGVy IHdoaWNoIGRvZXMgYSBmb3J3YXJkaW5nIHBsYWNlbWVudC1uZXcgaW50byB0aGUgQVBJOjpPYmpl Y3Qgb2YgdGhlIHBhc3NlZCBpbiB3cmFwcGVyLCBhZnRlciB3aGljaCBpdCBzZXRzIHVwIG1fd3Jh cHBlci4KKworICAgICAgICAoQVBJOjpUeXBlZE9iamVjdDo6b3BlcmF0b3IgbmV3KToKKyAgICAg ICAgQWRkIGEgb3BlcmF0b3IgbmV3IHRvIGZvciBwbGFjZW1lbnQtbmV3LiBBbHNvIG1ha2UgVHlw ZWRPYmplY3QgZnJpZW5kcyB3aXRoIE9iamVjdCBzbyB0aGF0IGNvbnN0cnVjdEluV3JhcHBlciBj YW4gY2FsbCB0aGlzLgorCisgICAgICAgICogU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbToKKyAg ICAgICAgKEFQSTo6T2JqZWN0OjpuZXdPYmplY3QpOgorICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig V0tCcm93c2luZ0NvbnRleHRHcm91cC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dL QnJvd3NpbmdDb250ZXh0R3JvdXAubW06CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0R3Jv dXAgQVBJOjpdKToKKyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRHcm91cCBkZWFsbG9jXSk6 CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0R3JvdXAgaW5pdFdpdGhJZGVudGlmaWVyOl0p OgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFsbG93c0phdmFTY3JpcHRdKToK KyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRHcm91cCBzZXRBbGxvd3NKYXZhU2NyaXB0Ol0p OgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFsbG93c0phdmFTY3JpcHRNYXJr dXBdKToKKyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRHcm91cCBzZXRBbGxvd3NKYXZhU2Ny aXB0TWFya3VwOl0pOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFsbG93c1Bs dWdJbnNdKToKKyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRHcm91cCBzZXRBbGxvd3NQbHVn SW5zOl0pOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFkZFVzZXJTdHlsZVNo ZWV0OmJhc2VVUkw6d2hpdGVsaXN0ZWRVUkxQYXR0ZXJuczpibGFja2xpc3RlZFVSTFBhdHRlcm5z Om1haW5GcmFtZU9ubHk6XSk6CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0R3JvdXAgcmVt b3ZlQWxsVXNlclN0eWxlU2hlZXRzXSk6CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0R3Jv dXAgYWRkVXNlclNjcmlwdDpiYXNlVVJMOndoaXRlbGlzdGVkVVJMUGF0dGVybnM6YmxhY2tsaXN0 ZWRVUkxQYXR0ZXJuczppbmplY3Rpb25UaW1lOm1haW5GcmFtZU9ubHk6XSk6CisgICAgICAgICgt W1dLQnJvd3NpbmdDb250ZXh0R3JvdXAgcmVtb3ZlQWxsVXNlclNjcmlwdHNdKToKKyAgICAgICAg KC1bV0tCcm93c2luZ0NvbnRleHRHcm91cCBfcGFnZUdyb3VwUmVmXSk6CisgICAgICAgIENvbnZl cnQgZnJvbSB3cmFwcGluZyB0aGUgQy1TUEkgdHlwZSB0byBzdG9yaW5nIHRoZSBiaXRzIG9mIHRo ZSB3cmFwcGVkIG9iamVjdCBpbmxpbmUgKG1vZGVsZWQgb24gV0tCYWNrRm9yd2FyZExpc3QpLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRHcm91cEludGVy bmFsLmg6IEFkZGVkLgorICAgICAgICAoV2ViS2l0Ojp3cmFwcGVyKToKKyAgICAgICAgQWRkIHdy YXBwZXIoKSBoZWxwZXIgYW5kIGRlY2xhcmUgY29uZm9ybWFuY2UgdG8gdGhlIFdLT2JqZWN0IHBy b3RvY29sLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VHcm91cDo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZUdyb3VwOjpXZWJQYWdlR3JvdXApOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlR3JvdXAu aDoKKyAgICAgICAgTWFrZSB0aGUgV2ViUGFnZUdyb3VwIGNvbnN0cnVjdG9yIHB1YmxpYyAoZm9y IHVzZSB3aXRoIE9iamVjdDo6Y29uc3RydWN0SW5XcmFwcGVyKSBhbmQgbW92ZSBiZWluZyBzZXQg aW4gdGhlIHdlYlBhZ2VHcm91cE1hcCgpCisgICAgICAgIHRvIHRoZSBjb25zdHJ1Y3Rvci4KKwor ICAgICAgICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgQWRk IG5ldyBmaWxlLgorCiAyMDEzLTExLTI3ICBOaWNrIERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5l QG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIFF0LXNwZWNpZmljIC5xcmMgZmlsZXMK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUElPYmplY3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJT2JqZWN0LmgJKHJldmlzaW9uIDE1OTc5NCkKKysrIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9BUElPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiAr MzAsOSBAQAogCiAjaWYgUExBVEZPUk0oTUFDKQogI2luY2x1ZGUgIldLRm91bmRhdGlvbi5oIgor I2lmZGVmIF9fT0JKQ19fCisjaW5jbHVkZSAiV0tPYmplY3QuaCIKKyNlbmRpZgogI2VuZGlmCiAK ICNkZWZpbmUgREVMRUdBVEVfUkVGX0NPVU5USU5HX1RPX0NPQ09BIChQTEFURk9STShNQUMpICYm IFdLX0FQSV9FTkFCTEVEKQpAQCAtMTY1LDYgKzE2OCwxNSBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBUeXBlIHR5cGUoKSBjb25zdCA9IDA7CiAKICNpZiBERUxFR0FURV9SRUZfQ09VTlRJTkdfVE9f Q09DT0EKKyNpZmRlZiBfX09CSkNfXworICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1l Li4uIEFyZ3M+CisgICAgc3RhdGljIHZvaWQgY29uc3RydWN0SW5XcmFwcGVyKE5TT2JqZWN0IDxX S09iamVjdD4gKndyYXBwZXIsIEFyZ3MmJi4uLiBhcmdzKQorICAgIHsKKyAgICAgICAgT2JqZWN0 KiBvYmplY3QgPSBuZXcgKCZ3cmFwcGVyLl9hcGlPYmplY3QpIFQoc3RkOjpmb3J3YXJkPEFyZ3M+ KGFyZ3MpLi4uKTsKKyAgICAgICAgb2JqZWN0LT5tX3dyYXBwZXIgPSB3cmFwcGVyOworICAgIH0K KyNlbmRpZgorCiAgICAgTlNPYmplY3QgKndyYXBwZXIoKSB7IHJldHVybiBtX3dyYXBwZXI7IH0K IAogICAgIHZvaWQgcmVmKCk7CkBAIC0xOTUsNiArMjA3LDggQEAgcHVibGljOgogICAgIH0KIAog cHJvdGVjdGVkOgorICAgIGZyaWVuZCBPYmplY3Q7CisKICAgICBUeXBlZE9iamVjdCgpCiAgICAg ewogICAgIH0KQEAgLTIwMyw2ICsyMTcsNyBAQCBwcm90ZWN0ZWQ6CiAKICNpZiBERUxFR0FURV9S RUZfQ09VTlRJTkdfVE9fQ09DT0EKICAgICB2b2lkKiBvcGVyYXRvciBuZXcoc2l6ZV90IHNpemUp IHsgcmV0dXJuIG5ld09iamVjdChzaXplLCBBUElUeXBlKTsgfQorICAgIHZvaWQqIG9wZXJhdG9y IG5ldyhzaXplX3Qgc2l6ZSwgdm9pZCogdmFsdWUpIHsgcmV0dXJuIHZhbHVlOyB9CiAjZW5kaWYK IH07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9BUElPYmplY3QubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbQkocmV2 aXNpb24gMTU5Nzk0KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL0FQSU9iamVjdC5t bQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogCiAjaW1wb3J0ICJXS0JhY2tGb3J3 YXJkTGlzdEludGVybmFsLmgiCiAjaW1wb3J0ICJXS0JhY2tGb3J3YXJkTGlzdEl0ZW1JbnRlcm5h bC5oIgorI2ltcG9ydCAiV0tCcm93c2luZ0NvbnRleHRHcm91cEludGVybmFsLmgiCiAjaW1wb3J0 ICJXS05TQXJyYXkuaCIKICNpbXBvcnQgIldLTlNEaWN0aW9uYXJ5LmgiCiAjaW1wb3J0ICJXS05T RXJyb3IuaCIKQEAgLTgyLDYgKzgzLDEwIEBAIHZvaWQqIE9iamVjdDo6bmV3T2JqZWN0KHNpemVf dCBzaXplLCBUeXAKICAgICAgICAgd3JhcHBlciA9IFtXS05hdmlnYXRpb25EYXRhIGFsbG9jXTsK ICAgICAgICAgYnJlYWs7CiAKKyAgICBjYXNlIFR5cGU6OlBhZ2VHcm91cDoKKyAgICAgICAgd3Jh cHBlciA9IFtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFsbG9jXTsKKyAgICAgICAgYnJlYWs7CisK ICAgICBjYXNlIFR5cGU6OlN0cmluZzoKICAgICAgICAgd3JhcHBlciA9IE5TQWxsb2NhdGVPYmpl Y3QoW1dLTlNTdHJpbmcgY2xhc3NdLCBzaXplLCBudWxscHRyKTsKICAgICAgICAgYnJlYWs7CkBA IC05NSwxMSArMTAwLDEyIEBAIHZvaWQqIE9iamVjdDo6bmV3T2JqZWN0KHNpemVfdCBzaXplLCBU eXAKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgT2JqZWN0KiBvYmplY3QgPSAmd3JhcHBl ci5fYXBpT2JqZWN0OwotICAgIG9iamVjdC0+bV93cmFwcGVyID0gd3JhcHBlcjsKLSAgICByZXR1 cm4gb2JqZWN0OworICAgIE9iamVjdCYgb2JqZWN0ID0gd3JhcHBlci5fYXBpT2JqZWN0OworICAg IG9iamVjdC5tX3dyYXBwZXIgPSB3cmFwcGVyOworCisgICAgcmV0dXJuICZvYmplY3Q7CiB9CiAK LX0gLy8gbmFtZXNwYWNlIFdlYktpdAorfSAvLyBuYW1lc3BhY2UgQVBJCiAKICNlbmRpZiAvLyBX S19BUElfRU5BQkxFRApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91 cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91 cC5jcHAJKHJldmlzaW9uIDE1OTc5NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlR3JvdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MSwxMSArNTEsNyBAQCBzdGF0aWMgV2Vi UGFnZUdyb3VwTWFwJiB3ZWJQYWdlR3JvdXBNYXAoCiAKIFBhc3NSZWZQdHI8V2ViUGFnZUdyb3Vw PiBXZWJQYWdlR3JvdXA6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGJvb2wgdmlz aWJsZVRvSW5qZWN0ZWRCdW5kbGUsIGJvb2wgdmlzaWJsZVRvSGlzdG9yeUNsaWVudCkKIHsKLSAg ICBSZWZQdHI8V2ViUGFnZUdyb3VwPiBwYWdlR3JvdXAgPSBhZG9wdFJlZihuZXcgV2ViUGFnZUdy b3VwKGlkZW50aWZpZXIsIHZpc2libGVUb0luamVjdGVkQnVuZGxlLCB2aXNpYmxlVG9IaXN0b3J5 Q2xpZW50KSk7Ci0KLSAgICB3ZWJQYWdlR3JvdXBNYXAoKS5zZXQocGFnZUdyb3VwLT5wYWdlR3Jv dXBJRCgpLCBwYWdlR3JvdXAuZ2V0KCkpOwotCi0gICAgcmV0dXJuIHBhZ2VHcm91cC5yZWxlYXNl KCk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJQYWdlR3JvdXAoaWRlbnRpZmllciwgdmlz aWJsZVRvSW5qZWN0ZWRCdW5kbGUsIHZpc2libGVUb0hpc3RvcnlDbGllbnQpKTsKIH0KIAogV2Vi UGFnZUdyb3VwKiBXZWJQYWdlR3JvdXA6OmdldCh1aW50NjRfdCBwYWdlR3JvdXBJRCkKQEAgLTc0 LDYgKzcwLDggQEAgV2ViUGFnZUdyb3VwOjpXZWJQYWdlR3JvdXAoY29uc3QgU3RyaW5nJgogCiAg ICAgbV9kYXRhLnZpc2libGVUb0luamVjdGVkQnVuZGxlID0gdmlzaWJsZVRvSW5qZWN0ZWRCdW5k bGU7CiAgICAgbV9kYXRhLnZpc2libGVUb0hpc3RvcnlDbGllbnQgPSB2aXNpYmxlVG9IaXN0b3J5 Q2xpZW50OworICAgIAorICAgIHdlYlBhZ2VHcm91cE1hcCgpLnNldChtX2RhdGEucGFnZUdyb3Vw SUQsIHRoaXMpOwogfQogCiBXZWJQYWdlR3JvdXA6On5XZWJQYWdlR3JvdXAoKQpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuaAkocmV2aXNpb24gMTU5Nzk0KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oCSh3b3JraW5nIGNvcHkpCkBA IC00MCw2ICs0MCw3IEBAIGNsYXNzIFdlYlBhZ2VQcm94eTsKIAogY2xhc3MgV2ViUGFnZUdyb3Vw IDogcHVibGljIEFQSTo6VHlwZWRPYmplY3Q8QVBJOjpPYmplY3Q6OlR5cGU6OlBhZ2VHcm91cD4g ewogcHVibGljOgorICAgIFdlYlBhZ2VHcm91cChjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIgPSBT dHJpbmcoKSwgYm9vbCB2aXNpYmxlVG9JbmplY3RlZEJ1bmRsZSA9IHRydWUsIGJvb2wgdmlzaWJs ZVRvSGlzdG9yeUNsaWVudCA9IHRydWUpOwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlBhZ2VH cm91cD4gY3JlYXRlKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciA9IFN0cmluZygpLCBib29sIHZp c2libGVUb0luamVjdGVkQnVuZGxlID0gdHJ1ZSwgYm9vbCB2aXNpYmxlVG9IaXN0b3J5Q2xpZW50 ID0gdHJ1ZSk7CiAgICAgc3RhdGljIFdlYlBhZ2VHcm91cCogZ2V0KHVpbnQ2NF90IHBhZ2VHcm91 cElEKTsKIApAQCAtNjQsOCArNjUsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVBbGxVc2Vy Q29udGVudCgpOwogCiBwcml2YXRlOgotICAgIFdlYlBhZ2VHcm91cChjb25zdCBTdHJpbmcmIGlk ZW50aWZpZXIsIGJvb2wgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIGJvb2wgdmlzaWJsZVRvSGlz dG9yeUNsaWVudCk7Ci0KICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiB2b2lkIHNlbmRUb0FsbFBy b2Nlc3Nlc0luR3JvdXAoY29uc3QgVCYsIHVpbnQ2NF90IGRlc3RpbmF0aW9uSUQpOwogCiAgICAg V2ViUGFnZUdyb3VwRGF0YSBtX2RhdGE7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAubW0JKHJldmlz aW9uIDE1OTc5NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3Np bmdDb250ZXh0R3JvdXAubW0JKHdvcmtpbmcgY29weSkKQEAgLTI0LDYgKzI0LDcgQEAKICAqLwog CiAjaW1wb3J0ICJjb25maWcuaCIKKyNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0R3JvdXBJbnRl cm5hbC5oIgogI2ltcG9ydCAiV0tCcm93c2luZ0NvbnRleHRHcm91cFByaXZhdGUuaCIKIAogI2lm IFdLX0FQSV9FTkFCTEVECkBAIC00Myw3ICs0NCwyMSBAQAogdXNpbmcgbmFtZXNwYWNlIFdlYktp dDsKIAogQGltcGxlbWVudGF0aW9uIFdLQnJvd3NpbmdDb250ZXh0R3JvdXAgewotICAgIFdLUmV0 YWluUHRyPFdLUGFnZUdyb3VwUmVmPiBfcGFnZUdyb3VwUmVmOworICAgIHN0ZDo6YWxpZ25lZF9z dG9yYWdlPHNpemVvZihXZWJQYWdlR3JvdXApLCBzdGQ6OmFsaWdubWVudF9vZjxXZWJQYWdlR3Jv dXA+Ojp2YWx1ZT46OnR5cGUgX3BhZ2VHcm91cDsKK30KKworI3ByYWdtYSBtYXJrIFdLT2JqZWN0 IHByb3RvY29sIGltcGxlbWVudGF0aW9uCisKKy0gKEFQSTo6T2JqZWN0JilfYXBpT2JqZWN0Cit7 CisgICAgcmV0dXJuICpyZWludGVycHJldF9jYXN0PEFQSTo6T2JqZWN0Kj4oJl9wYWdlR3JvdXAp OworfQorCistICh2b2lkKWRlYWxsb2MKK3sKKyAgICByZWludGVycHJldF9jYXN0PFdlYlBhZ2VH cm91cCo+KCZfcGFnZUdyb3VwKS0+fldlYlBhZ2VHcm91cCgpOworCisgICAgW3N1cGVyIGRlYWxs b2NdOwogfQogCiAtIChpZClpbml0V2l0aElkZW50aWZpZXI6KE5TU3RyaW5nICopaWRlbnRpZmll cgpAQCAtNTIsNDUgKzY3LDQ1IEBAIC0gKGlkKWluaXRXaXRoSWRlbnRpZmllcjooTlNTdHJpbmcg KilpZGUKICAgICBpZiAoIXNlbGYpCiAgICAgICAgIHJldHVybiBuaWw7CiAKLSAgICBfcGFnZUdy b3VwUmVmID0gYWRvcHRXSyhXS1BhZ2VHcm91cENyZWF0ZVdpdGhJZGVudGlmaWVyKGFkb3B0V0so V0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKENGU3RyaW5nUmVmKWlkZW50aWZpZXIpKS5nZXQo KSkpOworICAgIEFQSTo6T2JqZWN0Ojpjb25zdHJ1Y3RJbldyYXBwZXI8V2ViUGFnZUdyb3VwPihz ZWxmLCBpZGVudGlmaWVyKTsKIAogICAgIC8vIEdpdmUgdGhlIFdLQnJvd3NpbmdDb250ZXh0R3Jv dXAgYSBpZGVudGlmaWVyLWxlc3MgcHJlZmVyZW5jZXMsIHNvIHRoYXQgdGhleQogICAgIC8vIGRv bid0IGdldCBhdXRvbWF0aWNhbGx5IHdyaXR0ZW4gdG8gdGhlIGRpc2suIFRoZSBhdXRvbWF0aWMg d3JpdGluZyBoYXMgcHJvdmVuCiAgICAgLy8gY29uZnVzaW5nIHRvIHVzZXJzIG9mIHRoZSBBUEku CiAgICAgV0tSZXRhaW5QdHI8V0tQcmVmZXJlbmNlc1JlZj4gcHJlZmVyZW5jZXMgPSBhZG9wdFdL KFdLUHJlZmVyZW5jZXNDcmVhdGUoKSk7Ci0gICAgV0tQYWdlR3JvdXBTZXRQcmVmZXJlbmNlcyhf cGFnZUdyb3VwUmVmLmdldCgpLCBwcmVmZXJlbmNlcy5nZXQoKSk7CisgICAgV0tQYWdlR3JvdXBT ZXRQcmVmZXJlbmNlcyh0b0FQSShyZWludGVycHJldF9jYXN0PFdlYlBhZ2VHcm91cCo+KCZfcGFn ZUdyb3VwKSksIHByZWZlcmVuY2VzLmdldCgpKTsKIAogICAgIHJldHVybiBzZWxmOwogfQogCiAt IChCT09MKWFsbG93c0phdmFTY3JpcHQKIHsKLSAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldEph dmFTY3JpcHRFbmFibGVkKFdLUGFnZUdyb3VwR2V0UHJlZmVyZW5jZXMoX3BhZ2VHcm91cFJlZi5n ZXQoKSkpOworICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0SmF2YVNjcmlwdEVuYWJsZWQoV0tQ YWdlR3JvdXBHZXRQcmVmZXJlbmNlcyh0b0FQSShyZWludGVycHJldF9jYXN0PFdlYlBhZ2VHcm91 cCo+KCZfcGFnZUdyb3VwKSkpKTsKIH0KIAogLSAodm9pZClzZXRBbGxvd3NKYXZhU2NyaXB0OihC T09MKWFsbG93c0phdmFTY3JpcHQKIHsKLSAgICBXS1ByZWZlcmVuY2VzU2V0SmF2YVNjcmlwdEVu YWJsZWQoV0tQYWdlR3JvdXBHZXRQcmVmZXJlbmNlcyhfcGFnZUdyb3VwUmVmLmdldCgpKSwgYWxs b3dzSmF2YVNjcmlwdCk7CisgICAgV0tQcmVmZXJlbmNlc1NldEphdmFTY3JpcHRFbmFibGVkKFdL UGFnZUdyb3VwR2V0UHJlZmVyZW5jZXModG9BUEkocmVpbnRlcnByZXRfY2FzdDxXZWJQYWdlR3Jv dXAqPigmX3BhZ2VHcm91cCkpKSwgYWxsb3dzSmF2YVNjcmlwdCk7CiB9CiAKIC0gKEJPT0wpYWxs b3dzSmF2YVNjcmlwdE1hcmt1cAogewotICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0SmF2YVNj cmlwdE1hcmt1cEVuYWJsZWQoV0tQYWdlR3JvdXBHZXRQcmVmZXJlbmNlcyhfcGFnZUdyb3VwUmVm LmdldCgpKSk7CisgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRKYXZhU2NyaXB0TWFya3VwRW5h YmxlZChXS1BhZ2VHcm91cEdldFByZWZlcmVuY2VzKHRvQVBJKHJlaW50ZXJwcmV0X2Nhc3Q8V2Vi UGFnZUdyb3VwKj4oJl9wYWdlR3JvdXApKSkpOwogfQogCiAtICh2b2lkKXNldEFsbG93c0phdmFT Y3JpcHRNYXJrdXA6KEJPT0wpYWxsb3dzSmF2YVNjcmlwdE1hcmt1cAogewotICAgIFdLUHJlZmVy ZW5jZXNTZXRKYXZhU2NyaXB0TWFya3VwRW5hYmxlZChXS1BhZ2VHcm91cEdldFByZWZlcmVuY2Vz KF9wYWdlR3JvdXBSZWYuZ2V0KCkpLCBhbGxvd3NKYXZhU2NyaXB0TWFya3VwKTsKKyAgICBXS1By ZWZlcmVuY2VzU2V0SmF2YVNjcmlwdE1hcmt1cEVuYWJsZWQoV0tQYWdlR3JvdXBHZXRQcmVmZXJl bmNlcyh0b0FQSShyZWludGVycHJldF9jYXN0PFdlYlBhZ2VHcm91cCo+KCZfcGFnZUdyb3VwKSkp LCBhbGxvd3NKYXZhU2NyaXB0TWFya3VwKTsKIH0KIAogLSAoQk9PTClhbGxvd3NQbHVnSW5zCiB7 Ci0gICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRQbHVnaW5zRW5hYmxlZChXS1BhZ2VHcm91cEdl dFByZWZlcmVuY2VzKF9wYWdlR3JvdXBSZWYuZ2V0KCkpKTsKKyAgICByZXR1cm4gV0tQcmVmZXJl bmNlc0dldFBsdWdpbnNFbmFibGVkKFdLUGFnZUdyb3VwR2V0UHJlZmVyZW5jZXModG9BUEkocmVp bnRlcnByZXRfY2FzdDxXZWJQYWdlR3JvdXAqPigmX3BhZ2VHcm91cCkpKSk7CiB9CiAKIC0gKHZv aWQpc2V0QWxsb3dzUGx1Z0luczooQk9PTClhbGxvd3NQbHVnSW5zCiB7Ci0gICAgV0tQcmVmZXJl bmNlc1NldFBsdWdpbnNFbmFibGVkKFdLUGFnZUdyb3VwR2V0UHJlZmVyZW5jZXMoX3BhZ2VHcm91 cFJlZi5nZXQoKSksIGFsbG93c1BsdWdJbnMpOworICAgIFdLUHJlZmVyZW5jZXNTZXRQbHVnaW5z RW5hYmxlZChXS1BhZ2VHcm91cEdldFByZWZlcmVuY2VzKHRvQVBJKHJlaW50ZXJwcmV0X2Nhc3Q8 V2ViUGFnZUdyb3VwKj4oJl9wYWdlR3JvdXApKSksIGFsbG93c1BsdWdJbnMpOwogfQogCiBzdGF0 aWMgV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gY3JlYXRlV0tBcnJheShOU0FycmF5ICphcnJheSkK QEAgLTEyMiwxMiArMTM3LDEyIEBAIC0odm9pZClhZGRVc2VyU3R5bGVTaGVldDooTlNTdHJpbmcg Kilzb3UKICAgICBhdXRvIHdrQmxhY2tsaXN0ID0gY3JlYXRlV0tBcnJheShibGFja2xpc3QpOwog ICAgIFdLVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcyA9IG1haW5GcmFt ZU9ubHkgPyBrV0tJbmplY3RJblRvcEZyYW1lT25seSA6IGtXS0luamVjdEluQWxsRnJhbWVzOwog Ci0gICAgV0tQYWdlR3JvdXBBZGRVc2VyU3R5bGVTaGVldChfcGFnZUdyb3VwUmVmLmdldCgpLCB3 a1NvdXJjZS5nZXQoKSwgd2tCYXNlVVJMLmdldCgpLCB3a1doaXRlbGlzdC5nZXQoKSwgd2tCbGFj a2xpc3QuZ2V0KCksIGluamVjdGVkRnJhbWVzKTsKKyAgICBXS1BhZ2VHcm91cEFkZFVzZXJTdHls ZVNoZWV0KHRvQVBJKHJlaW50ZXJwcmV0X2Nhc3Q8V2ViUGFnZUdyb3VwKj4oJl9wYWdlR3JvdXAp KSwgd2tTb3VyY2UuZ2V0KCksIHdrQmFzZVVSTC5nZXQoKSwgd2tXaGl0ZWxpc3QuZ2V0KCksIHdr QmxhY2tsaXN0LmdldCgpLCBpbmplY3RlZEZyYW1lcyk7CiB9CiAKIC0gKHZvaWQpcmVtb3ZlQWxs VXNlclN0eWxlU2hlZXRzCiB7Ci0gICAgV0tQYWdlR3JvdXBSZW1vdmVBbGxVc2VyU3R5bGVTaGVl dHMoX3BhZ2VHcm91cFJlZi5nZXQoKSk7CisgICAgV0tQYWdlR3JvdXBSZW1vdmVBbGxVc2VyU3R5 bGVTaGVldHModG9BUEkocmVpbnRlcnByZXRfY2FzdDxXZWJQYWdlR3JvdXAqPigmX3BhZ2VHcm91 cCkpKTsKIH0KIAogLSAodm9pZClhZGRVc2VyU2NyaXB0OihOU1N0cmluZyAqKXNvdXJjZSBiYXNl VVJMOihOU1VSTCAqKWJhc2VVUkwgd2hpdGVsaXN0ZWRVUkxQYXR0ZXJuczooTlNBcnJheSAqKXdo aXRlbGlzdCBibGFja2xpc3RlZFVSTFBhdHRlcm5zOihOU0FycmF5ICopYmxhY2tsaXN0IGluamVj dGlvblRpbWU6KFdLVXNlclNjcmlwdEluamVjdGlvblRpbWUpaW5qZWN0aW9uVGltZSBtYWluRnJh bWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHkKQEAgLTE0MSwxMiArMTU2LDEyIEBAIC0gKHZvaWQp YWRkVXNlclNjcmlwdDooTlNTdHJpbmcgKilzb3VyY2UKICAgICBhdXRvIHdrQmxhY2tsaXN0ID0g Y3JlYXRlV0tBcnJheShibGFja2xpc3QpOwogICAgIFdLVXNlckNvbnRlbnRJbmplY3RlZEZyYW1l cyBpbmplY3RlZEZyYW1lcyA9IG1haW5GcmFtZU9ubHkgPyBrV0tJbmplY3RJblRvcEZyYW1lT25s eSA6IGtXS0luamVjdEluQWxsRnJhbWVzOwogCi0gICAgV0tQYWdlR3JvdXBBZGRVc2VyU2NyaXB0 KF9wYWdlR3JvdXBSZWYuZ2V0KCksIHdrU291cmNlLmdldCgpLCB3a0Jhc2VVUkwuZ2V0KCksIHdr V2hpdGVsaXN0LmdldCgpLCB3a0JsYWNrbGlzdC5nZXQoKSwgaW5qZWN0ZWRGcmFtZXMsIGluamVj dGlvblRpbWUpOworICAgIFdLUGFnZUdyb3VwQWRkVXNlclNjcmlwdCh0b0FQSShyZWludGVycHJl dF9jYXN0PFdlYlBhZ2VHcm91cCo+KCZfcGFnZUdyb3VwKSksIHdrU291cmNlLmdldCgpLCB3a0Jh c2VVUkwuZ2V0KCksIHdrV2hpdGVsaXN0LmdldCgpLCB3a0JsYWNrbGlzdC5nZXQoKSwgaW5qZWN0 ZWRGcmFtZXMsIGluamVjdGlvblRpbWUpOwogfQogCiAtICh2b2lkKXJlbW92ZUFsbFVzZXJTY3Jp cHRzCiB7Ci0gICAgV0tQYWdlR3JvdXBSZW1vdmVBbGxVc2VyU2NyaXB0cyhfcGFnZUdyb3VwUmVm LmdldCgpKTsKKyAgICBXS1BhZ2VHcm91cFJlbW92ZUFsbFVzZXJTY3JpcHRzKHRvQVBJKHJlaW50 ZXJwcmV0X2Nhc3Q8V2ViUGFnZUdyb3VwKj4oJl9wYWdlR3JvdXApKSk7CiB9CiAKIEBlbmQKQEAg LTE1NSw3ICsxNzAsNyBAQCAtICh2b2lkKXJlbW92ZUFsbFVzZXJTY3JpcHRzCiAKIC0gKFdLUGFn ZUdyb3VwUmVmKV9wYWdlR3JvdXBSZWYKIHsKLSAgICByZXR1cm4gX3BhZ2VHcm91cFJlZi5nZXQo KTsKKyAgICByZXR1cm4gdG9BUEkocmVpbnRlcnByZXRfY2FzdDxXZWJQYWdlR3JvdXAqPigmX3Bh Z2VHcm91cCkpOwogfQogCiBAZW5kCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L21hYy9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwSW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwSW50ZXJu YWwuaAkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dL QnJvd3NpbmdDb250ZXh0R3JvdXBJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEs NDYgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICog MS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisg KiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQ TEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVT UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAor ICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFO WSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisg KiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBV U0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICog Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKyAqLworCisjaW1wb3J0ICJXS0Jyb3dzaW5nQ29udGV4dEdyb3VwLmgiCisK KyNpZiBXS19BUElfRU5BQkxFRAorCisjaW1wb3J0ICJXS09iamVjdC5oIgorI2ltcG9ydCAiV2Vi UGFnZUdyb3VwLmgiCisKK25hbWVzcGFjZSBXZWJLaXQgeworCitpbmxpbmUgV0tCcm93c2luZ0Nv bnRleHRHcm91cCAqd3JhcHBlcihXZWJQYWdlR3JvdXAmIHBhZ2VHcm91cCkKK3sKKyAgICBBU1NF UlQoW3BhZ2VHcm91cC53cmFwcGVyKCkgaXNLaW5kT2ZDbGFzczpbV0tCcm93c2luZ0NvbnRleHRH cm91cCBjbGFzc11dKTsKKyAgICByZXR1cm4gKFdLQnJvd3NpbmdDb250ZXh0R3JvdXAgKilwYWdl R3JvdXAud3JhcHBlcigpOworfQorCit9CisKK0BpbnRlcmZhY2UgV0tCcm93c2luZ0NvbnRleHRH cm91cCAoKSA8V0tPYmplY3Q+CitAZW5kCisKKyNlbmRpZiAvLyBXS19BUElfRU5BQkxFRApJbmRl eDogU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agkocmV2aXNpb24gMTU5Nzk0KQorKysgU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC02OTEsNiArNjkxLDcgQEAKIAkJN0Mz RjhDOTAxNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbkluZm9ybWF0aW9uLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDM0Y4QzhFMTczQUY1MkQwMDdC N0YzOSAvKiBQbHVnaW5JbmZvcm1hdGlvbi5jcHAgKi87IH07CiAJCTdDM0Y4QzkxMTczQUY1MkQw MDdCN0YzOSAvKiBQbHVnaW5JbmZvcm1hdGlvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gN0MzRjhDOEYxNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbklu Zm9ybWF0aW9uLmggKi87IH07CiAJCTdDNkQzN0ZDMTcyRjU1NUYwMDlEMjg0NyAvKiBQYWdlQmFu bmVyTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g N0M2RDM3RkExNzJGNTU1RjAwOUQyODQ3IC8qIFBhZ2VCYW5uZXJNYWMubW0gKi87IH07CisJCTdD OUQxNTM3MTg0NTg0REEwMDlEMzkxOCAvKiBXS0Jyb3dzaW5nQ29udGV4dEdyb3VwSW50ZXJuYWwu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDOUQxNTM2 MTg0NTg0REEwMDlEMzkxOCAvKiBXS0Jyb3dzaW5nQ29udGV4dEdyb3VwSW50ZXJuYWwuaCAqLzsg fTsKIAkJN0NBMjU0RUIxODI5OTNDRTAwRkM4QTQxIC8qIFdLQnJvd3NpbmdDb250ZXh0UG9saWN5 RGVsZWdhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDdDQTI1NEVBMTgyOTkzQ0UwMEZDOEE0MSAvKiBXS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVn YXRlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHVibGljLCApOyB9OyB9OwogCQk3 Q0IxNkZFRjE3MjRCQTIzMDA3QTBBOTUgLyogY29tLmFwcGxlLmlzdC5kcy5hcHBsZWNvbm5lY3Qu d2VicGx1Z2luLnNiIGluIENvcHkgUGx1Zy1pbiBTYW5kYm94IFByb2ZpbGVzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDQjE2RkUyMTcyNEI5QjUwMDdBMEE5NSAvKiBjb20u YXBwbGUuaXN0LmRzLmFwcGxlY29ubmVjdC53ZWJwbHVnaW4uc2IgKi87IH07CiAJCTdDQjE2RkYw MTcyNEJBMjQwMDdBMEE5NSAvKiBjb20uYXBwbGUuUXVpY2tUaW1lIFBsdWdpbi5wbHVnaW4uc2Ig aW4gQ29weSBQbHVnLWluIFNhbmRib3ggUHJvZmlsZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gN0NCMTZGRTMxNzI0QjlCNTAwN0EwQTk1IC8qIGNvbS5hcHBsZS5RdWlja1Rp bWUgUGx1Z2luLnBsdWdpbi5zYiAqLzsgfTsKQEAgLTIyNDEsNiArMjI0Miw3IEBACiAJCTdDM0Y4 QzhFMTczQUY1MkQwMDdCN0YzOSAvKiBQbHVnaW5JbmZvcm1hdGlvbi5jcHAgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQbHVnaW5JbmZvcm1hdGlvbi5jcHA7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDM0Y4QzhGMTczQUY1MkQwMDdCN0YzOSAvKiBQbHVnaW5J bmZvcm1hdGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQbHVnaW5JbmZv cm1hdGlvbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3QzZEMzdGQTE3MkY1NTVG MDA5RDI4NDcgLyogUGFnZUJhbm5lck1hYy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9i amNwcDsgcGF0aCA9IFBhZ2VCYW5uZXJNYWMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CisJCTdDOUQxNTM2MTg0NTg0REEwMDlEMzkxOCAvKiBXS0Jyb3dzaW5nQ29udGV4dEdyb3VwSW50 ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tCcm93c2luZ0NvbnRl eHRHcm91cEludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDQTI1NEVB MTgyOTkzQ0UwMEZDOEE0MSAvKiBXS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRlLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLQnJvd3NpbmdDb250ZXh0UG9saWN5RGVs ZWdhdGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0NCMTZGRTIxNzI0QjlCNTAw N0EwQTk1IC8qIGNvbS5hcHBsZS5pc3QuZHMuYXBwbGVjb25uZWN0LndlYnBsdWdpbi5zYiAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHRleHQ7IHBhdGggPSBjb20uYXBwbGUuaXN0LmRzLmFwcGxlY29ubmVjdC53ZWJwbHVn aW4uc2I7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDQjE2RkUzMTcyNEI5QjUwMDdB MEE5NSAvKiBjb20uYXBwbGUuUXVpY2tUaW1lIFBsdWdpbi5wbHVnaW4uc2IgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0 ZXh0OyBwYXRoID0gImNvbS5hcHBsZS5RdWlja1RpbWUgUGx1Z2luLnBsdWdpbi5zYiI7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00NjQwLDYgKzQ2NDIsNyBAQAogCQkJCTM3ODhBMDVC MTQ3NDNDOTAwMDYzMTlFNSAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJQcml2YXRlLmgg Ki8sCiAJCQkJQkNCQUFDRUUxNDUyMzI0MzAwNTNGODJGIC8qIFdLQnJvd3NpbmdDb250ZXh0R3Jv dXAuaCAqLywKIAkJCQlCQ0JBQUNFRjE0NTIzMjQ0MDA1M0Y4MkYgLyogV0tCcm93c2luZ0NvbnRl eHRHcm91cC5tbSAqLywKKwkJCQk3QzlEMTUzNjE4NDU4NERBMDA5RDM5MTggLyogV0tCcm93c2lu Z0NvbnRleHRHcm91cEludGVybmFsLmggKi8sCiAJCQkJQkNCQUFDRjAxNDUyMzI0ODAwNTNGODJG IC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXBQcml2YXRlLmggKi8sCiAJCQkJQkNCQUFEMEExNDU2 MEE0MzAwNTNGODJGIC8qIFdLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRlLmggKi8sCiAJCQkJ N0NBMjU0RUExODI5OTNDRTAwRkM4QTQxIC8qIFdLQnJvd3NpbmdDb250ZXh0UG9saWN5RGVsZWdh dGUuaCAqLywKQEAgLTYwNzgsNiArNjA4MSw3IEBACiAJCQkJRjY3REQ3QkExMjVFNDBEOTAwN0JE Q0I4IC8qIFdLU2VyaWFsaXplZFNjcmlwdFZhbHVlUHJpdmF0ZS5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJQkNEREIzMkIxMjRFQzJBQjAwNDhEMTNDIC8qIFdLU2hhcmVkQVBJQ2FzdC5oIGluIEhlYWRl cnMgKi8sCiAJCQkJQkM0MDc2MDYxMjRGRjAyNzAwNjhGMjBBIC8qIFdLU3RyaW5nLmggaW4gSGVh ZGVycyAqLywKKwkJCQk3QzlEMTUzNzE4NDU4NERBMDA5RDM5MTggLyogV0tCcm93c2luZ0NvbnRl eHRHcm91cEludGVybmFsLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzQwNzYxQTEyNEZGMDM3MDA2 OEYyMEEgLyogV0tTdHJpbmdDRi5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNzU5Q0NENTkxODA4RjE2 OTAwNzhFOEE4IC8qIFdlYk9yaWdpbkRhdGFNYW5hZ2VyUHJveHlDaGFuZ2VDbGllbnQuaCBpbiBI ZWFkZXJzICovLAogCQkJCUJDOTA5OTgwMTI1NkE5ODIwMDA4Mzc1NiAvKiBXS1N0cmluZ1ByaXZh dGUuaCBpbiBIZWFkZXJzICovLAo=