140471 2015-01-14 15:22:13 -0800 Convert WKUserScript to be an API::Object bridged object 2015-01-14 16:35:04 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 1061346 0 sam 2015-01-14 15:22:13 -0800 Convert WKUserScript to be an API::Object bridged object 1061351 1 244652 sam 2015-01-14 15:27:57 -0800 Created attachment 244652 Patch 1061359 2 244652 mitz 2015-01-14 15:39:03 -0800 Comment on attachment 244652 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244652&action=review > Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h:69 > + void addUserScript(API::UserScript*); Can this take a reference? > Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h:87 > + Whitespace. 1061399 3 sam 2015-01-14 16:35:04 -0800 Committed r178464: <http://trac.webkit.org/changeset/178464> 244652 2015-01-14 15:27:57 -0800 2015-01-14 15:39:03 -0800 Patch bug-140471-20150114152803.patch text/plain 19958 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3ODQ1MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUxIEBACisyMDE1LTAxLTE0ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29udmVydCBXS1VzZXJTY3JpcHQgdG8g YmUgYW4gQVBJOjpPYmplY3QgYnJpZGdlZCBvYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDQ3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL0FQSS9BUElPYmplY3QuaDoKKyAgICAg ICAgKiBTaGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tOgorICAgICAgICAoQVBJOjpPYmplY3Q6Om5l d09iamVjdCk6CisgICAgICAgIEFkZCBUeXBlOjpVc2VyU2NyaXB0LgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9BUElVc2VyU2NyaXB0Lmg6IEFkZGVkLgorICAgICAgICBBZGQgQVBJIG9iamVj dCBmb3IgVXNlclNjcmlwdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNl ckNvbnRlbnRDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS1VzZXJDb250ZW50Q29udHJvbGxl ciBpbml0XSk6CisgICAgICAgICgtW1dLVXNlckNvbnRlbnRDb250cm9sbGVyIHVzZXJTY3JpcHRz XSk6CisgICAgICAgICgtW1dLVXNlckNvbnRlbnRDb250cm9sbGVyIGFkZFVzZXJTY3JpcHQ6XSk6 CisgICAgICAgICgtW1dLVXNlckNvbnRlbnRDb250cm9sbGVyIHJlbW92ZUFsbFVzZXJTY3JpcHRz XSk6CisgICAgICAgICh0b1dlYkNvcmVVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSk6IERlbGV0ZWQu CisgICAgICAgICogVUlQcm9jZXNzL1VzZXJDb250ZW50L1dlYlVzZXJDb250ZW50Q29udHJvbGxl clByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJv eHk6OldlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2Vi VXNlckNvbnRlbnRDb250cm9sbGVyUHJveHk6OmFkZFByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0 OjpXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eTo6YWRkVXNlclNjcmlwdCk6CisgICAgICAg IChXZWJLaXQ6OldlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5OjpyZW1vdmVBbGxVc2VyU2Ny aXB0cyk6CisgICAgICAgICogVUlQcm9jZXNzL1VzZXJDb250ZW50L1dlYlVzZXJDb250ZW50Q29u dHJvbGxlclByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJDb250ZW50Q29udHJvbGxl clByb3h5Ojp1c2VyU2NyaXB0cyk6CisgICAgICAgIFN0b3JlIHRoZSBXS1VzZXJTY3JpcHRzIGlu IHRoZSBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eSBpbnN0ZWFkIG9mIHRoZQorICAgICAg ICBPYmplY3RpdmUtQyBsYXllciBXS1VzZXJDb250ZW50Q29udHJvbGxlciwgdG8gYWxsb3cgY3Jl YXRpb24gb2YgdGhlIG9iamVjdAorICAgICAgICBmcm9tIGVpdGhlciB0aGUgT2JqZWN0aXZlLUMg b3IgQysrIHNpZGVzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VzZXJTY3Jp cHQubW06CisgICAgICAgIChnZW5lcmF0ZUlkZW50aWZpZXIpOgorICAgICAgICAoLVtXS1VzZXJT Y3JpcHQgaW5pdFdpdGhTb3VyY2U6aW5qZWN0aW9uVGltZTpmb3JNYWluRnJhbWVPbmx5Ol0pOgor ICAgICAgICAoLVtXS1VzZXJTY3JpcHQgc291cmNlXSk6CisgICAgICAgICgtW1dLVXNlclNjcmlw dCBpbmplY3Rpb25UaW1lXSk6CisgICAgICAgICgtW1dLVXNlclNjcmlwdCBpc0Zvck1haW5GcmFt ZU9ubHldKToKKyAgICAgICAgKC1bV0tVc2VyU2NyaXB0IF9hcGlPYmplY3RdKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNlclNjcmlwdEludGVybmFsLmg6CisgICAgICAgIChB UEk6OndyYXBwZXIpOgorICAgICAgICAoQVBJOjp0b1dlYkNvcmVVc2VyU2NyaXB0SW5qZWN0aW9u VGltZSk6CisgICAgICAgIChBUEk6OnRvV0tVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSk6CisgICAg ICAgIENvbnZlcnQgdG8gZ2V0IHByb3BlcnRpZXMgZnJvbSB0aGUgQVBJOjpVc2VyU2NyaXB0Lgor CisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICBB ZGQgdGhlIG5ldyBmaWxlLgorCiAyMDE1LTAxLTE0ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CiAKICAgICAgICAgU3dpdGNoIFZpc2l0ZWRMaW5rUHJvdmlkZXIgb3ZlciB0 byBXZWJQcm9jZXNzTGlmZXRpbWVPYnNlcnZlcgpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVk L0FQSS9BUElPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJ L0FQSU9iamVjdC5oCShyZXZpc2lvbiAxNzg0NDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv QVBJL0FQSU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC04MSw2ICs4MSw3IEBAIHB1YmxpYzoK ICAgICAgICAgVVJMUmVxdWVzdCwKICAgICAgICAgVVJMUmVzcG9uc2UsCiAgICAgICAgIFVzZXJD b250ZW50VVJMUGF0dGVybiwKKyAgICAgICAgVXNlclNjcmlwdCwKICAgICAgICAgV2ViQXJjaGl2 ZSwKICAgICAgICAgV2ViQXJjaGl2ZVJlc291cmNlLAogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvQ29jb2EvQVBJT2JqZWN0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9Db2NvYS9BUElPYmplY3QubW0JKHJldmlzaW9uIDE3ODQ0MikKKysrIFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9Db2NvYS9BUElPYmplY3QubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYgKzQ1 LDcgQEAKICNpbXBvcnQgIldLTmF2aWdhdGlvbkludGVybmFsLmgiCiAjaW1wb3J0ICJXS1Byb2Nl c3NQb29sSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLVXNlckNvbnRlbnRDb250cm9sbGVySW50ZXJu YWwuaCIKKyNpbXBvcnQgIldLVXNlclNjcmlwdEludGVybmFsLmgiCiAjaW1wb3J0ICJXS1dlYlBy b2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5oIgogI2ltcG9ydCAi V0tXZWJQcm9jZXNzUGx1Z0luRnJhbWVJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tXZWJQcm9jZXNz UGx1Z0luSGl0VGVzdFJlc3VsdEludGVybmFsLmgiCkBAIC0xNTgsNiArMTU5LDEwIEBAIHZvaWQq IE9iamVjdDo6bmV3T2JqZWN0KHNpemVfdCBzaXplLCBUeXAKICAgICAgICAgd3JhcHBlciA9IFtX S1VzZXJDb250ZW50Q29udHJvbGxlciBhbGxvY107CiAgICAgICAgIGJyZWFrOwogCisgICAgY2Fz ZSBUeXBlOjpVc2VyU2NyaXB0OgorICAgICAgICB3cmFwcGVyID0gW1dLVXNlclNjcmlwdCBhbGxv Y107CisgICAgICAgIGJyZWFrOworCiAgICAgY2FzZSBUeXBlOjpXZWJzaXRlRGF0YVN0b3JlOgog ICAgICAgICB3cmFwcGVyID0gW19XS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdOwogICAgICAgICBi cmVhazsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVXNlclNjcmlwdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVXNlclNjcmlw dC5oCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElVc2Vy U2NyaXB0LmgJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw1NCBAQAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor ICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJ QlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElU UyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNp Zm5kZWYgQVBJVXNlclNjcmlwdF9oCisjZGVmaW5lIEFQSVVzZXJTY3JpcHRfaAorCisjaW5jbHVk ZSAiQVBJT2JqZWN0LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9Vc2VyU2NyaXB0Lmg+CisKK25hbWVz cGFjZSBBUEkgeworCitjbGFzcyBVc2VyU2NyaXB0IGZpbmFsIDogcHVibGljIE9iamVjdEltcGw8 T2JqZWN0OjpUeXBlOjpVc2VyU2NyaXB0PiB7CitwdWJsaWM6CisgICAgVXNlclNjcmlwdChXZWJD b3JlOjpVc2VyU2NyaXB0IHVzZXJTY3JpcHQpCisgICAgICAgIDogbV91c2VyU2NyaXB0KHVzZXJT Y3JpcHQpCisgICAgeworICAgIH0KKworICAgIH5Vc2VyU2NyaXB0KCkKKyAgICB7CisgICAgfQor CisgICAgV2ViQ29yZTo6VXNlclNjcmlwdCYgdXNlclNjcmlwdCgpIHsgcmV0dXJuIG1fdXNlclNj cmlwdDsgfQorICAgIGNvbnN0IFdlYkNvcmU6OlVzZXJTY3JpcHQmIHVzZXJTY3JpcHQoKSBjb25z dCB7IHJldHVybiBtX3VzZXJTY3JpcHQ7IH0KKworcHJpdmF0ZToKKyAgICBXZWJDb3JlOjpVc2Vy U2NyaXB0IG1fdXNlclNjcmlwdDsKK307CisKK30gLy8gbmFtZXNwYWNlIEFQSQorCisjZW5kaWYg Ly8gQVBJVXNlclNjcmlwdF9oCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLVXNlckNvbnRlbnRDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVc2VyQ29udGVudENvbnRyb2xsZXIubW0JKHJldmlz aW9uIDE3ODQ0MikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVc2Vy Q29udGVudENvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNp ZiBXS19BUElfRU5BQkxFRAogCiAjaW1wb3J0ICJXS0ZyYW1lSW5mb0ludGVybmFsLmgiCisjaW1w b3J0ICJXS05TQXJyYXkuaCIKICNpbXBvcnQgIldLU2NyaXB0TWVzc2FnZUhhbmRsZXIuaCIKICNp bXBvcnQgIldLU2NyaXB0TWVzc2FnZUludGVybmFsLmgiCiAjaW1wb3J0ICJXS1VzZXJTY3JpcHRJ bnRlcm5hbC5oIgpAQCAtMzgsMTIgKzM5LDggQEAKICNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL0pT Q29udGV4dC5oPgogI2ltcG9ydCA8SmF2YVNjcmlwdENvcmUvSlNWYWx1ZS5oPgogI2ltcG9ydCA8 V2ViQ29yZS9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaD4KLSNpbXBvcnQgPFdlYkNvcmUvVXNlclNj cmlwdC5oPgotI2ltcG9ydCA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgogCi1AaW1wbGVtZW50 YXRpb24gV0tVc2VyQ29udGVudENvbnRyb2xsZXIgewotICAgIFJldGFpblB0cjxOU011dGFibGVB cnJheT4gX3VzZXJTY3JpcHRzOwotfQorQGltcGxlbWVudGF0aW9uIFdLVXNlckNvbnRlbnRDb250 cm9sbGVyCiAKIC0gKGluc3RhbmNldHlwZSlpbml0CiB7CkBAIC01MSw3ICs0OCw2IEBAIC0gKGlu c3RhbmNldHlwZSlpbml0CiAgICAgICAgIHJldHVybiBuaWw7CiAKICAgICBBUEk6Ok9iamVjdDo6 Y29uc3RydWN0SW5XcmFwcGVyPFdlYktpdDo6V2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHk+ KHNlbGYpOwotICAgIF91c2VyU2NyaXB0cyA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxv Y10gaW5pdF0pOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CkBAIC02NSwzOSArNjEsMTYgQEAgLSAo dm9pZClkZWFsbG9jCiAKIC0gKE5TQXJyYXkgKil1c2VyU2NyaXB0cwogewotICAgIHJldHVybiBf dXNlclNjcmlwdHMuZ2V0KCk7Ci19Ci0KLXN0YXRpYyBXZWJDb3JlOjpVc2VyU2NyaXB0SW5qZWN0 aW9uVGltZSB0b1dlYkNvcmVVc2VyU2NyaXB0SW5qZWN0aW9uVGltZShXS1VzZXJTY3JpcHRJbmpl Y3Rpb25UaW1lIGluamVjdGlvblRpbWUpCi17Ci0gICAgc3dpdGNoIChpbmplY3Rpb25UaW1lKSB7 Ci0gICAgY2FzZSBXS1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lQXREb2N1bWVudFN0YXJ0OgotICAg ICAgICByZXR1cm4gV2ViQ29yZTo6SW5qZWN0QXREb2N1bWVudFN0YXJ0OwotCi0gICAgY2FzZSBX S1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lQXREb2N1bWVudEVuZDoKLSAgICAgICAgcmV0dXJuIFdl YkNvcmU6OkluamVjdEF0RG9jdW1lbnRFbmQ7Ci0gICAgfQotCi0gICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgcmV0dXJuIFdlYkNvcmU6OkluamVjdEF0RG9jdW1lbnRFbmQ7CisgICAgcmV0 dXJuIHdyYXBwZXIoX3VzZXJDb250ZW50Q29udHJvbGxlclByb3h5LT51c2VyU2NyaXB0cygpKTsK IH0KIAogLSAodm9pZClhZGRVc2VyU2NyaXB0OihXS1VzZXJTY3JpcHQgKil1c2VyU2NyaXB0CiB7 Ci0gICAgW191c2VyU2NyaXB0cyBhZGRPYmplY3Q6dXNlclNjcmlwdF07Ci0KLSAgICBTdHJpbmdC dWlsZGVyIHVybFN0cmluZ0J1aWxkZXI7Ci0gICAgdXJsU3RyaW5nQnVpbGRlci5hcHBlbmQoInVz ZXItc2NyaXB0OiIpOwotICAgIHVybFN0cmluZ0J1aWxkZXIuYXBwZW5kTnVtYmVyKFtfdXNlclNj cmlwdHMgY291bnRdKTsKLQotICAgIFdlYkNvcmU6OlVSTCB1cmwgeyBXZWJDb3JlOjpVUkwgeyB9 LCB1cmxTdHJpbmdCdWlsZGVyLnRvU3RyaW5nKCkgfTsKLSAgICBfdXNlckNvbnRlbnRDb250cm9s bGVyUHJveHktPmFkZFVzZXJTY3JpcHQoV2ViQ29yZTo6VXNlclNjcmlwdCB7IHVzZXJTY3JpcHQt Pl9zb3VyY2UuZ2V0KCksIHVybCwgeyB9LCB7IH0sIHRvV2ViQ29yZVVzZXJTY3JpcHRJbmplY3Rp b25UaW1lKHVzZXJTY3JpcHQtPl9pbmplY3Rpb25UaW1lKSwgdXNlclNjcmlwdC0+X2Zvck1haW5G cmFtZU9ubHkgPyBXZWJDb3JlOjpJbmplY3RJblRvcEZyYW1lT25seSA6IFdlYkNvcmU6OkluamVj dEluQWxsRnJhbWVzIH0pOworICAgIF91c2VyQ29udGVudENvbnRyb2xsZXJQcm94eS0+YWRkVXNl clNjcmlwdCh1c2VyU2NyaXB0LT5fdXNlclNjcmlwdC5nZXQoKSk7CiB9CiAKIC0gKHZvaWQpcmVt b3ZlQWxsVXNlclNjcmlwdHMKIHsKLSAgICBbX3VzZXJTY3JpcHRzIHJlbW92ZUFsbE9iamVjdHNd OwotCiAgICAgX3VzZXJDb250ZW50Q29udHJvbGxlclByb3h5LT5yZW1vdmVBbGxVc2VyU2NyaXB0 cygpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNl clNjcmlwdC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLVXNlclNjcmlwdC5tbQkocmV2aXNpb24gMTc4NDQyKQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VzZXJTY3JpcHQubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4 LDMzICsyOCw0NSBAQAogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAorI2ltcG9ydCA8d3RmL3RleHQv U3RyaW5nQnVpbGRlci5oPgorCiBAaW1wbGVtZW50YXRpb24gV0tVc2VyU2NyaXB0CiAKK3N0YXRp YyB1aW50NjRfdCBnZW5lcmF0ZUlkZW50aWZpZXIoKQoreworICAgIHN0YXRpYyB1aW50NjRfdCBp ZGVudGlmaWVyOworCisgICAgcmV0dXJuICsraWRlbnRpZmllcjsKK30KKwogLSAoaW5zdGFuY2V0 eXBlKWluaXRXaXRoU291cmNlOihOU1N0cmluZyAqKXNvdXJjZSBpbmplY3Rpb25UaW1lOihXS1Vz ZXJTY3JpcHRJbmplY3Rpb25UaW1lKWluamVjdGlvblRpbWUgZm9yTWFpbkZyYW1lT25seTooQk9P TClmb3JNYWluRnJhbWVPbmx5CiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAg ICAgICAgIHJldHVybiBuaWw7CiAKLSAgICBfc291cmNlID0gYWRvcHROUyhbc291cmNlIGNvcHld KTsKLSAgICBfaW5qZWN0aW9uVGltZSA9IGluamVjdGlvblRpbWU7Ci0gICAgX2Zvck1haW5GcmFt ZU9ubHkgPSBmb3JNYWluRnJhbWVPbmx5OworICAgIFN0cmluZ0J1aWxkZXIgdXJsU3RyaW5nQnVp bGRlcjsKKyAgICB1cmxTdHJpbmdCdWlsZGVyLmFwcGVuZCgidXNlci1zY3JpcHQ6Iik7CisgICAg dXJsU3RyaW5nQnVpbGRlci5hcHBlbmROdW1iZXIoZ2VuZXJhdGVJZGVudGlmaWVyKCkpOworICAg IFdlYkNvcmU6OlVSTCB1cmwgeyBXZWJDb3JlOjpVUkwgeyB9LCB1cmxTdHJpbmdCdWlsZGVyLnRv U3RyaW5nKCkgfTsKKworICAgIEFQSTo6T2JqZWN0Ojpjb25zdHJ1Y3RJbldyYXBwZXI8QVBJOjpV c2VyU2NyaXB0PihzZWxmLCBXZWJDb3JlOjpVc2VyU2NyaXB0IHsgV1RGOjpTdHJpbmcoc291cmNl KSwgdXJsLCB7IH0sIHsgfSwgQVBJOjp0b1dlYkNvcmVVc2VyU2NyaXB0SW5qZWN0aW9uVGltZShp bmplY3Rpb25UaW1lKSwgZm9yTWFpbkZyYW1lT25seSA/IFdlYkNvcmU6OkluamVjdEluVG9wRnJh bWVPbmx5IDogV2ViQ29yZTo6SW5qZWN0SW5BbGxGcmFtZXMgfSk7CiAKICAgICByZXR1cm4gc2Vs ZjsKIH0KIAogLSAoTlNTdHJpbmcgKilzb3VyY2UKIHsKLSAgICByZXR1cm4gX3NvdXJjZS5nZXQo KTsKKyAgICByZXR1cm4gX3VzZXJTY3JpcHQtPnVzZXJTY3JpcHQoKS5zb3VyY2UoKTsKIH0KIAog LSAoV0tVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSlpbmplY3Rpb25UaW1lCiB7Ci0gICAgcmV0dXJu IF9pbmplY3Rpb25UaW1lOworICAgIHJldHVybiBBUEk6OnRvV0tVc2VyU2NyaXB0SW5qZWN0aW9u VGltZShfdXNlclNjcmlwdC0+dXNlclNjcmlwdCgpLmluamVjdGlvblRpbWUoKSk7CiB9CiAKIC0g KEJPT0wpaXNGb3JNYWluRnJhbWVPbmx5CiB7Ci0gICAgcmV0dXJuIF9mb3JNYWluRnJhbWVPbmx5 OworICAgIHJldHVybiBfdXNlclNjcmlwdC0+dXNlclNjcmlwdCgpLmluamVjdGVkRnJhbWVzKCkg PT0gV2ViQ29yZTo6SW5qZWN0SW5Ub3BGcmFtZU9ubHk7CiB9CiAKIC0gKGlkKWNvcHlXaXRoWm9u ZTooTlNab25lICopem9uZQpAQCAtNjIsNiArNzQsMTMgQEAgLSAoaWQpY29weVdpdGhab25lOihO U1pvbmUgKil6b25lCiAgICAgcmV0dXJuIFtzZWxmIHJldGFpbl07CiB9CiAKKyNwcmFnbWEgbWFy ayBXS09iamVjdCBwcm90b2NvbCBpbXBsZW1lbnRhdGlvbgorCistIChBUEk6Ok9iamVjdCYpX2Fw aU9iamVjdAoreworICAgIHJldHVybiAqX3VzZXJTY3JpcHQ7Cit9CisKIEBlbmQKIAogI2VuZGlm CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNlclNjcmlwdElu dGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1VzZXJTY3JpcHRJbnRlcm5hbC5oCShyZXZpc2lvbiAxNzg0NDIpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVXNlclNjcmlwdEludGVybmFsLmgJKHdvcmtpbmcg Y29weSkKQEAgLTI3LDE1ICsyNyw1MSBAQAogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAorI2ltcG9y dCAiQVBJVXNlclNjcmlwdC5oIgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCi1AaW50ZXJm YWNlIFdLVXNlclNjcmlwdCAoKSB7Ci1AcGFja2FnZQotICAgIFJldGFpblB0cjxOU1N0cmluZz4g X3NvdXJjZTsKLSAgICBXS1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lIF9pbmplY3Rpb25UaW1lOwot ICAgIEJPT0wgX2Zvck1haW5GcmFtZU9ubHk7CituYW1lc3BhY2UgQVBJIHsKKworaW5saW5lIFdL VXNlclNjcmlwdCAqd3JhcHBlcihVc2VyU2NyaXB0JiB1c2VyU2NyaXB0KQoreworICAgIEFTU0VS VChbdXNlclNjcmlwdC53cmFwcGVyKCkgaXNLaW5kT2ZDbGFzczpbV0tVc2VyU2NyaXB0IGNsYXNz XV0pOworICAgIHJldHVybiAoV0tVc2VyU2NyaXB0ICopdXNlclNjcmlwdC53cmFwcGVyKCk7Cit9 CisKK2lubGluZSBXZWJDb3JlOjpVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSB0b1dlYkNvcmVVc2Vy U2NyaXB0SW5qZWN0aW9uVGltZShXS1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lIGluamVjdGlvblRp bWUpCit7CisgICAgc3dpdGNoIChpbmplY3Rpb25UaW1lKSB7CisgICAgY2FzZSBXS1VzZXJTY3Jp cHRJbmplY3Rpb25UaW1lQXREb2N1bWVudFN0YXJ0OgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6 SW5qZWN0QXREb2N1bWVudFN0YXJ0OworCisgICAgY2FzZSBXS1VzZXJTY3JpcHRJbmplY3Rpb25U aW1lQXREb2N1bWVudEVuZDoKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkluamVjdEF0RG9jdW1l bnRFbmQ7CisgICAgfQorCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIFdl YkNvcmU6OkluamVjdEF0RG9jdW1lbnRFbmQ7Cit9CisKK2lubGluZSBXS1VzZXJTY3JpcHRJbmpl Y3Rpb25UaW1lIHRvV0tVc2VyU2NyaXB0SW5qZWN0aW9uVGltZShXZWJDb3JlOjpVc2VyU2NyaXB0 SW5qZWN0aW9uVGltZSBpbmplY3Rpb25UaW1lKQoreworICAgIHN3aXRjaCAoaW5qZWN0aW9uVGlt ZSkgeworICAgIGNhc2UgV2ViQ29yZTo6SW5qZWN0QXREb2N1bWVudFN0YXJ0OgorICAgICAgICBy ZXR1cm4gV0tVc2VyU2NyaXB0SW5qZWN0aW9uVGltZUF0RG9jdW1lbnRTdGFydDsKKworICAgIGNh c2UgV2ViQ29yZTo6SW5qZWN0QXREb2N1bWVudEVuZDoKKyAgICAgICAgcmV0dXJuIFdLVXNlclNj cmlwdEluamVjdGlvblRpbWVBdERvY3VtZW50RW5kOworICAgIH0KKworICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworICAgIHJldHVybiBXS1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lQXREb2N1bWVu dEVuZDsKIH0KIAorfQorCitAaW50ZXJmYWNlIFdLVXNlclNjcmlwdCAoKSA8V0tPYmplY3Q+IHsK K0BwYWNrYWdlCisgICAgQVBJOjpPYmplY3RTdG9yYWdlPEFQSTo6VXNlclNjcmlwdD4gX3VzZXJT Y3JpcHQ7Cit9CiBAZW5kCiAKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1VzZXJDb250ZW50L1dlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVXNlckNvbnRlbnQvV2ViVXNlckNvbnRlbnRD b250cm9sbGVyUHJveHkuY3BwCShyZXZpc2lvbiAxNzg0NDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvVXNlckNvbnRlbnQvV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5j bHVkZSAiV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkuaCIKIAorI2luY2x1ZGUgIkFQSUFy cmF5LmgiCisjaW5jbHVkZSAiQVBJVXNlclNjcmlwdC5oIgogI2luY2x1ZGUgIkRhdGFSZWZlcmVu Y2UuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlICJXZWJTY3JpcHRN ZXNzYWdlSGFuZGxlci5oIgpAQCAtNDQsNiArNDYsNyBAQCBzdGF0aWMgdWludDY0X3QgZ2VuZXJh dGVJZGVudGlmaWVyKCkKIAogV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHk6OldlYlVzZXJD b250ZW50Q29udHJvbGxlclByb3h5KCkKICAgICA6IG1faWRlbnRpZmllcihnZW5lcmF0ZUlkZW50 aWZpZXIoKSkKKyAgICAsIG1fdXNlclNjcmlwdHMoKkFQSTo6QXJyYXk6OmNyZWF0ZSgpKQogewog fQogCkBAIC02Miw3ICs2NSwxMSBAQCB2b2lkIFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5 OjphZGRQCiAKICAgICB3ZWJQcm9jZXNzUHJveHkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBt X2lkZW50aWZpZXIsICp0aGlzKTsKIAotICAgIHdlYlByb2Nlc3NQcm94eS5jb25uZWN0aW9uKCkt PnNlbmQoTWVzc2FnZXM6OldlYlVzZXJDb250ZW50Q29udHJvbGxlcjo6QWRkVXNlclNjcmlwdHMo bV91c2VyU2NyaXB0cyksIG1faWRlbnRpZmllcik7CisgICAgVmVjdG9yPFdlYkNvcmU6OlVzZXJT Y3JpcHQ+IHVzZXJTY3JpcHRzOworICAgIGZvciAoY29uc3QgYXV0byYgdXNlclNjcmlwdCA6IG1f dXNlclNjcmlwdHMtPmVsZW1lbnRzT2ZUeXBlPEFQSTo6VXNlclNjcmlwdD4oKSkKKyAgICAgICAg dXNlclNjcmlwdHMuYXBwZW5kKHVzZXJTY3JpcHQtPnVzZXJTY3JpcHQoKSk7CisgICAgd2ViUHJv Y2Vzc1Byb3h5LmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViVXNlckNvbnRlbnRDb250 cm9sbGVyOjpBZGRVc2VyU2NyaXB0cyh1c2VyU2NyaXB0cyksIG1faWRlbnRpZmllcik7CisKICAg ICB3ZWJQcm9jZXNzUHJveHkuY29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJVc2VyQ29u dGVudENvbnRyb2xsZXI6OkFkZFVzZXJTdHlsZVNoZWV0cyhtX3VzZXJTdHlsZVNoZWV0cyksIG1f aWRlbnRpZmllcik7CiAKICAgICBWZWN0b3I8V2ViU2NyaXB0TWVzc2FnZUhhbmRsZXJIYW5kbGU+ IG1lc3NhZ2VIYW5kbGVySGFuZGxlczsKQEAgLTc5LDE3ICs4NiwxNyBAQCB2b2lkIFdlYlVzZXJD b250ZW50Q29udHJvbGxlclByb3h5OjpyZW1vCiAgICAgd2ViUHJvY2Vzc1Byb3h5LnJlbW92ZU1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHk6Om1l c3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9pZGVudGlmaWVyKTsKIH0KIAotdm9pZCBXZWJVc2VyQ29u dGVudENvbnRyb2xsZXJQcm94eTo6YWRkVXNlclNjcmlwdChXZWJDb3JlOjpVc2VyU2NyaXB0IHVz ZXJTY3JpcHQpCit2b2lkIFdlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5OjphZGRVc2VyU2Ny aXB0KEFQSTo6VXNlclNjcmlwdCogdXNlclNjcmlwdCkKIHsKLSAgICBtX3VzZXJTY3JpcHRzLmFw cGVuZChXVEY6Om1vdmUodXNlclNjcmlwdCkpOworICAgIG1fdXNlclNjcmlwdHMtPmVsZW1lbnRz KCkuYXBwZW5kKHVzZXJTY3JpcHQpOwogCiAgICAgZm9yIChXZWJQcm9jZXNzUHJveHkqIHByb2Nl c3MgOiBtX3Byb2Nlc3NlcykKLSAgICAgICAgcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1l c3NhZ2VzOjpXZWJVc2VyQ29udGVudENvbnRyb2xsZXI6OkFkZFVzZXJTY3JpcHRzKHsgbV91c2Vy U2NyaXB0cy5sYXN0KCkgfSksIG1faWRlbnRpZmllcik7CisgICAgICAgIHByb2Nlc3MtPmNvbm5l Y3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpBZGRVc2Vy U2NyaXB0cyh7IHVzZXJTY3JpcHQtPnVzZXJTY3JpcHQoKSB9KSwgbV9pZGVudGlmaWVyKTsKIH0K IAogdm9pZCBXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eTo6cmVtb3ZlQWxsVXNlclNjcmlw dHMoKQogewotICAgIG1fdXNlclNjcmlwdHMuY2xlYXIoKTsKKyAgICBtX3VzZXJTY3JpcHRzLT5l bGVtZW50cygpLmNsZWFyKCk7CiAKICAgICBmb3IgKFdlYlByb2Nlc3NQcm94eSogcHJvY2VzcyA6 IG1fcHJvY2Vzc2VzKQogICAgICAgICBwcm9jZXNzLT5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2Fn ZXM6OldlYlVzZXJDb250ZW50Q29udHJvbGxlcjo6UmVtb3ZlQWxsVXNlclNjcmlwdHMoKSwgbV9p ZGVudGlmaWVyKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Vc2VyQ29udGVudC9X ZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9Vc2VyQ29udGVudC9XZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eS5o CShyZXZpc2lvbiAxNzg0NDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVXNlckNvbnRl bnQvV2ViVXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzIs OSArMzIsMTUgQEAKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9IYXNo U2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVmLmg+ CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAK K25hbWVzcGFjZSBBUEkgeworY2xhc3MgQXJyYXk7CitjbGFzcyBVc2VyU2NyaXB0OworfQorCiBu YW1lc3BhY2UgSVBDIHsKIGNsYXNzIERhdGFSZWZlcmVuY2U7CiB9CkBAIC01OSw3ICs2NSw4IEBA IHB1YmxpYzoKICAgICB2b2lkIGFkZFByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5Jik7CiAgICAgdm9p ZCByZW1vdmVQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSYpOwogCi0gICAgdm9pZCBhZGRVc2VyU2Ny aXB0KFdlYkNvcmU6OlVzZXJTY3JpcHQpOworICAgIEFQSTo6QXJyYXkmIHVzZXJTY3JpcHRzKCkg eyByZXR1cm4gbV91c2VyU2NyaXB0cy5nZXQoKTsgfQorICAgIHZvaWQgYWRkVXNlclNjcmlwdChB UEk6OlVzZXJTY3JpcHQqKTsKICAgICB2b2lkIHJlbW92ZUFsbFVzZXJTY3JpcHRzKCk7CiAKICAg ICB2b2lkIGFkZFVzZXJTdHlsZVNoZWV0KFdlYkNvcmU6OlVzZXJTdHlsZVNoZWV0KTsKQEAgLTc3 LDggKzg0LDggQEAgcHJpdmF0ZToKIAogICAgIHVpbnQ2NF90IG1faWRlbnRpZmllcjsKICAgICBI YXNoU2V0PFdlYlByb2Nlc3NQcm94eSo+IG1fcHJvY2Vzc2VzOwotCi0gICAgVmVjdG9yPFdlYkNv cmU6OlVzZXJTY3JpcHQ+IG1fdXNlclNjcmlwdHM7CisgICAgCisgICAgUmVmPEFQSTo6QXJyYXk+ IG1fdXNlclNjcmlwdHM7CiAgICAgVmVjdG9yPFdlYkNvcmU6OlVzZXJTdHlsZVNoZWV0PiBtX3Vz ZXJTdHlsZVNoZWV0czsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8V2ViU2NyaXB0TWVz c2FnZUhhbmRsZXI+PiBtX3NjcmlwdE1lc3NhZ2VIYW5kbGVyczsKIH07CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lv biAxNzg0NDIpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTEwNjksNiArMTA2OSw3IEBACiAJCTdDODVGRDdDMTkz NDE1QTgwMDAxNzdDNCAvKiBXZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Qzg1RkQ3QjE5MzQxNUE4MDAwMTc3 QzQgLyogV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oICovOyB9OwogCQk3Qzg1RkQ3RjE5MzQx NjY1MDAwMTc3QzQgLyogV2ViUHJlZmVyZW5jZXNLZXlzLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDODVGRDdEMTkzNDE2NjUwMDAxNzdDNCAvKiBX ZWJQcmVmZXJlbmNlc0tleXMuY3BwICovOyB9OwogCQk3Qzg1RkQ4MDE5MzQxNjY1MDAwMTc3QzQg LyogV2ViUHJlZmVyZW5jZXNLZXlzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA3Qzg1RkQ3RTE5MzQxNjY1MDAwMTc3QzQgLyogV2ViUHJlZmVyZW5jZXNL ZXlzLmggKi87IH07CisJCTdDODlEMjk0MUE2NzEyMkYwMDNBNUZERSAvKiBBUElVc2VyU2NyaXB0 LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Qzg5RDI5 MjFBNjcxMjJGMDAzQTVGREUgLyogQVBJVXNlclNjcmlwdC5oICovOyB9OwogCQk3QzhFQjExNzE4 REI2QTE5MDA3OTE3QzIgLyogV0tQcmVmZXJlbmNlc1ByaXZhdGUuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDOEVCMTE2MThEQjZBMTkwMDc5MTdDMiAv KiBXS1ByZWZlcmVuY2VzUHJpdmF0ZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFBy aXZhdGUsICk7IH07IH07CiAJCTdDOUQxNTM3MTg0NTg0REEwMDlEMzkxOCAvKiBXS0Jyb3dzaW5n Q29udGV4dEdyb3VwSW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDdDOUQxNTM2MTg0NTg0REEwMDlEMzkxOCAvKiBXS0Jyb3dzaW5nQ29udGV4 dEdyb3VwSW50ZXJuYWwuaCAqLzsgfTsKIAkJN0NBMjU0RUIxODI5OTNDRTAwRkM4QTQxIC8qIFdL QnJvd3NpbmdDb250ZXh0UG9saWN5RGVsZWdhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDQTI1NEVBMTgyOTkzQ0UwMEZDOEE0MSAvKiBXS0Jyb3dz aW5nQ29udGV4dFBvbGljeURlbGVnYXRlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo UHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTMxNzYsNiArMzE3Nyw3IEBACiAJCTdDODVGRDdCMTkzNDE1 QTgwMDAxNzdDNCAvKiBXZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IFdlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0M4NUZEN0QxOTM0MTY2NTAwMDE3N0M0IC8qIFdlYlByZWZl cmVuY2VzS2V5cy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJQ cmVmZXJlbmNlc0tleXMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Qzg1RkQ3 RTE5MzQxNjY1MDAwMTc3QzQgLyogV2ViUHJlZmVyZW5jZXNLZXlzLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IFdlYlByZWZlcmVuY2VzS2V5cy5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQk3Qzg5RDI5MjFBNjcxMjJGMDAzQTVGREUgLyogQVBJVXNlclNjcmlwdC5o ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBBUElVc2VyU2NyaXB0Lmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDOEVCMTE2MThEQjZBMTkwMDc5MTdDMiAvKiBXS1By ZWZlcmVuY2VzUHJpdmF0ZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS1By ZWZlcmVuY2VzUHJpdmF0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3QzlEMTUz NjE4NDU4NERBMDA5RDM5MTggLyogV0tCcm93c2luZ0NvbnRleHRHcm91cEludGVybmFsLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLQnJvd3NpbmdDb250ZXh0R3JvdXBJbnRl cm5hbC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0EyNTRFQTE4Mjk5M0NFMDBG QzhBNDEgLyogV0tCcm93c2luZ0NvbnRleHRQb2xpY3lEZWxlZ2F0ZS5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IHBhdGggPSBXS0Jyb3dzaW5nQ29udGV4dFBvbGljeURlbGVnYXRlLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC02MDU2LDYgKzYwNTgsNyBAQAogCQkJCTFBRkRF NjVGMTk1NEU5QjEwMEM0OEZGQSAvKiBBUElTZXNzaW9uU3RhdGUuY3BwICovLAogCQkJCTFBRkRF NjYwMTk1NEU5QjEwMEM0OEZGQSAvKiBBUElTZXNzaW9uU3RhdGUuaCAqLywKIAkJCQkxQTRENjY0 NzE4QTJEOTFBMDBEODJFMjEgLyogQVBJVUlDbGllbnQuaCAqLywKKwkJCQk3Qzg5RDI5MjFBNjcx MjJGMDAzQTVGREUgLyogQVBJVXNlclNjcmlwdC5oICovLAogCQkJCTFBMzYzNUE3MUEzMTQ0QTMw MEVENjE5NyAvKiBBUElXZWJzaXRlRGF0YVN0b3JlLmNwcCAqLywKIAkJCQkxQTM2MzVBODFBMzE0 NEEzMDBFRDYxOTcgLyogQVBJV2Vic2l0ZURhdGFTdG9yZS5oICovLAogCQkJKTsKQEAgLTc2MTgs NiArNzYyMSw3IEBACiAJCQkJMUE2MDIyNEQxOEMxNkI5RjAwQzNFOEM5IC8qIFZpc2l0ZWRMaW5r UHJvdmlkZXJNZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUEwRjI5Q0MxMjBCMzcxNjAw NTNEMUI5IC8qIFZpc2l0ZWRMaW5rVGFibGUuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBRjRDRUYw MThCQzQ4MTgwMEJDMkQzNCAvKiBWaXNpdGVkTGlua1RhYmxlQ29udHJvbGxlci5oIGluIEhlYWRl cnMgKi8sCisJCQkJN0M4OUQyOTQxQTY3MTIyRjAwM0E1RkRFIC8qIEFQSVVzZXJTY3JpcHQuaCBp biBIZWFkZXJzICovLAogCQkJCTFBOEU3RDNEMThDMTUxNDkwMDVBNzAyQSAvKiBWaXNpdGVkTGlu a1RhYmxlQ29udHJvbGxlck1lc3NhZ2VzLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQUE5QkFFMTE4 NEZGQUM3MDAzQjZCQzYgLyogV2Vha09iakNQdHIuaCBpbiBIZWFkZXJzICovLAogCQkJCUNFREEx MkUzMTUyQ0QxQjMwMEQ5RTA4RCAvKiBXZWJBbHRlcm5hdGl2ZVRleHRDbGllbnQuaCBpbiBIZWFk ZXJzICovLAo=