152001 2015-12-08 10:40:52 -0800 [MediaStream] Rename UserMediaClient and UserMediaController methods 2015-12-08 11:35:44 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 152000 1 eric.carlson eric.carlson commit-queue oldest_to_newest 1147355 0 eric.carlson 2015-12-08 10:40:52 -0800 Rename requestPermission to requestUserMediaAccess, and cancelRequest to cancelUserMediaAccessRequest. 1147358 1 266908 eric.carlson 2015-12-08 10:45:32 -0800 Created attachment 266908 Proposed patch. 1147398 2 266908 commit-queue 2015-12-08 11:35:41 -0800 Comment on attachment 266908 Proposed patch. Clearing flags on attachment: 266908 Committed r193764: <http://trac.webkit.org/changeset/193764> 1147399 3 commit-queue 2015-12-08 11:35:44 -0800 All reviewed patches have been landed. Closing bug. 266908 2015-12-08 10:45:32 -0800 2015-12-08 11:35:41 -0800 Proposed patch. rename_methods_patch.txt text/plain 11884 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5Mzc1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE1LTEyLTA4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g UmVuYW1lIFVzZXJNZWRpYUNsaWVudCBhbmQgVXNlck1lZGlhQ29udHJvbGxlciBtZXRob2RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIwMDEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVz dHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0v VXNlck1lZGlhQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpVc2VyTWVkaWFDbGllbnQ6On5V c2VyTWVkaWFDbGllbnQpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlh Q29udHJvbGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6VXNlck1lZGlhQ29udHJvbGxlcjo6Y2xp ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJNZWRpYUNvbnRyb2xsZXI6OmZyb20pOgorICAg ICAgICAoV2ViQ29yZTo6VXNlck1lZGlhQ29udHJvbGxlcjo6cmVxdWVzdFVzZXJNZWRpYUFjY2Vz cyk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyTWVkaWFDb250cm9sbGVyOjpjYW5jZWxVc2VyTWVk aWFBY2Nlc3NSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJNZWRpYUNvbnRyb2xsZXI6 OnJlcXVlc3RQZXJtaXNzaW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlVzZXJNZWRp YUNvbnRyb2xsZXI6OmNhbmNlbFJlcXVlc3QpOiBEZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMv bWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVc2Vy TWVkaWFSZXF1ZXN0Ojpjb25zdHJhaW50c1ZhbGlkYXRlZCk6CisgICAgICAgIChXZWJDb3JlOjpV c2VyTWVkaWFSZXF1ZXN0Ojpjb250ZXh0RGVzdHJveWVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9t b2NrL1VzZXJNZWRpYUNsaWVudE1vY2suaDoKKwogMjAxNS0xMi0wOCAgSm9hbm1hcmllIERpZ2dz ICA8amRpZ2dzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0VGTF0gc29tZSBheCB0ZXN0cyBoYXZl IGJlZW4gZmFpbGVkIHNpbmNlIHIxODY2OTIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vVXNlck1lZGlhQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFDbGllbnQuaAkocmV2aXNpb24gMTkzNzUz KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFDbGllbnQu aAkod29ya2luZyBjb3B5KQpAQCAtNDQsOCArNDQsOCBAQCBjbGFzcyBVc2VyTWVkaWFDbGllbnQg ewogcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwYWdlRGVzdHJveWVkKCkgPSAwOwogCi0gICAg dmlydHVhbCB2b2lkIHJlcXVlc3RQZXJtaXNzaW9uKFJlZjxVc2VyTWVkaWFSZXF1ZXN0PiYmKSA9 IDA7Ci0gICAgdmlydHVhbCB2b2lkIGNhbmNlbFJlcXVlc3QoVXNlck1lZGlhUmVxdWVzdCYpID0g MDsKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFVzZXJNZWRpYUFjY2VzcyhSZWY8VXNlck1lZGlh UmVxdWVzdD4mJikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxVc2VyTWVkaWFBY2Nlc3NS ZXF1ZXN0KFVzZXJNZWRpYVJlcXVlc3QmKSA9IDA7CiAKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFs IH5Vc2VyTWVkaWFDbGllbnQoKSB7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vVXNlck1lZGlhQ29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhQ29udHJvbGxlci5oCShyZXZpc2lvbiAx OTM3NTMpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRpYUNv bnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzksOCArMzksOSBAQCBwdWJsaWM6CiAgICAg flVzZXJNZWRpYUNvbnRyb2xsZXIoKTsKIAogICAgIFVzZXJNZWRpYUNsaWVudCogY2xpZW50KCkg Y29uc3QgeyByZXR1cm4gbV9jbGllbnQ7IH0KLSAgICB2b2lkIHJlcXVlc3RQZXJtaXNzaW9uKFJl ZjxVc2VyTWVkaWFSZXF1ZXN0PiYmKTsKLSAgICB2b2lkIGNhbmNlbFJlcXVlc3QoVXNlck1lZGlh UmVxdWVzdCYpOworCisgICAgdm9pZCByZXF1ZXN0VXNlck1lZGlhQWNjZXNzKFJlZjxVc2VyTWVk aWFSZXF1ZXN0PiYmKTsKKyAgICB2b2lkIGNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3QoVXNl ck1lZGlhUmVxdWVzdCYpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGNvbnN0IGNoYXIq IHN1cHBsZW1lbnROYW1lKCk7CiAgICAgc3RhdGljIFVzZXJNZWRpYUNvbnRyb2xsZXIqIGZyb20o UGFnZSogcGFnZSkgeyByZXR1cm4gc3RhdGljX2Nhc3Q8VXNlck1lZGlhQ29udHJvbGxlcio+KFN1 cHBsZW1lbnQ8UGFnZT46OmZyb20ocGFnZSwgc3VwcGxlbWVudE5hbWUoKSkpOyB9CkBAIC00OSwx NCArNTAsMTQgQEAgcHJpdmF0ZToKICAgICBVc2VyTWVkaWFDbGllbnQqIG1fY2xpZW50OwogfTsK IAotaW5saW5lIHZvaWQgVXNlck1lZGlhQ29udHJvbGxlcjo6cmVxdWVzdFBlcm1pc3Npb24oUmVm PFVzZXJNZWRpYVJlcXVlc3Q+JiYgcmVxdWVzdCkKK2lubGluZSB2b2lkIFVzZXJNZWRpYUNvbnRy b2xsZXI6OnJlcXVlc3RVc2VyTWVkaWFBY2Nlc3MoUmVmPFVzZXJNZWRpYVJlcXVlc3Q+JiYgcmVx dWVzdCkKIHsKLSAgICBtX2NsaWVudC0+cmVxdWVzdFBlcm1pc3Npb24oV1RGOjptb3ZlKHJlcXVl c3QpKTsKKyAgICBtX2NsaWVudC0+cmVxdWVzdFVzZXJNZWRpYUFjY2VzcyhXVEY6Om1vdmUocmVx dWVzdCkpOwogfQogCi1pbmxpbmUgdm9pZCBVc2VyTWVkaWFDb250cm9sbGVyOjpjYW5jZWxSZXF1 ZXN0KFVzZXJNZWRpYVJlcXVlc3QmIHJlcXVlc3QpCitpbmxpbmUgdm9pZCBVc2VyTWVkaWFDb250 cm9sbGVyOjpjYW5jZWxVc2VyTWVkaWFBY2Nlc3NSZXF1ZXN0KFVzZXJNZWRpYVJlcXVlc3QmIHJl cXVlc3QpCiB7Ci0gICAgbV9jbGllbnQtPmNhbmNlbFJlcXVlc3QocmVxdWVzdCk7CisgICAgbV9j bGllbnQtPmNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3QocmVxdWVzdCk7CiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vVXNlck1lZGlhUmVxdWVzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcAkocmV2aXNpb24gMTkzNzUzKQor KysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTMxLDcgKzEzMSw3IEBAIHZvaWQgVXNlck1lZGlhUmVxdWVz dDo6Y29uc3RyYWludHNWYWxpZGEKICAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlz XSB7CiAgICAgICAgIC8vIDIgLSBUaGUgY29uc3RyYWludHMgYXJlIHZhbGlkLCBhc2sgdGhlIHVz ZXIgZm9yIGFjY2VzcyB0byBtZWRpYS4KICAgICAgICAgaWYgKFVzZXJNZWRpYUNvbnRyb2xsZXIq IGNvbnRyb2xsZXIgPSBwcm90ZWN0ZWRUaGlzLT5tX2NvbnRyb2xsZXIpCi0gICAgICAgICAgICBj b250cm9sbGVyLT5yZXF1ZXN0UGVybWlzc2lvbigqcHJvdGVjdGVkVGhpcy5nZXQoKSk7CisgICAg ICAgICAgICBjb250cm9sbGVyLT5yZXF1ZXN0VXNlck1lZGlhQWNjZXNzKCpwcm90ZWN0ZWRUaGlz LmdldCgpKTsKICAgICB9KTsKIH0KIApAQCAtMjAzLDcgKzIwMyw3IEBAIHZvaWQgVXNlck1lZGlh UmVxdWVzdDo6Y29udGV4dERlc3Ryb3llZCgKICAgICBSZWY8VXNlck1lZGlhUmVxdWVzdD4gcHJv dGVjdCgqdGhpcyk7CiAKICAgICBpZiAobV9jb250cm9sbGVyKSB7Ci0gICAgICAgIG1fY29udHJv bGxlci0+Y2FuY2VsUmVxdWVzdCgqdGhpcyk7CisgICAgICAgIG1fY29udHJvbGxlci0+Y2FuY2Vs VXNlck1lZGlhQWNjZXNzUmVxdWVzdCgqdGhpcyk7CiAgICAgICAgIG1fY29udHJvbGxlciA9IG51 bGxwdHI7CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL1VzZXJN ZWRpYUNsaWVudE1vY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t b2NrL1VzZXJNZWRpYUNsaWVudE1vY2suaAkocmV2aXNpb24gMTkzNzUzKQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbW9jay9Vc2VyTWVkaWFDbGllbnRNb2NrLmgJKHdvcmtpbmcgY29weSkK QEAgLTcwLDEzICs3MCwxMyBAQCBwdWJsaWM6CiAgICAgICAgIGRlbGV0ZSB0aGlzOwogICAgIH0K IAotICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVybWlzc2lvbihSZWY8VXNlck1lZGlhUmVxdWVz dD4mJiByZXF1ZXN0KSBvdmVycmlkZQorICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0VXNlck1lZGlh QWNjZXNzKFJlZjxVc2VyTWVkaWFSZXF1ZXN0PiYmIHJlcXVlc3QpIG92ZXJyaWRlCiAgICAgewog ICAgICAgICBSZWZQdHI8VXNlck1lZGlhQ2xpZW50UmVxdWVzdE5vdGlmaWVyPiBub3RpZmllciA9 IGFkb3B0UmVmKG5ldyBVc2VyTWVkaWFDbGllbnRSZXF1ZXN0Tm90aWZpZXIoV1RGOjptb3ZlKHJl cXVlc3QpLCB0cnVlKSk7CiAgICAgICAgIG1fdGltZXJFdmVudHMuYXBwZW5kKGFkb3B0UmVmKG5l dyBUaW1lckV2ZW50KHRoaXMsIG5vdGlmaWVyKSkpOwogICAgIH0KIAotICAgIHZpcnR1YWwgdm9p ZCBjYW5jZWxSZXF1ZXN0KFVzZXJNZWRpYVJlcXVlc3QmIHJlcXVlc3QpIG92ZXJyaWRlCisgICAg dmlydHVhbCB2b2lkIGNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3QoVXNlck1lZGlhUmVxdWVz dCYgcmVxdWVzdCkgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIFJlZlB0cjxVc2VyTWVkaWFDbGll bnRSZXF1ZXN0Tm90aWZpZXI+IG5vdGlmaWVyID0gYWRvcHRSZWYobmV3IFVzZXJNZWRpYUNsaWVu dFJlcXVlc3ROb3RpZmllcihyZXF1ZXN0LCBmYWxzZSkpOwogICAgICAgICBtX3RpbWVyRXZlbnRz LmFwcGVuZChhZG9wdFJlZihuZXcgVGltZXJFdmVudCh0aGlzLCBub3RpZmllcikpKTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cJKHJldmlzaW9uIDE5Mzc1MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTEyLTA4ICBFcmljIENhcmxzb24g IDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0gUmVuYW1l IFVzZXJNZWRpYUNsaWVudCBhbmQgVXNlck1lZGlhQ29udHJvbGxlciBtZXRob2RzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIwMDEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViVXNlck1lZGlhQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi VXNlck1lZGlhQ2xpZW50OjpwYWdlRGVzdHJveWVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVXNl ck1lZGlhQ2xpZW50OjpyZXF1ZXN0VXNlck1lZGlhQWNjZXNzKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVXNlck1lZGlhQ2xpZW50OjpjYW5jZWxVc2VyTWVkaWFBY2Nlc3NSZXF1ZXN0KToKKyAgICAg ICAgKFdlYktpdDo6V2ViVXNlck1lZGlhQ2xpZW50OjpyZXF1ZXN0UGVybWlzc2lvbik6IERlbGV0 ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJNZWRpYUNsaWVudDo6Y2FuY2VsUmVxdWVzdCk6 IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJVc2VyTWVk aWFDbGllbnQuaDoKKwogMjAxNS0xMi0wOCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFtFRkxdIFJFR1JFU1NJT04ocjE3MzM5NCk6IE1pbmlCcm93c2Vy IHN0dWNrZWQgaW4gYW4gaW5maW5pdGUgbG9vcCBpZiBORVRXT1JLX0NBQ0hFIGlzIGRpc2FibGVk CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlVzZXJN ZWRpYUNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJVc2VyTWVkaWFDbGllbnQuY3BwCShyZXZpc2lvbiAxOTM3NTMpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlVzZXJNZWRpYUNs aWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDEzICszOSwxMyBAQCB2b2lkIFdlYlVzZXJN ZWRpYUNsaWVudDo6cGFnZURlc3Ryb3llZCgpCiAgICAgZGVsZXRlIHRoaXM7CiB9CiAKLXZvaWQg V2ViVXNlck1lZGlhQ2xpZW50OjpyZXF1ZXN0UGVybWlzc2lvbihSZWY8VXNlck1lZGlhUmVxdWVz dD4mJiBwclJlcXVlc3QpCit2b2lkIFdlYlVzZXJNZWRpYUNsaWVudDo6cmVxdWVzdFVzZXJNZWRp YUFjY2VzcyhSZWY8VXNlck1lZGlhUmVxdWVzdD4mJiBwclJlcXVlc3QpCiB7CiAgICAgVXNlck1l ZGlhUmVxdWVzdCYgcmVxdWVzdCA9IHByUmVxdWVzdC5sZWFrUmVmKCk7CiAgICAgbV9wYWdlLnVz ZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigpLnN0YXJ0UmVxdWVzdChyZXF1ZXN0KTsK IH0KIAotdm9pZCBXZWJVc2VyTWVkaWFDbGllbnQ6OmNhbmNlbFJlcXVlc3QoVXNlck1lZGlhUmVx dWVzdCYgcmVxdWVzdCkKK3ZvaWQgV2ViVXNlck1lZGlhQ2xpZW50OjpjYW5jZWxVc2VyTWVkaWFB Y2Nlc3NSZXF1ZXN0KFVzZXJNZWRpYVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgbV9wYWdlLnVz ZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigpLmNhbmNlbFJlcXVlc3QocmVxdWVzdCk7 CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlVz ZXJNZWRpYUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViVXNlck1lZGlhQ2xpZW50LmgJKHJldmlzaW9uIDE5Mzc1MykKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViVXNlck1lZGlhQ2xp ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDggKzM0LDggQEAgcHVibGljOgogCiBwcml2YXRl OgogICAgIHZpcnR1YWwgdm9pZCBwYWdlRGVzdHJveWVkKCkgb3ZlcnJpZGU7Ci0gICAgdm9pZCBy ZXF1ZXN0UGVybWlzc2lvbihSZWY8V2ViQ29yZTo6VXNlck1lZGlhUmVxdWVzdD4mJikgb3ZlcnJp ZGU7Ci0gICAgdm9pZCBjYW5jZWxSZXF1ZXN0KFdlYkNvcmU6OlVzZXJNZWRpYVJlcXVlc3QmKSBv dmVycmlkZTsKKyAgICB2b2lkIHJlcXVlc3RVc2VyTWVkaWFBY2Nlc3MoUmVmPFdlYkNvcmU6OlVz ZXJNZWRpYVJlcXVlc3Q+JiYpIG92ZXJyaWRlOworICAgIHZvaWQgY2FuY2VsVXNlck1lZGlhQWNj ZXNzUmVxdWVzdChXZWJDb3JlOjpVc2VyTWVkaWFSZXF1ZXN0Jikgb3ZlcnJpZGU7CiAKICAgICBX ZWJQYWdlJiBtX3BhZ2U7CiB9OwpJbmRleDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTkzNzU4 KQorKysgU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTUtMTItMDggIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CisKKyAgICAgICAgW01lZGlhU3RyZWFtXSBSZW5hbWUgVXNlck1lZGlhQ2xpZW50IGFuZCBV c2VyTWVkaWFDb250cm9sbGVyIG1ldGhvZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1MjAwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViVXNlck1lZGlhQ2xpZW50Lmg6 CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViVXNlck1lZGlhQ2xpZW50Lm1tOgorICAgICAg ICAoV2ViVXNlck1lZGlhQ2xpZW50OjpwYWdlRGVzdHJveWVkKToKKyAgICAgICAgKFdlYlVzZXJN ZWRpYUNsaWVudDo6cmVxdWVzdFVzZXJNZWRpYUFjY2Vzcyk6CisgICAgICAgIChXZWJVc2VyTWVk aWFDbGllbnQ6OmNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3QpOgorICAgICAgICAoLVtXZWJV c2VyTWVkaWFQb2xpY3lMaXN0ZW5lciBpbml0V2l0aFVzZXJNZWRpYVJlcXVlc3Q6XSk6CisgICAg ICAgICgtW1dlYlVzZXJNZWRpYVBvbGljeUxpc3RlbmVyIGNhbmNlbFVzZXJNZWRpYUFjY2Vzc1Jl cXVlc3RdKToKKyAgICAgICAgKFdlYlVzZXJNZWRpYUNsaWVudDo6cmVxdWVzdFBlcm1pc3Npb24p OiBEZWxldGVkLgorICAgICAgICAoV2ViVXNlck1lZGlhQ2xpZW50OjpjYW5jZWxSZXF1ZXN0KTog RGVsZXRlZC4KKyAgICAgICAgKC1bV2ViVXNlck1lZGlhUG9saWN5TGlzdGVuZXIgY2FuY2VsUmVx dWVzdF0pOiBEZWxldGVkLgorCiAyMDE1LTEyLTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4IGFmdGVyIHIxOTM2NzUuCklu ZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJVc2VyTWVkaWFDbGllbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJVc2Vy TWVkaWFDbGllbnQuaAkocmV2aXNpb24gMTkzNzUzKQorKysgU291cmNlL1dlYktpdC9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViVXNlck1lZGlhQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDgg KzQ0LDggQEAgcHVibGljOgogICAgIH5XZWJVc2VyTWVkaWFDbGllbnQoKTsKIAogICAgIC8vIFVz ZXJNZWRpYUNsaWVudAotICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVybWlzc2lvbihSZWY8V2Vi Q29yZTo6VXNlck1lZGlhUmVxdWVzdD4mJikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lkIGNh bmNlbFJlcXVlc3QoV2ViQ29yZTo6VXNlck1lZGlhUmVxdWVzdCYpIG92ZXJyaWRlOworICAgIHZp cnR1YWwgdm9pZCByZXF1ZXN0VXNlck1lZGlhQWNjZXNzKFJlZjxXZWJDb3JlOjpVc2VyTWVkaWFS ZXF1ZXN0PiYmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsVXNlck1lZGlhQWNj ZXNzUmVxdWVzdChXZWJDb3JlOjpVc2VyTWVkaWFSZXF1ZXN0Jikgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCB2b2lkIHBhZ2VEZXN0cm95ZWQoKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKSW5kZXg6IFNv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlVzZXJNZWRpYUNsaWVudC5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJVc2VyTWVkaWFD bGllbnQubW0JKHJldmlzaW9uIDE5Mzc1MykKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYlVzZXJNZWRpYUNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYs NyBAQCBAaW50ZXJmYWNlIFdlYlVzZXJNZWRpYVBvbGljeUxpc3RlbmVyIDogCiAgICAgUmVmUHRy PFVzZXJNZWRpYVJlcXVlc3Q+IF9yZXF1ZXN0OwogfQogLSAoaWQpaW5pdFdpdGhVc2VyTWVkaWFS ZXF1ZXN0OihQYXNzUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+KXJlcXVlc3Q7Ci0tICh2b2lkKWNh bmNlbFJlcXVlc3Q7CistICh2b2lkKWNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3Q7CiAtICh2 b2lkKWRlbnk7CiBAZW5kCiAKQEAgLTgxLDE0ICs4MSwxNCBAQCB2b2lkIFdlYlVzZXJNZWRpYUNs aWVudDo6cGFnZURlc3Ryb3llZCgpCiB7CiAgICAgVXNlck1lZGlhUmVxdWVzdHNNYXAmIHJlcXVl c3RzTWFwID0gdXNlck1lZGlhUmVxdWVzdHNNYXAoKTsKICAgICBmb3IgKFVzZXJNZWRpYVJlcXVl c3RzTWFwOjppdGVyYXRvciBpdCA9IHJlcXVlc3RzTWFwLmJlZ2luKCk7IGl0ICE9IHJlcXVlc3Rz TWFwLmVuZCgpOyArK2l0KSB7Ci0gICAgICAgIFtpdC0+dmFsdWUgY2FuY2VsUmVxdWVzdF07Cisg ICAgICAgIFtpdC0+dmFsdWUgY2FuY2VsVXNlck1lZGlhQWNjZXNzUmVxdWVzdF07CiAgICAgICAg IHJlcXVlc3RzTWFwLnJlbW92ZShpdCk7CiAgICAgfQogCiAgICAgZGVsZXRlIHRoaXM7CiB9CiAK LXZvaWQgV2ViVXNlck1lZGlhQ2xpZW50OjpyZXF1ZXN0UGVybWlzc2lvbihSZWY8VXNlck1lZGlh UmVxdWVzdD4mJiBwcnBSZXF1ZXN0KQordm9pZCBXZWJVc2VyTWVkaWFDbGllbnQ6OnJlcXVlc3RV c2VyTWVkaWFBY2Nlc3MoUmVmPFVzZXJNZWRpYVJlcXVlc3Q+JiYgcHJwUmVxdWVzdCkKIHsKICAg ICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAKQEAgLTExMSwxNCArMTExLDE0IEBAIHZv aWQgV2ViVXNlck1lZGlhQ2xpZW50OjpyZXF1ZXN0UGVybWlzc2kKICAgICBFTkRfQkxPQ0tfT0JK Q19FWENFUFRJT05TOwogfQogCi12b2lkIFdlYlVzZXJNZWRpYUNsaWVudDo6Y2FuY2VsUmVxdWVz dChVc2VyTWVkaWFSZXF1ZXN0JiByZXF1ZXN0KQordm9pZCBXZWJVc2VyTWVkaWFDbGllbnQ6OmNh bmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3QoVXNlck1lZGlhUmVxdWVzdCYgcmVxdWVzdCkKIHsK ICAgICBVc2VyTWVkaWFSZXF1ZXN0c01hcCYgcmVxdWVzdHNNYXAgPSB1c2VyTWVkaWFSZXF1ZXN0 c01hcCgpOwogICAgIFVzZXJNZWRpYVJlcXVlc3RzTWFwOjppdGVyYXRvciBpdCA9IHJlcXVlc3Rz TWFwLmZpbmQoJnJlcXVlc3QpOwogICAgIGlmIChpdCA9PSByZXF1ZXN0c01hcC5lbmQoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgW2l0LT52YWx1ZSBjYW5jZWxSZXF1ZXN0XTsKKyAgICBbaXQt PnZhbHVlIGNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3RdOwogICAgIHJlcXVlc3RzTWFwLnJl bW92ZShpdCk7CiB9CiAKQEAgLTEzNiw3ICsxMzYsNyBAQCAtIChpZClpbml0V2l0aFVzZXJNZWRp YVJlcXVlc3Q6KFBhc3NSZWZQCiAjZW5kaWYKIH0KIAotLSAodm9pZCljYW5jZWxSZXF1ZXN0Cist ICh2b2lkKWNhbmNlbFVzZXJNZWRpYUFjY2Vzc1JlcXVlc3QKIHsKICNpZiBFTkFCTEUoTUVESUFf U1RSRUFNKQogICAgIGlmICghX3JlcXVlc3QpCg==