42986 2010-07-26 11:50:47 -0700 Add prompt and confirm client functions to WebKit2 2010-07-26 12:57:50 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned webkit.review.bot oldest_to_newest 256139 0 sam 2010-07-26 11:50:47 -0700 Add prompt and confirm client functions to WebKit2 256140 1 62591 sam 2010-07-26 11:52:28 -0700 Created attachment 62591 Patch 256143 2 62591 andersca 2010-07-26 11:55:08 -0700 Comment on attachment 62591 Patch rà 256145 3 webkit.review.bot 2010-07-26 11:58:03 -0700 Attachment 62591 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/API/C/WKPage.h:129: Extra space between WKPageRunJavaScriptConfirmCallback and runJavaScriptConfirm [whitespace/declaration] [3] WebKit2/UIProcess/API/C/WKPage.h:130: Extra space between WKPageRunJavaScriptPromptCallback and runJavaScriptPrompt [whitespace/declaration] [3] WebKit2/UIProcess/WebUIClient.h:32: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 3 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 256189 4 sam 2010-07-26 12:57:50 -0700 Fixed in http://trac.webkit.org/changeset/64065. 62591 2010-07-26 11:52:28 -0700 2010-07-26 11:55:08 -0700 Patch prompt.diff text/plain 15347 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDA1OCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTAtMDctMjYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9y IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mjk4NgorICAgICAgICBB ZGQgcHJvbXB0IGFuZCBjb25maXJtIGNsaWVudCBmdW5jdGlvbnMgdG8gV2ViS2l0MgorCisgICAg ICAgICogU2hhcmVkL0NvcmVJUENTdXBwb3J0L1dlYlBhZ2VQcm94eU1lc3NhZ2VLaW5kcy5oOgor ICAgICAgICAoV2ViUGFnZVByb3h5TWVzc2FnZTo6KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0QWxlcnQpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnJ1bkphdmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0UHJvbXB0KToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViVUlDbGllbnQ6OnJ1bkphdmFTY3JpcHRBbGVydCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlVJQ2xpZW50OjpydW5KYXZhU2NyaXB0Q29uZmlybSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlVJQ2xpZW50OjpydW5KYXZhU2NyaXB0UHJvbXB0KToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViVUlDbGllbnQuaDoKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2o6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6OnJ1bkph dmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50OjpydW5K YXZhU2NyaXB0UHJvbXB0KToKKwogMjAxMC0wNy0yNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCklu ZGV4OiBXZWJLaXQyL1NoYXJlZC9Db3JlSVBDU3VwcG9ydC9XZWJQYWdlUHJveHlNZXNzYWdlS2lu ZHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9Db3JlSVBDU3VwcG9ydC9XZWJQYWdl UHJveHlNZXNzYWdlS2luZHMuaAkocmV2aXNpb24gNjQwMTYpCisrKyBXZWJLaXQyL1NoYXJlZC9D b3JlSVBDU3VwcG9ydC9XZWJQYWdlUHJveHlNZXNzYWdlS2luZHMuaAkod29ya2luZyBjb3B5KQpA QCAtMzYsNiArMzYsOCBAQCBlbnVtIEtpbmQgewogICAgIENyZWF0ZU5ld1BhZ2UsCiAgICAgU2hv d1BhZ2UsCiAgICAgUnVuSmF2YVNjcmlwdEFsZXJ0LAorICAgIFJ1bkphdmFTY3JpcHRDb25maXJt LAorICAgIFJ1bkphdmFTY3JpcHRQcm9tcHQsCiAgICAgCiAgICAgQ2xvc2VQYWdlLAogICAgIERl Y2lkZVBvbGljeUZvck1JTUVUeXBlLApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CShyZXZpc2lvbiA2NDAxNikKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTY0OSwxMyArNjQ5LDM1IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRSZWNlaXZlU3luY01lc3NhZ2UKICAgICAgICAgfQogICAgICAgICBjYXNlIFdlYlBhZ2VQcm94 eU1lc3NhZ2U6OlJ1bkphdmFTY3JpcHRBbGVydDogewogICAgICAgICAgICAgdWludDY0X3QgZnJh bWVJRDsKLSAgICAgICAgICAgIFN0cmluZyBhbGVydFRleHQ7Ci0gICAgICAgICAgICBpZiAoIWFy Z3VtZW50cy5kZWNvZGUoQ29yZUlQQzo6T3V0KGZyYW1lSUQsIGFsZXJ0VGV4dCkpKQorICAgICAg ICAgICAgU3RyaW5nIG1lc3NhZ2U7CisgICAgICAgICAgICBpZiAoIWFyZ3VtZW50cy5kZWNvZGUo Q29yZUlQQzo6T3V0KGZyYW1lSUQsIG1lc3NhZ2UpKSkKICAgICAgICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgICAgICBydW5KYXZhU2NyaXB0QWxlcnQod2ViRnJhbWUoZnJhbWVJRCksIGFsZXJ0 VGV4dCk7CisgICAgICAgICAgICBydW5KYXZhU2NyaXB0QWxlcnQod2ViRnJhbWUoZnJhbWVJRCks IG1lc3NhZ2UpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KKyAgICAgICAgY2FzZSBX ZWJQYWdlUHJveHlNZXNzYWdlOjpSdW5KYXZhU2NyaXB0Q29uZmlybTogeworICAgICAgICAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSBlbmNvZGUgc29tZXRoaW5nIGluIHRoZSBjYXNl IHRoYXQgdGhlIGFyZ3VtZW50cyBkbyBub3QgZGVjb2RlIGNvcnJlY3RseS4KKyAgICAgICAgICAg IHVpbnQ2NF90IGZyYW1lSUQ7CisgICAgICAgICAgICBTdHJpbmcgbWVzc2FnZTsKKyAgICAgICAg ICAgIGlmICghYXJndW1lbnRzLmRlY29kZShDb3JlSVBDOjpPdXQoZnJhbWVJRCwgbWVzc2FnZSkp KQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgYm9vbCByZXN1bHQgPSBy dW5KYXZhU2NyaXB0Q29uZmlybSh3ZWJGcmFtZShmcmFtZUlEKSwgbWVzc2FnZSk7CisgICAgICAg ICAgICByZXBseS5lbmNvZGUoQ29yZUlQQzo6SW4ocmVzdWx0KSk7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgfQorICAgICAgICBjYXNlIFdlYlBhZ2VQcm94eU1lc3NhZ2U6OlJ1bkphdmFT Y3JpcHRQcm9tcHQ6IHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcHJvYmFibHkg ZW5jb2RlIHNvbWV0aGluZyBpbiB0aGUgY2FzZSB0aGF0IHRoZSBhcmd1bWVudHMgZG8gbm90IGRl Y29kZSBjb3JyZWN0bHkuCisgICAgICAgICAgICB1aW50NjRfdCBmcmFtZUlEOworICAgICAgICAg ICAgU3RyaW5nIG1lc3NhZ2U7CisgICAgICAgICAgICBTdHJpbmcgZGVmYXVsdFZhbHVlOworICAg ICAgICAgICAgaWYgKCFhcmd1bWVudHMuZGVjb2RlKENvcmVJUEM6Ok91dChmcmFtZUlELCBtZXNz YWdlLCBkZWZhdWx0VmFsdWUpKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAg ICAgIFN0cmluZyByZXN1bHQgPSBydW5KYXZhU2NyaXB0UHJvbXB0KHdlYkZyYW1lKGZyYW1lSUQp LCBtZXNzYWdlLCBkZWZhdWx0VmFsdWUpOworICAgICAgICAgICAgcmVwbHkuZW5jb2RlKENvcmVJ UEM6OkluKHJlc3VsdCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAg Y2FzZSBXZWJQYWdlUHJveHlNZXNzYWdlOjpCYWNrRm9yd2FyZEN1cnJlbnRJdGVtOiB7CiAgICAg ICAgICAgICBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBjdXJyZW50SXRlbSA9IG1fYmFja0Zvcndh cmRMaXN0LT5jdXJyZW50SXRlbSgpOwogICAgICAgICAgICAgdWludDY0X3QgY3VycmVudEl0ZW1J RCA9IGN1cnJlbnRJdGVtID8gY3VycmVudEl0ZW0tPml0ZW1JRCgpIDogMDsKQEAgLTgzMiwxMSAr ODU0LDIwIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjbG9zZVBhZ2UoKQogICAgIG1fdWlDbGllbnQu Y2xvc2UodGhpcyk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0QWxlcnQo V2ViRnJhbWVQcm94eSogZnJhbWUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgYWxlcnRUZXh0KQor dm9pZCBXZWJQYWdlUHJveHk6OnJ1bkphdmFTY3JpcHRBbGVydChXZWJGcmFtZVByb3h5KiBmcmFt ZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogewotICAgIG1fdWlDbGllbnQucnVuSmF2YVNjcmlw dEFsZXJ0KHRoaXMsIGFsZXJ0VGV4dC5pbXBsKCksIGZyYW1lKTsKKyAgICBtX3VpQ2xpZW50LnJ1 bkphdmFTY3JpcHRBbGVydCh0aGlzLCBtZXNzYWdlLCBmcmFtZSk7CiB9CiAKK2Jvb2wgV2ViUGFn ZVByb3h5OjpydW5KYXZhU2NyaXB0Q29uZmlybShXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3Qg U3RyaW5nJiBtZXNzYWdlKQoreworICAgIHJldHVybiBtX3VpQ2xpZW50LnJ1bkphdmFTY3JpcHRD b25maXJtKHRoaXMsIG1lc3NhZ2UsIGZyYW1lKTsKK30KKworU3RyaW5nIFdlYlBhZ2VQcm94eTo6 cnVuSmF2YVNjcmlwdFByb21wdChXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3QgU3RyaW5nJiBt ZXNzYWdlLCBjb25zdCBTdHJpbmcmIGRlZmF1bHRWYWx1ZSkKK3sKKyAgICByZXR1cm4gbV91aUNs aWVudC5ydW5KYXZhU2NyaXB0UHJvbXB0KHRoaXMsIG1lc3NhZ2UsIGRlZmF1bHRWYWx1ZSwgZnJh bWUpOworfQogCiAvLyBIaXN0b3J5Q2xpZW50CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCShyZXZpc2lvbiA2NDAxNikKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xODcsNiArMTg3LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHNo b3dQYWdlKCk7CiAgICAgdm9pZCBjbG9zZVBhZ2UoKTsKICAgICB2b2lkIHJ1bkphdmFTY3JpcHRB bGVydChXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJik7CisgICAgYm9vbCBy dW5KYXZhU2NyaXB0Q29uZmlybShXZWJGcmFtZVByb3h5KiBmcmFtZSwgY29uc3QgV2ViQ29yZTo6 U3RyaW5nJik7CisgICAgV2ViQ29yZTo6U3RyaW5nIHJ1bkphdmFTY3JpcHRQcm9tcHQoV2ViRnJh bWVQcm94eSogZnJhbWUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYsIGNvbnN0IFdlYkNvcmU6OlN0 cmluZyYpOwogCiAgICAgdm9pZCBkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YShXZWJGcmFt ZVByb3h5KiwgY29uc3QgV2ViTmF2aWdhdGlvbkRhdGFTdG9yZSYpOyAKICAgICB2b2lkIGRpZFBl cmZvcm1DbGllbnRSZWRpcmVjdChXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6U3RyaW5n JiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgZGVzdGluYXRpb25VUkxT dHJpbmcpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmNwcAkocmV2aXNpb24gNjQwMTYp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJXZWJVSUNsaWVudC5oIgogCiAjaW5jbHVkZSAiV0tB UElDYXN0LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybVN0cmluZy5oPgogI2luY2x1ZGUg PHN0cmluZy5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTY5LDEzICs3MCwzNSBA QCB2b2lkIFdlYlVJQ2xpZW50OjpjbG9zZShXZWJQYWdlUHJveHkqIHBhCiAgICAgbV9wYWdlVUlD bGllbnQuY2xvc2UodG9SZWYocGFnZSksIG1fcGFnZVVJQ2xpZW50LmNsaWVudEluZm8pOwogfQog Ci12b2lkIFdlYlVJQ2xpZW50OjpydW5KYXZhU2NyaXB0QWxlcnQoV2ViUGFnZVByb3h5KiBwYWdl LCBTdHJpbmdJbXBsKiBhbGVydFRleHQsIFdlYkZyYW1lUHJveHkqIGZyYW1lKQordm9pZCBXZWJV SUNsaWVudDo6cnVuSmF2YVNjcmlwdEFsZXJ0KFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgU3Ry aW5nJiBtZXNzYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSkKIHsKICAgICBpZiAoIW1fcGFnZVVJ Q2xpZW50LnJ1bkphdmFTY3JpcHRBbGVydCkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIG1f cGFnZVVJQ2xpZW50LnJ1bkphdmFTY3JpcHRBbGVydCh0b1JlZihwYWdlKSwgdG9SZWYoYWxlcnRU ZXh0KSwgdG9SZWYoZnJhbWUpLCBtX3BhZ2VVSUNsaWVudC5jbGllbnRJbmZvKTsKKyAgICBtX3Bh Z2VVSUNsaWVudC5ydW5KYXZhU2NyaXB0QWxlcnQodG9SZWYocGFnZSksIHRvUmVmKG1lc3NhZ2Uu aW1wbCgpKSwgdG9SZWYoZnJhbWUpLCBtX3BhZ2VVSUNsaWVudC5jbGllbnRJbmZvKTsKIH0KIAor Ym9vbCBXZWJVSUNsaWVudDo6cnVuSmF2YVNjcmlwdENvbmZpcm0oV2ViUGFnZVByb3h5KiBwYWdl LCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1lKQoreworICAgIGlm ICghbV9wYWdlVUlDbGllbnQucnVuSmF2YVNjcmlwdENvbmZpcm0pCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIHJldHVybiBtX3BhZ2VVSUNsaWVudC5ydW5KYXZhU2NyaXB0Q29uZmlybSh0 b1JlZihwYWdlKSwgdG9SZWYobWVzc2FnZS5pbXBsKCkpLCB0b1JlZihmcmFtZSksIG1fcGFnZVVJ Q2xpZW50LmNsaWVudEluZm8pOworfQorCitTdHJpbmcgV2ViVUlDbGllbnQ6OnJ1bkphdmFTY3Jp cHRQcm9tcHQoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0 IFN0cmluZyYgZGVmYXVsdFZhbHVlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSkKK3sKKyAgICBpZiAo IW1fcGFnZVVJQ2xpZW50LnJ1bkphdmFTY3JpcHRQcm9tcHQpCisgICAgICAgIHJldHVybiBTdHJp bmcoKTsKKworICAgIFN0cmluZ0ltcGwqIGltcGwgPSB0b1dLKG1fcGFnZVVJQ2xpZW50LnJ1bkph dmFTY3JpcHRQcm9tcHQodG9SZWYocGFnZSksIHRvUmVmKG1lc3NhZ2UuaW1wbCgpKSwgdG9SZWYo ZGVmYXVsdFZhbHVlLmltcGwoKSksIHRvUmVmKGZyYW1lKSwgbV9wYWdlVUlDbGllbnQuY2xpZW50 SW5mbykpOworICAgIGlmICghaW1wbCkKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisgICAg U3RyaW5nIHJlc3VsdCA9IGltcGw7CisgICAgaW1wbC0+ZGVyZWYoKTsKKworICAgIHJldHVybiBy ZXN1bHQ7Cit9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvV2ViVUlDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNs aWVudC5oCShyZXZpc2lvbiA2NDAxNikKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50 LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAKICNpbmNsdWRlICJXS1BhZ2UuaCIK IAogbmFtZXNwYWNlIFdlYkNvcmUgewotICAgIGNsYXNzIFN0cmluZ0ltcGw7CisgICAgY2xhc3Mg U3RyaW5nOwogfQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQ1LDcgKzQ1LDkgQEAgcHVibGlj OgogICAgIFdlYlBhZ2VQcm94eSogY3JlYXRlTmV3UGFnZShXZWJQYWdlUHJveHkqKTsKICAgICB2 b2lkIHNob3dQYWdlKFdlYlBhZ2VQcm94eSopOwogICAgIHZvaWQgY2xvc2UoV2ViUGFnZVByb3h5 Kik7Ci0gICAgdm9pZCBydW5KYXZhU2NyaXB0QWxlcnQoV2ViUGFnZVByb3h5KiwgV2ViQ29yZTo6 U3RyaW5nSW1wbCosIFdlYkZyYW1lUHJveHkqKTsKKyAgICB2b2lkIHJ1bkphdmFTY3JpcHRBbGVy dChXZWJQYWdlUHJveHkqLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmLCBXZWJGcmFtZVByb3h5Kik7 CisgICAgYm9vbCBydW5KYXZhU2NyaXB0Q29uZmlybShXZWJQYWdlUHJveHkqLCBjb25zdCBXZWJD b3JlOjpTdHJpbmcmLCBXZWJGcmFtZVByb3h5Kik7CisgICAgV2ViQ29yZTo6U3RyaW5nIHJ1bkph dmFTY3JpcHRQcm9tcHQoV2ViUGFnZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiwgY29u c3QgV2ViQ29yZTo6U3RyaW5nJiwgV2ViRnJhbWVQcm94eSopOwogCiBwcml2YXRlOgogICAgIFdL UGFnZVVJQ2xpZW50IG1fcGFnZVVJQ2xpZW50OwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmgJKHJldmlzaW9uIDY0MDE2KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTExNiw2ICsxMTYsOCBAQCB0eXBlZGVmIFdLUGFnZVJlZiAoKldL UGFnZUNyZWF0ZU5ld1BhZ2VDCiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VTaG93UGFnZUNhbGxiYWNr KShXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQg KCpXS1BhZ2VDbG9zZUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCAqY2xpZW50 SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFjayko V0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIGFsZXJ0VGV4dCwgV0tGcmFtZVJlZiBmcmFtZSwg Y29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7Cit0eXBlZGVmIGJvb2wgKCpXS1BhZ2VSdW5KYXZhU2Ny aXB0Q29uZmlybUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwg V0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7Cit0eXBlZGVmIFdLU3Ry aW5nUmVmICgqV0tQYWdlUnVuSmF2YVNjcmlwdFByb21wdENhbGxiYWNrKShXS1BhZ2VSZWYgcGFn ZSwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tTdHJpbmdSZWYgZGVmYXVsdFZhbHVlLCBXS0ZyYW1l UmVmIGZyYW1lLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIAogc3RydWN0IFdLUGFnZVVJQ2xp ZW50IHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb247CkBAIC0xMjQsNiArMTI2LDggQEAgc3RydWN0 IFdLUGFnZVVJQ2xpZW50IHsKICAgICBXS1BhZ2VTaG93UGFnZUNhbGxiYWNrICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNob3dQYWdlOwogICAgIFdLUGFnZUNs b3NlQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY2xvc2U7CiAgICAgV0tQYWdlUnVuSmF2YVNjcmlwdEFsZXJ0Q2FsbGJhY2sgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBydW5KYXZhU2NyaXB0QWxlcnQ7CisgICAgV0tQYWdl UnVuSmF2YVNjcmlwdENvbmZpcm1DYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBydW5KYXZhU2NyaXB0Q29uZmlybTsKKyAgICBXS1BhZ2VSdW5KYXZhU2NyaXB0UHJvbXB0 Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bkphdmFTY3JpcHRQ cm9tcHQ7CiB9OwogdHlwZWRlZiBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgV0tQYWdlVUlDbGllbnQ7 CiAKSW5kZXg6IFdlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZp c2lvbiA2NDAxNikKKysrIFdlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CSh3b3JraW5nIGNvcHkpCkBAIC0zNjcsNyArMzY3LDcgQEAKIAkJMzJEQkNGNUUwMzcwQURFRTAw QzkxNzgzIC8qIFdlYktpdDJQcmVmaXguaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gV2ViS2l0MlByZWZpeC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1REFENzI5 NDExNkZGNzBCMDBFRTUzOTYgLyogV2ViUHJvY2Vzcy54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQu eGNjb25maWc7IHBhdGggPSBXZWJQcm9jZXNzLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk1REFENzNGMTExNkZGOTBDMDBFRTUzOTYgLyogQmFzZVRhcmdldC54Y2NvbmZp ZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHRleHQueGNjb25maWc7IHBhdGggPSBCYXNlVGFyZ2V0LnhjY29uZmlnOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk2RDhBOTFBNTExRjBFRkQxMDBERDAxRkUgLyog Y29tLmFwcGxlLldlYlByb2Nlc3Muc2IgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gY29tLmFwcGxl LldlYlByb2Nlc3Muc2I7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTZEOEE5MUE1MTFG MEVGRDEwMEREMDFGRSAvKiBjb20uYXBwbGUuV2ViUHJvY2Vzcy5zYiAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7 IG5hbWUgPSBjb20uYXBwbGUuV2ViUHJvY2Vzcy5zYjsgcGF0aCA9IFdlYlByb2Nlc3MvY29tLmFw cGxlLldlYlByb2Nlc3Muc2I7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCThEQzJFRjVB MDQ4NkE2OTQwMDk4QjIxNiAvKiBJbmZvLnBsaXN0ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5wbGlzdC54bWw7 IHBhdGggPSBJbmZvLnBsaXN0OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4REMyRUY1 QjA0ODZBNjk0MDA5OEIyMTYgLyogV2ViS2l0Mi5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZXhwbGljaXRGaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBpbmNsdWRl SW5JbmRleCA9IDA7IHBhdGggPSBXZWJLaXQyLmZyYW1ld29yazsgc291cmNlVHJlZSA9IEJVSUxU X1BST0RVQ1RTX0RJUjsgfTsKIAkJQkMwMDkyRjUxMTU4MzdBMzAwRTBBRTJBIC8qIFJ1bkxvb3BN YWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBSdW5Mb29wTWFj Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDk4LDcgKzQ5OCw2IEBACiAJCUJD QjYzNDc3MTE2QkYxMDYwMDYwMzIxNSAvKiBXZWJLaXQyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IFdlYktpdDIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkNC NzM0NkQxMUNFRTNGRjAwRUM1MDAyIC8qIFdlYlByb2Nlc3NQcm94eU1lc3NhZ2VLaW5kcy5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJQcm9jZXNzUHJveHlNZXNzYWdlS2lu ZHMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkNCODZGNEIxMTZBQUFDRDAwQ0Uy MEI3IC8qIFdlYktpdDIueGNjb25maWcgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0LnhjY29uZmlnOyBwYXRoID0g V2ViS2l0Mi54Y2NvbmZpZzsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQkNCOEQ0RTAx MUFGNzhDMTAwOEY5MTAzIC8qIFdlYktpdDIuZXhwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5leHBv cnRzOyBuYW1lID0gV2ViS2l0Mi5leHA7IHBhdGggPSBtYWMvV2ViS2l0Mi5leHA7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDQjlFMjQxMTEyMERBQ0EwMEExMzdFMCAvKiBXZWJDb250 ZXh0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYkNvbnRleHQuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkNCOUUyNDIxMTIwREFDQTAwQTEzN0UwIC8qIFdl YkNvbnRleHQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViQ29u dGV4dC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDQjlFMjQ5MTEyMEUxNUMw MEExMzdFMCAvKiBXS0NvbnRleHQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g V0tDb250ZXh0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC02MTksOCArNjE4LDgg QEAKIAkJCWNoaWxkcmVuID0gKAogCQkJCUJDOEE1MDBFMTE3NjVBRDQwMDc1NzU3MyAvKiBXZWJL aXQyICovLAogCQkJCUJDOEE1MDBGMTE3NjVBRTMwMDc1NzU3MyAvKiBXZWJQcm9jZXNzICovLAor CQkJCTZEOEE5MUE1MTFGMEVGRDEwMEREMDFGRSAvKiBjb20uYXBwbGUuV2ViUHJvY2Vzcy5zYiAq LywKIAkJCQkwODlDMTY2NkZFODQxMTU4QzAyQUFDMDcgLyogSW5mb1BsaXN0LnN0cmluZ3MgKi8s Ci0JCQkJQkNCOEQ0RTAxMUFGNzhDMTAwOEY5MTAzIC8qIFdlYktpdDIuZXhwICovLAogCQkJKTsK IAkJCW5hbWUgPSBSZXNvdXJjZXM7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpAQCAtNzk2 LDcgKzc5NSw2IEBACiAJCUJDMDMyRDVDMTBGNDM2RDUwMDU4QzE1QSAvKiBXZWJQcm9jZXNzICov ID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKLQkJCQk2RDhBOTFBNTEx RjBFRkQxMDBERDAxRkUgLyogY29tLmFwcGxlLldlYlByb2Nlc3Muc2IgKi8sCiAJCQkJQkMyMDRF REYxMUM4M0U3MjAwOEYzMzc1IC8qIEluamVjdGVkQnVuZGxlICovLAogCQkJCTFBNkZBMDFDMTFF MTUyNjMwMERCMTM3MSAvKiBtYWMgKi8sCiAJCQkJMUE2RkI3QUExMUU2NEI0OTAwREIxMzcxIC8q IFBsdWdpbnMgKi8sCkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi Q2hyb21lQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAkocmV2aXNpb24gNjQwMTYpCisrKyBXZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjI5LDggKzIyOSwxNSBAQCBib29sIFdlYkNocm9tZUNsaWVudDo6cnVuSmF2YVNj cmlwdENvbmZpCiAgICAgLy8gTm90aWZ5IHRoZSBidW5kbGUgY2xpZW50LgogICAgIG1fcGFnZS0+ aW5qZWN0ZWRCdW5kbGVVSUNsaWVudCgpLndpbGxSdW5KYXZhU2NyaXB0Q29uZmlybShtX3BhZ2Us IG1lc3NhZ2UsIHdlYkZyYW1lKTsKIAotICAgIC8vIEltcGxlbWVudCBmb3IgVUlQcm9jZXNzLgot ICAgIHJldHVybiBmYWxzZTsKKyAgICBib29sIHJlc3VsdCA9IGZhbHNlOworICAgIGlmICghV2Vi UHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kU3luYyhXZWJQYWdlUHJveHlNZXNz YWdlOjpSdW5KYXZhU2NyaXB0Q29uZmlybSwgbV9wYWdlLT5wYWdlSUQoKSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29yZUlQQzo6SW4od2Vi RnJhbWUtPmZyYW1lSUQoKSwgbWVzc2FnZSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIENvcmVJUEM6Ok91dChyZXN1bHQpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb3JlSVBDOjpDb25u ZWN0aW9uOjpOb1RpbWVvdXQpKSB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAg ICByZXR1cm4gcmVzdWx0OwogfQogCiBib29sIFdlYkNocm9tZUNsaWVudDo6cnVuSmF2YVNjcmlw dFByb21wdChGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5n JiBkZWZhdWx0VmFsdWUsIFN0cmluZyYgcmVzdWx0KQpAQCAtMjQwLDggKzI0NywxNCBAQCBib29s IFdlYkNocm9tZUNsaWVudDo6cnVuSmF2YVNjcmlwdFByb21wCiAgICAgLy8gTm90aWZ5IHRoZSBi dW5kbGUgY2xpZW50LgogICAgIG1fcGFnZS0+aW5qZWN0ZWRCdW5kbGVVSUNsaWVudCgpLndpbGxS dW5KYXZhU2NyaXB0UHJvbXB0KG1fcGFnZSwgbWVzc2FnZSwgZGVmYXVsdFZhbHVlLCB3ZWJGcmFt ZSk7CiAKLSAgICAvLyBJbXBsZW1lbnQgZm9yIFVJUHJvY2Vzcy4KLSAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmRTeW5jKFdl YlBhZ2VQcm94eU1lc3NhZ2U6OlJ1bkphdmFTY3JpcHRQcm9tcHQsIG1fcGFnZS0+cGFnZUlEKCks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENv cmVJUEM6OkluKHdlYkZyYW1lLT5mcmFtZUlEKCksIG1lc3NhZ2UsIGRlZmF1bHRWYWx1ZSksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENvcmVJ UEM6Ok91dChyZXN1bHQpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBDb3JlSVBDOjpDb25uZWN0aW9uOjpOb1RpbWVvdXQpKSB7CisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gIXJlc3VsdC5pc051bGwoKTsKIH0K IAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNldFN0YXR1c2JhclRleHQoY29uc3QgU3RyaW5nJiBz dGF0dXNiYXJUZXh0KQo=