44785 2010-08-27 12:30:21 -0700 Add support for sending synchronous messages from the InjectedBundle to the WKContext 2010-09-17 12:55:56 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 sam webkit-unassigned eric webkit.review.bot oldest_to_newest 270660 0 sam 2010-08-27 12:30:21 -0700 We should add SPI (maybe API) to the InjectedBundle to allow sending synchronous messages to the WKContext: WKTypeRef WKBundlePostSynchronousMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, double timeout). 270661 1 sam 2010-08-27 12:30:59 -0700 <rdar://problem/8365320> 280340 2 67840 sam 2010-09-16 13:52:47 -0700 Created attachment 67840 Patch 280341 3 webkit.review.bot 2010-09-16 13:53:34 -0700 Attachment 67840 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/UIProcess/WebContext.cpp:324: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] WebKit2/UIProcess/API/C/WKContext.h:43: Extra space between WKContextDidReceiveSynchronousMessageFromInjectedBundleCallback and didReceiveSynchronousMessageFromInjectedBundle [whitespace/declaration] [3] Total errors found: 2 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 280347 4 sam 2010-09-16 14:05:09 -0700 Landed in r67666. 280816 5 eric 2010-09-17 12:55:56 -0700 The MacEWS failed to process this due to a build error (and hung due to an executive.py bug). YOu must have done a follow-up build fix is my guess. :) 67840 2010-09-16 13:52:47 -0700 2010-09-16 13:55:17 -0700 Patch patch.diff text/plain 13683 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzY2NCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMTAtMDktMTYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3Vw cG9ydCBmb3Igc2VuZGluZyBzeW5jaHJvbm91cyBtZXNzYWdlcyBmcm9tIHRoZSBJbmplY3RlZEJ1 bmRsZSB0byB0aGUgV0tDb250ZXh0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MzY1MzIwPgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ3ODUKKwor ICAgICAgICAqIFNoYXJlZC9Db3JlSVBDU3VwcG9ydC9XZWJDb250ZXh0TWVzc2FnZUtpbmRzLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6ZGlkUmVj ZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSk6CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHQ6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29udGV4dDo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi Q29udGV4dC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVD bGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGll bnQ6OmRpZFJlY2VpdmVTeW5jaHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAgICAgICAqIFdlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwOgorICAgICAgICAoV0tCdW5kbGVQ b3N0U3luY2hyb25vdXNNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9jL1dLQnVuZGxlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9JbmplY3RlZEJ1bmRsZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlOjpw b3N0U3luY2hyb25vdXNNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlLmg6CisKIDIwMTAtMDktMTYgIEJhbGF6cyBLZWxlbWVuICA8a2Jh bGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgdHJpdmlhbCB0eXBvIGZpeC4K SW5kZXg6IFdlYktpdDIvU2hhcmVkL0NvcmVJUENTdXBwb3J0L1dlYkNvbnRleHRNZXNzYWdlS2lu ZHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9Db3JlSVBDU3VwcG9ydC9XZWJDb250 ZXh0TWVzc2FnZUtpbmRzLmgJKHJldmlzaW9uIDY3NjU4KQorKysgV2ViS2l0Mi9TaGFyZWQvQ29y ZUlQQ1N1cHBvcnQvV2ViQ29udGV4dE1lc3NhZ2VLaW5kcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0z Myw3ICszMyw4IEBACiBuYW1lc3BhY2UgV2ViQ29udGV4dE1lc3NhZ2UgewogCiBlbnVtIEtpbmQg ewotICAgIFBvc3RNZXNzYWdlCisgICAgUG9zdE1lc3NhZ2UsCisgICAgUG9zdFN5bmNocm9ub3Vz TWVzc2FnZQogfTsKIAogfQpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHJldmlzaW9u IDY3NjU4KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTIyMCw2ICsyMjAsMTEgQEAgdm9pZCBXZWJDb250ZXh0OjpkaWRSZWNlaXZlTWVzc2Fn ZUZyb21JbgogICAgIG1faW5qZWN0ZWRCdW5kbGVDbGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2VGcm9t SW5qZWN0ZWRCdW5kbGUodGhpcywgbWVzc2FnZU5hbWUsIG1lc3NhZ2VCb2R5KTsKIH0KIAordm9p ZCBXZWJDb250ZXh0OjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVu ZGxlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSU9iamVjdCogbWVzc2FnZUJvZHksIFJl ZlB0cjxBUElPYmplY3Q+JiByZXR1cm5EYXRhKQoreworICAgIG1faW5qZWN0ZWRCdW5kbGVDbGll bnQuZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSh0aGlzLCBt ZXNzYWdlTmFtZSwgbWVzc2FnZUJvZHksIHJldHVybkRhdGEpOworfQorCiAvLyBIaXN0b3J5Q2xp ZW50CiAKIHZvaWQgV2ViQ29udGV4dDo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoV2Vi RnJhbWVQcm94eSogZnJhbWUsIGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0b3JlKSAK QEAgLTI5Myw3ICsyOTgsNyBAQCB2b2lkIFdlYkNvbnRleHQ6OmFkZFZpc2l0ZWRMaW5rKExpbmtI YXNoCiAgICAgbV92aXNpdGVkTGlua1Byb3ZpZGVyLmFkZFZpc2l0ZWRMaW5rKGxpbmtIYXNoKTsK IH0KICAgICAgICAgCi12b2lkIFdlYkNvbnRleHQ6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6 OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENv cmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKQordm9pZCBXZWJDb250ZXh0OjpkaWRS ZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1l c3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCiB7CiAgICAgc3dp dGNoIChtZXNzYWdlSUQuZ2V0PFdlYkNvbnRleHRNZXNzYWdlOjpLaW5kPigpKSB7CiAgICAgICAg IGNhc2UgV2ViQ29udGV4dE1lc3NhZ2U6OlBvc3RNZXNzYWdlOiB7CkBAIC0zMDYsOSArMzExLDMz IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUkKICAgICAgICAgICAg IGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKG1lc3NhZ2VOYW1lLCBtZXNzYWdl Qm9keS5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKyAgICAgICAgY2Fz ZSBXZWJDb250ZXh0TWVzc2FnZTo6UG9zdFN5bmNocm9ub3VzTWVzc2FnZToKKyAgICAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwogfQogCit2b2lkIFdlYkNvbnRleHQ6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpD b25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1l bnREZWNvZGVyKiBhcmd1bWVudHMsIENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogcmVwbHkpCit7 CisgICAgc3dpdGNoIChtZXNzYWdlSUQuZ2V0PFdlYkNvbnRleHRNZXNzYWdlOjpLaW5kPigpKSB7 CisgICAgICAgIGNhc2UgV2ViQ29udGV4dE1lc3NhZ2U6OlBvc3RTeW5jaHJvbm91c01lc3NhZ2U6 IHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcHJvYmFibHkgZW5jb2RlIHNvbWV0 aGluZyBpbiB0aGUgY2FzZSB0aGF0IHRoZSBhcmd1bWVudHMgZG8gbm90IGRlY29kZSBjb3JyZWN0 bHkuCisKKyAgICAgICAgICAgIFN0cmluZyBtZXNzYWdlTmFtZTsKKyAgICAgICAgICAgIFJlZlB0 cjxBUElPYmplY3Q+IG1lc3NhZ2VCb2R5OworICAgICAgICAgICAgV2ViQ29udGV4dFVzZXJNZXNz YWdlRGVjb2RlciBtZXNzYWdlRGVjb2RlcihtZXNzYWdlQm9keSwgdGhpcyk7CisgICAgICAgICAg ICBpZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKENvcmVJUEM6Ok91dChtZXNzYWdlTmFtZSwgbWVzc2Fn ZURlY29kZXIpKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIFJlZlB0 cjxBUElPYmplY3Q+IHJldHVybkRhdGE7CisgICAgICAgICAgICBkaWRSZWNlaXZlU3luY2hyb25v dXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKG1lc3NhZ2VOYW1lLCBtZXNzYWdlQm9keS5nZXQo KSwgcmV0dXJuRGF0YSk7CisgICAgICAgICAgICByZXBseS0+ZW5jb2RlKENvcmVJUEM6OkluKFdl YkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIocmV0dXJuRGF0YS5nZXQoKSkpKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBjYXNlIFdlYkNvbnRleHRNZXNzYWdlOjpQ b3N0TWVzc2FnZToKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KK30K KwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250 ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCShyZXZp c2lvbiA2NzY1OCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkod29ya2luZyBj b3B5KQpAQCAtODQsNyArODQsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBwb3N0TWVzc2FnZVRvSW5q ZWN0ZWRCdW5kbGUoY29uc3QgV1RGOjpTdHJpbmcmLCBBUElPYmplY3QqKTsKIAogICAgIC8vIElu amVjdGVkQnVuZGxlIGNsaWVudAotICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0 ZWRCdW5kbGUoY29uc3QgV1RGOjpTdHJpbmcmLCBBUElPYmplY3QqKTsKKyAgICB2b2lkIGRpZFJl Y2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKGNvbnN0IFN0cmluZyYsIEFQSU9iamVjdCop OworICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRs ZShjb25zdCBTdHJpbmcmLCBBUElPYmplY3QqLCBSZWZQdHI8QVBJT2JqZWN0PiYgcmV0dXJuRGF0 YSk7CiAKICAgICAvLyBIaXN0b3J5IGNsaWVudAogICAgIHZvaWQgZGlkTmF2aWdhdGVXaXRoTmF2 aWdhdGlvbkRhdGEoV2ViRnJhbWVQcm94eSosIGNvbnN0IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUm KTsgCkBAIC0xMDUsNiArMTA2LDcgQEAgcHVibGljOgogICAgIHZvaWQgYWRkVmlzaXRlZExpbmso V2ViQ29yZTo6TGlua0hhc2gpOwogCiAgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBD OjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29k ZXIqKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9u KiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqLCBDb3JlSVBD OjpBcmd1bWVudEVuY29kZXIqKTsKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICB2b2lkIHNldFNo b3VsZFBhaW50TmF0aXZlQ29udHJvbHMoYm9vbCk7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9X ZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv VUlQcm9jZXNzL1dlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudC5jcHAJKHJldmlzaW9uIDY3 NjU4KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMsNCArNTMsMTQgQEAgdm9pZCBXZWJDb250ZXh0SW5q ZWN0ZWRCdW5kbGVDbGllbnQ6OmRpZAogICAgIG1fY2xpZW50LmRpZFJlY2VpdmVNZXNzYWdlRnJv bUluamVjdGVkQnVuZGxlKHRvUmVmKGNvbnRleHQpLCB0b1JlZihtZXNzYWdlTmFtZS5pbXBsKCkp LCB0b1JlZihtZXNzYWdlQm9keSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogfQogCit2b2lkIFdl YkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudDo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2Fn ZUZyb21JbmplY3RlZEJ1bmRsZShXZWJDb250ZXh0KiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIG1l c3NhZ2VOYW1lLCBBUElPYmplY3QqIG1lc3NhZ2VCb2R5LCBSZWZQdHI8QVBJT2JqZWN0PiYgcmV0 dXJuRGF0YSkKK3sKKyAgICBpZiAoIW1fY2xpZW50LmRpZFJlY2VpdmVTeW5jaHJvbm91c01lc3Nh Z2VGcm9tSW5qZWN0ZWRCdW5kbGUpCisgICAgICAgIHJldHVybjsKKworICAgIFdLVHlwZVJlZiBy ZXR1cm5EYXRhUmVmID0gMDsKKyAgICBtX2NsaWVudC5kaWRSZWNlaXZlU3luY2hyb25vdXNNZXNz YWdlRnJvbUluamVjdGVkQnVuZGxlKHRvUmVmKGNvbnRleHQpLCB0b1JlZihtZXNzYWdlTmFtZS5p bXBsKCkpLCB0b1JlZihtZXNzYWdlQm9keSksICZyZXR1cm5EYXRhUmVmLCBtX2NsaWVudC5jbGll bnRJbmZvKTsKKyAgICByZXR1cm5EYXRhID0gYWRvcHRSZWYodG9XSyhyZXR1cm5EYXRhUmVmKSk7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmgJKHJldmlzaW9uIDY3NjU4KQor KysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmgJKHdv cmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAgcHVibGljOgogICAgIHZvaWQgaW5pdGlhbGl6 ZShjb25zdCBXS0NvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudCopOwogCiAgICAgdm9pZCBkaWRS ZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShXZWJDb250ZXh0KiwgY29uc3QgV1RGOjpT dHJpbmcmLCBBUElPYmplY3QqKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jaHJvbm91c01lc3Nh Z2VGcm9tSW5qZWN0ZWRCdW5kbGUoV2ViQ29udGV4dCosIGNvbnN0IFN0cmluZyYsIEFQSU9iamVj dCosIFJlZlB0cjxBUElPYmplY3Q+JiByZXR1cm5EYXRhKTsKIAogcHJpdmF0ZToKICAgICBXS0Nv bnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudCBtX2NsaWVudDsKSW5kZXg6IFdlYktpdDIvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gNjc2NTgpCisrKyBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTEsNyArMzUxLDcgQEAg dm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzcwogICAgICAgICAgICAgICAg IGdldFBsdWdpbnMocmVmcmVzaCwgcGx1Z2lucyk7CiAKICAgICAgICAgICAgICAgICByZXBseS0+ ZW5jb2RlKHBsdWdpbnMpOwotICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgY2FzZSBXZWJQcm9jZXNzUHJv eHlNZXNzYWdlOjpHZXRQbHVnaW5Ib3N0Q29ubmVjdGlvbjogewpAQCAtMzY0LDcgKzM2NCw3IEBA IHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3MKICAgICAgICAgICAgICAg ICBTdHJpbmcgcGx1Z2luUGF0aDsKICAgICAgICAgICAgICAgICBnZXRQbHVnaW5Ib3N0Q29ubmVj dGlvbihtaW1lVHlwZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybFN0cmluZyksIHBsdWdpblBh dGgpOwogICAgICAgICAgICAgICAgIHJlcGx5LT5lbmNvZGUoQ29yZUlQQzo6SW4ocGx1Z2luUGF0 aCkpOwotICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gVGhlc2UgYXJlIGFzeW5jaHJvbm91cyBtZXNz YWdlcyBhbmQgc2hvdWxkIG5ldmVyIGJlIGhhbmRsZWQgaGVyZS4KQEAgLTM3NiwxMCArMzc2LDE1 IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3MKICAgICAgICAgICAg IGNhc2UgV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZTo6QWRkVmlzaXRlZExpbms6CiAgICAgICAgICAg ICBjYXNlIFdlYlByb2Nlc3NQcm94eU1lc3NhZ2U6OkRpZERlc3Ryb3lGcmFtZToKICAgICAgICAg ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CiAKKyAgICBpZiAobWVzc2Fn ZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYkNvbnRleHQ+KCkpIHsKKyAgICAgICAgbV9j b250ZXh0LT5kaWRSZWNlaXZlU3luY01lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1 bWVudHMsIHJlcGx5KTsgICAgCisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICB1aW50NjRf dCBwYWdlSUQgPSBhcmd1bWVudHMtPmRlc3RpbmF0aW9uSUQoKTsKICAgICBpZiAoIXBhZ2VJRCkK ICAgICAgICAgcmV0dXJuOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmgJKHJl dmlzaW9uIDY3NjU4KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmgJKHdv cmtpbmcgY29weSkKQEAgLTM0LDExICszNCwxMyBAQCBleHRlcm4gIkMiIHsKIAogLy8gSW5qZWN0 ZWQgQnVuZGxlIENsaWVudAogdHlwZWRlZiB2b2lkICgqV0tDb250ZXh0RGlkUmVjZWl2ZU1lc3Nh Z2VGcm9tSW5qZWN0ZWRCdW5kbGVDYWxsYmFjaykoV0tDb250ZXh0UmVmIHBhZ2UsIFdLU3RyaW5n UmVmIG1lc3NhZ2VOYW1lLCBXS1R5cGVSZWYgbWVzc2FnZUJvZHksIGNvbnN0IHZvaWQgKmNsaWVu dEluZm8pOwordHlwZWRlZiB2b2lkICgqV0tDb250ZXh0RGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVz c2FnZUZyb21JbmplY3RlZEJ1bmRsZUNhbGxiYWNrKShXS0NvbnRleHRSZWYgcGFnZSwgV0tTdHJp bmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSwgV0tUeXBlUmVmKiByZXR1 cm5EYXRhLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIAogc3RydWN0IFdLQ29udGV4dEluamVj dGVkQnVuZGxlQ2xpZW50IHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb247CiAgICAgY29uc3Qgdm9p ZCAqICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjbGllbnRJbmZvOwogICAgIFdLQ29udGV4dERpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVk QnVuZGxlQ2FsbGJhY2sgICAgICAgICAgICAgICAgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0 ZWRCdW5kbGU7CisgICAgV0tDb250ZXh0RGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21J bmplY3RlZEJ1bmRsZUNhbGxiYWNrICAgICBkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJv bUluamVjdGVkQnVuZGxlOwogfTsKIHR5cGVkZWYgc3RydWN0IFdLQ29udGV4dEluamVjdGVkQnVu ZGxlQ2xpZW50IFdLQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50OwogCkluZGV4OiBXZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAJ KHJldmlzaW9uIDY3NjU4KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0lu amVjdGVkQnVuZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsMjIgQEAgdm9pZCBJ bmplY3RlZEJ1bmRsZTo6cG9zdE1lc3NhZ2UoY29uc3QgUwogICAgIFdlYlByb2Nlc3M6OnNoYXJl ZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChXZWJDb250ZXh0TWVzc2FnZTo6UG9zdE1lc3NhZ2UsIDAs IENvcmVJUEM6OkluKG1lc3NhZ2VOYW1lLCBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rl cihtZXNzYWdlQm9keSkpKTsKIH0KIAordm9pZCBJbmplY3RlZEJ1bmRsZTo6cG9zdFN5bmNocm9u b3VzTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBBUElPYmplY3QqIG1lc3NhZ2VC b2R5LCBSZWZQdHI8QVBJT2JqZWN0PiYgcmV0dXJuRGF0YSkKK3sKKyAgICBSZWZQdHI8QVBJT2Jq ZWN0PiByZXR1cm5EYXRhVG1wOworICAgIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VEZWNvZGVy IG1lc3NhZ2VEZWNvZGVyKHJldHVybkRhdGFUbXApOworICAgIAorICAgIGJvb2wgc3VjY2VlZGVk ID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kU3luYyhXZWJDb250ZXh0 TWVzc2FnZTo6UG9zdFN5bmNocm9ub3VzTWVzc2FnZSwgMCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIENvcmVJUEM6OkluKG1lc3NhZ2VOYW1lLCBJbmpl Y3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2RlcihtZXNzYWdlQm9keSkpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29yZUlQQzo6T3V0KG1lc3NhZ2VE ZWNvZGVyKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IENvcmVJUEM6OkNvbm5lY3Rpb246Ok5vVGltZW91dCk7CisKKyAgICBpZiAoIXN1Y2NlZWRlZCkK KyAgICAgICAgcmV0dXJuOworCisgICAgcmV0dXJuRGF0YSA9IHJldHVybkRhdGFUbXA7Cit9CisK IHZvaWQgSW5qZWN0ZWRCdW5kbGU6OnNldFNob3VsZFRyYWNrVmlzaXRlZExpbmtzKGJvb2wgc2hv dWxkVHJhY2tWaXNpdGVkTGlua3MpCiB7CiAgICAgUGFnZUdyb3VwOjpzZXRTaG91bGRUcmFja1Zp c2l0ZWRMaW5rcyhzaG91bGRUcmFja1Zpc2l0ZWRMaW5rcyk7CkluZGV4OiBXZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAkocmV2aXNpb24g Njc2NTgpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzUsNyArNzUsMTAgQEAgcHVibGljOgogCiAgICAgLy8g QVBJCiAgICAgdm9pZCBpbml0aWFsaXplQ2xpZW50KFdLQnVuZGxlQ2xpZW50Kik7Ci0gICAgdm9p ZCBwb3N0TWVzc2FnZShjb25zdCBXVEY6OlN0cmluZyYsIEFQSU9iamVjdCopOworICAgIHZvaWQg cG9zdE1lc3NhZ2UoY29uc3QgU3RyaW5nJiwgQVBJT2JqZWN0Kik7CisgICAgdm9pZCBwb3N0U3lu Y2hyb25vdXNNZXNzYWdlKGNvbnN0IFN0cmluZyYsIEFQSU9iamVjdCosIFJlZlB0cjxBUElPYmpl Y3Q+JiByZXR1cm5EYXRhKTsKKworICAgIC8vIFRlc3RSdW5uZXIgb25seSBTUEkKICAgICB2b2lk IHNldFNob3VsZFRyYWNrVmlzaXRlZExpbmtzKGJvb2wpOwogICAgIHZvaWQgcmVtb3ZlQWxsVmlz aXRlZExpbmtzKCk7CiAgICAgdm9pZCBhY3RpdmF0ZU1hY0ZvbnRBc2NlbnRIYWNrKCk7CkluZGV4 OiBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1 bmRsZS5jcHAJKHJldmlzaW9uIDY3NjU4KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9jL1dLQnVuZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksMTQg QEAgdm9pZCBXS0J1bmRsZVBvc3RNZXNzYWdlKFdLQnVuZGxlUmVmIGJ1bgogICAgIHRvV0soYnVu ZGxlUmVmKS0+cG9zdE1lc3NhZ2UodG9XSyhtZXNzYWdlTmFtZVJlZiktPnN0cmluZygpLCB0b1dL KG1lc3NhZ2VCb2R5UmVmKSk7CiB9CiAKK3ZvaWQgV0tCdW5kbGVQb3N0U3luY2hyb25vdXNNZXNz YWdlKFdLQnVuZGxlUmVmIGJ1bmRsZVJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWVSZWYsIFdL VHlwZVJlZiBtZXNzYWdlQm9keVJlZiwgV0tUeXBlUmVmKiByZXR1cm5EYXRhUmVmKQoreworICAg IFJlZlB0cjxBUElPYmplY3Q+IHJldHVybkRhdGE7CisgICAgdG9XSyhidW5kbGVSZWYpLT5wb3N0 U3luY2hyb25vdXNNZXNzYWdlKHRvV0sobWVzc2FnZU5hbWVSZWYpLT5zdHJpbmcoKSwgdG9XSyht ZXNzYWdlQm9keVJlZiksIHJldHVybkRhdGEpOworICAgIGlmIChyZXR1cm5EYXRhUmVmKQorICAg ICAgICAqcmV0dXJuRGF0YVJlZiA9IHRvUmVmKHJldHVybkRhdGEucmVsZWFzZSgpLmxlYWtSZWYo KSk7Cit9CisKIHZvaWQgV0tCdW5kbGVTZXRTaG91bGRUcmFja1Zpc2l0ZWRMaW5rcyhXS0J1bmRs ZVJlZiBidW5kbGVSZWYsIGJvb2wgc2hvdWxkVHJhY2tWaXNpdGVkTGlua3MpCiB7CiAgICAgdG9X SyhidW5kbGVSZWYpLT5zZXRTaG91bGRUcmFja1Zpc2l0ZWRMaW5rcyhzaG91bGRUcmFja1Zpc2l0 ZWRMaW5rcyk7CkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv V0tCdW5kbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL2MvV0tCdW5kbGUuaAkocmV2aXNpb24gNjc2NTgpCisrKyBXZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuaAkod29ya2luZyBjb3B5KQpAQCAtNTIs NiArNTIsNyBAQCBXS19FWFBPUlQgV0tUeXBlSUQgV0tCdW5kbGVHZXRUeXBlSUQoKTsKIFdLX0VY UE9SVCB2b2lkIFdLQnVuZGxlU2V0Q2xpZW50KFdLQnVuZGxlUmVmIGJ1bmRsZSwgV0tCdW5kbGVD bGllbnQgKiBjbGllbnQpOwogCiBXS19FWFBPUlQgdm9pZCBXS0J1bmRsZVBvc3RNZXNzYWdlKFdL QnVuZGxlUmVmIGJ1bmRsZSwgV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNz YWdlQm9keSk7CitXS19FWFBPUlQgdm9pZCBXS0J1bmRsZVBvc3RTeW5jaHJvbm91c01lc3NhZ2Uo V0tCdW5kbGVSZWYgYnVuZGxlLCBXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBlUmVmIG1l c3NhZ2VCb2R5LCBXS1R5cGVSZWYqIHJldHVybkRhdGEpOwogCiAjaWZkZWYgX19jcGx1c3BsdXMK IH0K