131718 2014-04-15 17:53:23 -0700 [Cocoa] Add a form delegate method corresponding to willSubmitForm 2014-04-15 22:17:11 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz oldest_to_newest 1001056 0 mitz 2014-04-15 17:53:23 -0700 [Cocoa] Add a form delegate method corresponding to willSubmitForm 1001061 1 229422 mitz 2014-04-15 17:58:39 -0700 Created attachment 229422 Add -_webView:willSubmitFormValues:userObject:submissionHandler: 1001063 2 229422 joepeck 2014-04-15 18:31:25 -0700 Comment on attachment 229422 Add -_webView:willSubmitFormValues:userObject:submissionHandler: View in context: https://bugs.webkit.org/attachment.cgi?id=229422&action=review Some drive-by nit comments. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1192 > + class FormClient : public API::FormClient { Can we make this final? > Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:426 > + userData = API::Data::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data.leakRef()).leakRef(); static_cast? 1001090 3 mitz 2014-04-15 22:17:11 -0700 Committed <http://trac.webkit.org/r167343>. 229422 2014-04-15 17:58:39 -0700 2014-04-15 22:14:13 -0700 Add -_webView:willSubmitFormValues:userObject:submissionHandler: bug-131718-20140415175817.patch text/plain 11647 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzMzOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA0LTE1ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBBZGQgYSBmb3JtIGRl bGVnYXRlIG1ldGhvZCBjb3JyZXNwb25kaW5nIHRvIHdpbGxTdWJtaXRGb3JtCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3MTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NldEZvcm1EZWxlZ2F0ZTpd KTogQ2hhbmdlZCB0byBkZWZpbmUgYW5kIGNyZWF0ZSBhIEZvcm1DbGllbnQgKHdoaWNoIGRlcml2 ZXMKKyAgICAgICAgZnJvbSBBUEk6OkZvcm1DbGllbnQgYW5kIG1lc3NhZ2VzIGEgZGVsZWdhdGUp LCBhbmQgc2V0IGl0IGFzIHRoZSBmb3JtIGNsaWVudC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLRm9ybURlbGVnYXRlLmg6IERlY2xhcmVkIG5ldyBkZWxlZ2F0ZSBtZXRob2Qu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlBy b2Nlc3NQbHVnSW5Gb3JtRGVsZWdhdGVQcml2YXRlLmg6IEFkZGVkIGEKKyAgICAgICAgdmFyaWFu dCBvZiB3aWxsU3VibWl0Rm9ybSB0aGF0IHJldHVycyBhIHVzZXIgb2JqZWN0IHRvIHBhc3MgdG8g dGhlIGRlbGVnYXRlIGluIHRoZSBVSQorICAgICAgICBwcm9jZXNzLCBnaXZpbmcgaXQgYSB0ZW1w b3JhcnkgbmFtZSB3aXRoIOKAnG5ld+KAnS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xs ZXIubW06CisgICAgICAgICgtW1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJv bGxlciBfc2V0Rm9ybURlbGVnYXRlOl0pOiBDaGFuZ2VkIHdpbGxTdWJtaXRGb3JtKCkKKyAgICAg ICAgdG8gY2hlY2sgZm9yIHRoZSBuZXcgYnVuZGxlIGRlbGVnYXRlIG1ldGhvZCBmaXJzdCBhbmQg ZW5jb2RlIHRoZSB1c2VyIG9iamVjdCBhcyB1c2VyIGRhdGEuCisgICAgICAgIE1vdmVkIHRoZSBl bmNvZGluZyBvZiBhbiBOU09iamVjdCA8TlNTZWN1cmVDb2Rpbmc+IGFzIHVzZXIgZGF0YSBpbnRv IGEgaGVscGVyIGZ1bmN0aW9uLgorCiAyMDE0LTA0LTE1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBh cHBsZS5jb20+CiAKICAgICAgICAgSW50cm9kdWNlIEFQSTo6Rm9ybUNsaWVudApJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlz aW9uIDE2NzMxMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpZiBXS19BUElfRU5B QkxFRAogCisjaW1wb3J0ICJBUElGb3JtQ2xpZW50LmgiCiAjaW1wb3J0ICJGaW5kQ2xpZW50Lmgi CiAjaW1wb3J0ICJOYXZpZ2F0aW9uU3RhdGUuaCIKICNpbXBvcnQgIlJlbW90ZUxheWVyVHJlZVRy YW5zYWN0aW9uLmgiCkBAIC01MiwxMCArNTMsMTIgQEAKICNpbXBvcnQgIldlYkJhY2tGb3J3YXJk TGlzdC5oIgogI2ltcG9ydCAiV2ViQ2VydGlmaWNhdGVJbmZvLmgiCiAjaW1wb3J0ICJXZWJDb250 ZXh0LmgiCisjaW1wb3J0ICJXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHkuaCIKICNpbXBv cnQgIldlYlBhZ2VHcm91cC5oIgogI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCiAjaW1wb3J0ICJX ZWJQcm9jZXNzUHJveHkuaCIKICNpbXBvcnQgIl9XS0ZpbmREZWxlZ2F0ZS5oIgorI2ltcG9ydCAi X1dLRm9ybURlbGVnYXRlLmgiCiAjaW1wb3J0ICJfV0tSZW1vdGVPYmplY3RSZWdpc3RyeUludGVy bmFsLmgiCiAjaW1wb3J0ICJfV0tWaXNpdGVkTGlua1Byb3ZpZGVySW50ZXJuYWwuaCIKICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTExODUsNiArMTE4OCw1OSBAQCAtIChpZCA8X1dLRm9y bURlbGVnYXRlPilfZm9ybURlbGVnYXRlCiAtICh2b2lkKV9zZXRGb3JtRGVsZWdhdGU6KGlkIDxf V0tGb3JtRGVsZWdhdGU+KWZvcm1EZWxlZ2F0ZQogewogICAgIF9mb3JtRGVsZWdhdGUgPSBmb3Jt RGVsZWdhdGU7CisKKyAgICBjbGFzcyBGb3JtQ2xpZW50IDogcHVibGljIEFQSTo6Rm9ybUNsaWVu dCB7CisgICAgcHVibGljOgorICAgICAgICBleHBsaWNpdCBGb3JtQ2xpZW50KFdLV2ViVmlldyAq d2ViVmlldykKKyAgICAgICAgICAgIDogbV93ZWJWaWV3KHdlYlZpZXcpCisgICAgICAgIHsKKyAg ICAgICAgfQorCisgICAgICAgIHZpcnR1YWwgfkZvcm1DbGllbnQoKSB7IH0KKworICAgICAgICB2 aXJ0dWFsIGJvb2wgd2lsbFN1Ym1pdEZvcm0oV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBXZWJLaXQ6 OldlYkZyYW1lUHJveHkqLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqIHNvdXJjZUZyYW1lLCBjb25z dCBWZWN0b3I8c3RkOjpwYWlyPFdURjo6U3RyaW5nLCBXVEY6OlN0cmluZz4+JiB0ZXh0RmllbGRW YWx1ZXMsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSwgV2ViS2l0OjpXZWJGb3JtU3VibWlzc2lvbkxp c3RlbmVyUHJveHkqIGxpc3RlbmVyKSBvdmVycmlkZQorICAgICAgICB7CisgICAgICAgICAgICBp ZiAodXNlckRhdGEgJiYgdXNlckRhdGEtPnR5cGUoKSAhPSBBUEk6Ok9iamVjdDo6VHlwZTo6RGF0 YSkgeworICAgICAgICAgICAgICAgIEFTU0VSVCghdXNlckRhdGEgfHwgdXNlckRhdGEtPnR5cGUo KSA9PSBBUEk6Ok9iamVjdDo6VHlwZTo6RGF0YSk7CisgICAgICAgICAgICAgICAgbV93ZWJWaWV3 LT5fcGFnZS0+cHJvY2VzcygpLmNvbm5lY3Rpb24oKS0+bWFya0N1cnJlbnRseURpc3BhdGNoZWRN ZXNzYWdlQXNJbnZhbGlkKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICBhdXRvIGZvcm1EZWxlZ2F0ZSA9IG1fd2ViVmlldy0+X2Zv cm1EZWxlZ2F0ZS5nZXQoKTsKKworICAgICAgICAgICAgaWYgKCFbZm9ybURlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6d2lsbFN1Ym1pdEZvcm1WYWx1ZXM6dXNl ck9iamVjdDpzdWJtaXNzaW9uSGFuZGxlcjopXSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisKKyAgICAgICAgICAgIGF1dG8gdmFsdWVNYXAgPSBhZG9wdE5TKFtbTlNNdXRhYmxlRGlj dGlvbmFyeSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTp0ZXh0RmllbGRWYWx1ZXMuc2l6ZSgpXSk7 CisgICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHBhaXIgOiB0ZXh0RmllbGRWYWx1ZXMpCisg ICAgICAgICAgICAgICAgW3ZhbHVlTWFwIHNldE9iamVjdDpwYWlyLnNlY29uZCBmb3JLZXk6cGFp ci5maXJzdF07CisKKyAgICAgICAgICAgIE5TT2JqZWN0IDxOU1NlY3VyZUNvZGluZz4gKnVzZXJP YmplY3QgPSBuaWw7CisgICAgICAgICAgICBpZiAoQVBJOjpEYXRhKiBkYXRhID0gc3RhdGljX2Nh c3Q8QVBJOjpEYXRhKj4odXNlckRhdGEpKSB7CisgICAgICAgICAgICAgICAgYXV0byBuc0RhdGEg PSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzTm9Db3B5OmNvbnN0X2Nhc3Q8 dm9pZCo+KHN0YXRpY19jYXN0PGNvbnN0IHZvaWQqPihkYXRhLT5ieXRlcygpKSkgbGVuZ3RoOmRh dGEtPnNpemUoKSBmcmVlV2hlbkRvbmU6Tk9dKTsKKyAgICAgICAgICAgICAgICBhdXRvIHVuYXJj aGl2ZXIgPSBhZG9wdE5TKFtbTlNLZXllZFVuYXJjaGl2ZXIgYWxsb2NdIGluaXRGb3JSZWFkaW5n V2l0aERhdGE6bnNEYXRhLmdldCgpXSk7CisgICAgICAgICAgICAgICAgW3VuYXJjaGl2ZXIgc2V0 UmVxdWlyZXNTZWN1cmVDb2Rpbmc6WUVTXTsKKyAgICAgICAgICAgICAgICBAdHJ5IHsKKyAgICAg ICAgICAgICAgICAgICAgdXNlck9iamVjdCA9IFt1bmFyY2hpdmVyIGRlY29kZU9iamVjdE9mQ2xh c3M6W05TT2JqZWN0IGNsYXNzXSBmb3JLZXk6QCJ1c2VyT2JqZWN0Il07CisgICAgICAgICAgICAg ICAgfSBAY2F0Y2ggKE5TRXhjZXB0aW9uICpleGNlcHRpb24pIHsKKyAgICAgICAgICAgICAgICAg ICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gZGVjb2RlIHVzZXIgZGF0YTogJUAiLCBleGNlcHRpb24p OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgW2Zvcm1E ZWxlZ2F0ZSBfd2ViVmlldzptX3dlYlZpZXcgd2lsbFN1Ym1pdEZvcm1WYWx1ZXM6dmFsdWVNYXAu Z2V0KCkgdXNlck9iamVjdDp1c2VyT2JqZWN0IHN1Ym1pc3Npb25IYW5kbGVyOl57CisgICAgICAg ICAgICAgICAgbGlzdGVuZXItPmNvbnRpbnVlU3VibWlzc2lvbigpOworICAgICAgICAgICAgfV07 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgcHJpdmF0ZToKKyAg ICAgICAgV0tXZWJWaWV3ICptX3dlYlZpZXc7CisgICAgfTsKKworICAgIGlmIChmb3JtRGVsZWdh dGUpCisgICAgICAgIF9wYWdlLT5zZXRGb3JtQ2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8Rm9ybUNs aWVudD4oc2VsZikpOworICAgIGVsc2UKKyAgICAgICAgX3BhZ2UtPnNldEZvcm1DbGllbnQobnVs bHB0cik7CiB9CiAKICNwcmFnbWEgbWFyayBpT1Mtc3BlY2lmaWMgbWV0aG9kcwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tGb3JtRGVsZWdhdGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0Zvcm1EZWxlZ2F0 ZS5oCShyZXZpc2lvbiAxNjczMTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS0Zvcm1EZWxlZ2F0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNyw3IEBACiBA b3B0aW9uYWwKIAogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRTdGFy dElucHV0U2Vzc2lvbjooaWQgPF9XS0Zvcm1JbnB1dFNlc3Npb24+KWlucHV0U2Vzc2lvbjsKKy0g KHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgd2lsbFN1Ym1pdEZvcm1WYWx1ZXM6 KE5TRGljdGlvbmFyeSAqKXZhbHVlcyB1c2VyT2JqZWN0OihOU09iamVjdCA8TlNTZWN1cmVDb2Rp bmc+ICopdXNlck9iamVjdCBzdWJtaXNzaW9uSGFuZGxlcjoodm9pZCAoXikodm9pZCkpc3VibWlz c2lvbkhhbmRsZXI7CiAKICNpZiBUQVJHRVRfT1NfSVBIT05FCiAtICh2b2lkKV93ZWJWaWV3OihX S1dlYlZpZXcgKil3ZWJWaWV3IGFjY2Vzc29yeVZpZXdDdXN0b21CdXR0b25UYXBwZWRJbkZvcm1J bnB1dFNlc3Npb246KGlkIDxfV0tGb3JtSW5wdXRTZXNzaW9uPilpbnB1dFNlc3Npb247CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dl YlByb2Nlc3NQbHVnSW5Gb3JtRGVsZWdhdGVQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNz UGx1Z0luRm9ybURlbGVnYXRlUHJpdmF0ZS5oCShyZXZpc2lvbiAxNjczMTEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQ bHVnSW5Gb3JtRGVsZWdhdGVQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDEw IEBACiAtICh2b2lkKV93ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOihX S1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljb250cm9sbGVyIHdp bGxTdWJtaXRGb3JtOihXS1dlYlByb2Nlc3NQbHVnSW5Ob2RlSGFuZGxlICopZm9ybSB0b0ZyYW1l OihXS1dlYlByb2Nlc3NQbHVnSW5GcmFtZSAqKWZyYW1lIGZyb21GcmFtZTooV0tXZWJQcm9jZXNz UGx1Z0luRnJhbWUgKilzb3VyY2VGcmFtZSB3aXRoVmFsdWVzOihOU0RpY3Rpb25hcnkgKil2YWx1 ZXM7CiAtICh2b2lkKV93ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOihX S1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljb250cm9sbGVyIHRl eHREaWRDaGFuZ2VJblRleHRGaWVsZDooV0tXZWJQcm9jZXNzUGx1Z0luTm9kZUhhbmRsZSAqKXRl eHRGaWVsZCBpbkZyYW1lOihXS1dlYlByb2Nlc3NQbHVnSW5GcmFtZSAqKWZyYW1lIGluaXRpYXRl ZEJ5VXNlclR5cGluZzooQk9PTClpbml0aWF0ZWRCeVVzZXJUeXBpbmc7CiAKKy8vIEZJWE1FOiBP bmNlIG5vIG9uZSBpbXBsZW1lbnRzIHRoZSBhYm92ZSB3aWxsU3VibWl0Rm9ybTosIHJlbW92ZSAi bmV3IiBmcm9tIHRoZSBuYW1lLgorLy8gVGhlIHJldHVybiB2YWx1ZSBpcyBleHBvc2VkIGluIHRo ZSBVSSBwcm9jZXNzIHZpYSB0aGUgdXNlck9iamVjdCBwYXJhbWV0ZXIgdG8gW2lkIDxfV0tGb3Jt RGVsZWdhdGU+IF93ZWJWaWV3OndpbGxTdWJtaXRGb3JtVmFsdWVzOnVzZXJPYmplY3Q6c3VibWlz c2lvbkhhbmRsZXI6XS4KKy0gKE5TT2JqZWN0IDxOU1NlY3VyZUNvZGluZz4gKilfd2ViUHJvY2Vz c1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3Nl ckNvbnRleHRDb250cm9sbGVyICopY29udHJvbGxlciBuZXdXaWxsU3VibWl0Rm9ybTooV0tXZWJQ cm9jZXNzUGx1Z0luTm9kZUhhbmRsZSAqKWZvcm0gdG9GcmFtZTooV0tXZWJQcm9jZXNzUGx1Z0lu RnJhbWUgKilmcmFtZSBmcm9tRnJhbWU6KFdLV2ViUHJvY2Vzc1BsdWdJbkZyYW1lICopc291cmNl RnJhbWUgd2l0aFZhbHVlczooTlNEaWN0aW9uYXJ5ICopdmFsdWVzOworCiAvLyBUaGUgcmV0dXJu IHZhbHVlIGlzIGV4cG9zZWQgaW4gdGhlIFVJIHByb2Nlc3MgdmlhIHRoZSB1c2VyT2JqZWN0IHBy b3BlcnR5IG9mIHRoZSBfV0tGb3JtSW5wdXRTZXNzaW9uIG9iamVjdC4KIC0gKE5TT2JqZWN0IDxO U1NlY3VyZUNvZGluZz4gKilfd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxl cjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopY29udHJvbGxl ciB3aWxsQmVnaW5JbnB1dFNlc3Npb25Gb3JFbGVtZW50OihXS1dlYlByb2Nlc3NQbHVnSW5Ob2Rl SGFuZGxlICopbm9kZSBpbkZyYW1lOihXS1dlYlByb2Nlc3NQbHVnSW5GcmFtZSAqKWZyYW1lOwog CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMv V0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dl YlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0JKHJldmlzaW9uIDE2NzMx MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9X S1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29w eSkKQEAgLTQwNywxMSArNDA3LDM3IEBAIC0gKHZvaWQpX3NldEZvcm1EZWxlZ2F0ZTooaWQgPFdL V2ViUHJvY2UKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCisgICAgICAgIHN0YXRpYyB2b2lk IGVuY29kZVVzZXJPYmplY3QoTlNPYmplY3QgPE5TU2VjdXJlQ29kaW5nPiAqdXNlck9iamVjdCwg UmVmUHRyPEFQSTo6T2JqZWN0PiYgdXNlckRhdGEpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlm ICghdXNlck9iamVjdCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGF1 dG8gZGF0YSA9IGFkb3B0TlMoW1tOU011dGFibGVEYXRhIGFsbG9jXSBpbml0XSk7CisgICAgICAg ICAgICBhdXRvIGFyY2hpdmVyID0gYWRvcHROUyhbW05TS2V5ZWRBcmNoaXZlciBhbGxvY10gaW5p dEZvcldyaXRpbmdXaXRoTXV0YWJsZURhdGE6ZGF0YS5nZXQoKV0pOworICAgICAgICAgICAgW2Fy Y2hpdmVyIHNldFJlcXVpcmVzU2VjdXJlQ29kaW5nOllFU107CisgICAgICAgICAgICBAdHJ5IHsK KyAgICAgICAgICAgICAgICBbYXJjaGl2ZXIgZW5jb2RlT2JqZWN0OnVzZXJPYmplY3QgZm9yS2V5 OkAidXNlck9iamVjdCJdOworICAgICAgICAgICAgfSBAY2F0Y2ggKE5TRXhjZXB0aW9uICpleGNl cHRpb24pIHsKKyAgICAgICAgICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBlbmNvZGUgdXNl ciBvYmplY3Q6ICVAIiwgZXhjZXB0aW9uKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICB9CisgICAgICAgICAgICBbYXJjaGl2ZXIgZmluaXNoRW5jb2RpbmddOworCisgICAg ICAgICAgICB1c2VyRGF0YSA9IEFQSTo6RGF0YTo6Y3JlYXRlV2l0aG91dENvcHlpbmcoKGNvbnN0 IHVuc2lnbmVkIGNoYXIqKVtkYXRhIGJ5dGVzXSwgW2RhdGEgbGVuZ3RoXSwgcmVsZWFzZU5TRGF0 YSwgZGF0YS5sZWFrUmVmKCkpLmxlYWtSZWYoKTsKKyAgICAgICAgfQorCiAgICAgICAgIHZpcnR1 YWwgdm9pZCB3aWxsU3VibWl0Rm9ybShXZWJQYWdlKiwgSFRNTEZvcm1FbGVtZW50KiBmb3JtRWxl bWVudCwgV2ViRnJhbWUqIGZyYW1lLCBXZWJGcmFtZSogc291cmNlRnJhbWUsIGNvbnN0IFZlY3Rv cjxzdGQ6OnBhaXI8V1RGOjpTdHJpbmcsIFdURjo6U3RyaW5nPj4mIHZhbHVlcywgUmVmUHRyPEFQ STo6T2JqZWN0PiYgdXNlckRhdGEpIG92ZXJyaWRlCiAgICAgICAgIHsKICAgICAgICAgICAgIGF1 dG8gZm9ybURlbGVnYXRlID0gbV9jb250cm9sbGVyLT5fZm9ybURlbGVnYXRlLmdldCgpOwogCi0g ICAgICAgICAgICBpZiAoW2Zvcm1EZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KF93ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOndpbGxTdWJtaXRGb3Jt OnRvRnJhbWU6ZnJvbUZyYW1lOndpdGhWYWx1ZXM6KV0pIHsKKyAgICAgICAgICAgIGlmIChbZm9y bURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlByb2Nlc3NQbHVnSW5C cm93c2VyQ29udGV4dENvbnRyb2xsZXI6bmV3V2lsbFN1Ym1pdEZvcm06dG9GcmFtZTpmcm9tRnJh bWU6d2l0aFZhbHVlczopXSkgeworICAgICAgICAgICAgICAgIGF1dG8gdmFsdWVNYXAgPSBhZG9w dE5TKFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTp2YWx1ZXMu c2l6ZSgpXSk7CisgICAgICAgICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBwYWlyIDogdmFsdWVz KQorICAgICAgICAgICAgICAgICAgICBbdmFsdWVNYXAgc2V0T2JqZWN0OnBhaXIuc2Vjb25kIGZv cktleTpwYWlyLmZpcnN0XTsKKworICAgICAgICAgICAgICAgIE5TT2JqZWN0IDxOU1NlY3VyZUNv ZGluZz4gKnVzZXJPYmplY3QgPSBbZm9ybURlbGVnYXRlIF93ZWJQcm9jZXNzUGx1Z0luQnJvd3Nl ckNvbnRleHRDb250cm9sbGVyOm1fY29udHJvbGxlciBuZXdXaWxsU3VibWl0Rm9ybTp3cmFwcGVy KCpJbmplY3RlZEJ1bmRsZU5vZGVIYW5kbGU6OmdldE9yQ3JlYXRlKGZvcm1FbGVtZW50KS5nZXQo KSkgdG9GcmFtZTp3cmFwcGVyKCpmcmFtZSkgZnJvbUZyYW1lOndyYXBwZXIoKnNvdXJjZUZyYW1l KSB3aXRoVmFsdWVzOnZhbHVlTWFwLmdldCgpXTsKKyAgICAgICAgICAgICAgICBlbmNvZGVVc2Vy T2JqZWN0KHVzZXJPYmplY3QsIHVzZXJEYXRhKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoW2Zv cm1EZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJQcm9jZXNzUGx1Z0lu QnJvd3NlckNvbnRleHRDb250cm9sbGVyOndpbGxTdWJtaXRGb3JtOnRvRnJhbWU6ZnJvbUZyYW1l OndpdGhWYWx1ZXM6KV0pIHsKICAgICAgICAgICAgICAgICBhdXRvIHZhbHVlTWFwID0gYWRvcHRO UyhbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6dmFsdWVzLnNp emUoKV0pOwogICAgICAgICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgcGFpciA6IHZhbHVlcykK ICAgICAgICAgICAgICAgICAgICAgW3ZhbHVlTWFwIHNldE9iamVjdDpwYWlyLnNlY29uZCBmb3JL ZXk6cGFpci5maXJzdF07CkBAIC00NDEsMjEgKzQ2Nyw3IEBAIC0gKHZvaWQpX3NldEZvcm1EZWxl Z2F0ZTooaWQgPFdLV2ViUHJvY2UKICAgICAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAg ICAgIE5TT2JqZWN0IDxOU1NlY3VyZUNvZGluZz4gKnVzZXJPYmplY3QgPSBbZm9ybURlbGVnYXRl IF93ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOm1fY29udHJvbGxlciB3 aWxsQmVnaW5JbnB1dFNlc3Npb25Gb3JFbGVtZW50OndyYXBwZXIoKldlYktpdDo6SW5qZWN0ZWRC dW5kbGVOb2RlSGFuZGxlOjpnZXRPckNyZWF0ZShlbGVtZW50KSkgaW5GcmFtZTp3cmFwcGVyKCpm cmFtZSldOwotICAgICAgICAgICAgaWYgKCF1c2VyT2JqZWN0KQotICAgICAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICAgICAgYXV0byBkYXRhID0gYWRvcHROUyhbW05TTXV0YWJsZURhdGEg YWxsb2NdIGluaXRdKTsKLSAgICAgICAgICAgIGF1dG8gYXJjaGl2ZXIgPSBhZG9wdE5TKFtbTlNL ZXllZEFyY2hpdmVyIGFsbG9jXSBpbml0Rm9yV3JpdGluZ1dpdGhNdXRhYmxlRGF0YTpkYXRhLmdl dCgpXSk7Ci0gICAgICAgICAgICBbYXJjaGl2ZXIgc2V0UmVxdWlyZXNTZWN1cmVDb2Rpbmc6WUVT XTsKLSAgICAgICAgICAgIEB0cnkgewotICAgICAgICAgICAgICAgIFthcmNoaXZlciBlbmNvZGVP YmplY3Q6dXNlck9iamVjdCBmb3JLZXk6QCJ1c2VyT2JqZWN0Il07Ci0gICAgICAgICAgICB9IEBj YXRjaCAoTlNFeGNlcHRpb24gKmV4Y2VwdGlvbikgewotICAgICAgICAgICAgICAgIExPR19FUlJP UigiRmFpbGVkIHRvIGVuY29kZSB1c2VyIG9iamVjdDogJUAiLCBleGNlcHRpb24pOwotICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIFthcmNoaXZlciBm aW5pc2hFbmNvZGluZ107Ci0KLSAgICAgICAgICAgIHVzZXJEYXRhID0gQVBJOjpEYXRhOjpjcmVh dGVXaXRob3V0Q29weWluZygoY29uc3QgdW5zaWduZWQgY2hhciopW2RhdGEgYnl0ZXNdLCBbZGF0 YSBsZW5ndGhdLCByZWxlYXNlTlNEYXRhLCBkYXRhLmxlYWtSZWYoKSkubGVha1JlZigpOworICAg ICAgICAgICAgZW5jb2RlVXNlck9iamVjdCh1c2VyT2JqZWN0LCB1c2VyRGF0YSk7CiAgICAgICAg IH0KIAogICAgIHByaXZhdGU6Cg==