132104 2014-04-23 20:42:14 -0700 [MediaStream] .ended shouldn't be part of MediaStream IDL 2014-04-27 19:38:19 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED WebExposed P2 Normal --- 1 praveen.j webkit-unassigned cdumez commit-queue dev_sachin eric.carlson esprehn+autocc glenn hta jer.noble kondapallykalyan philipj sergio tommyw oldest_to_newest 1003506 0 praveen.j 2014-04-23 20:42:14 -0700 .ended attribute won't be part of MediaStream IDL from next release(http://dev.w3.org/2011/webrtc/editor/getusermedia.html#mediastream). Implementation should be deprecated in WebKit. 1004024 1 230155 praveen.j 2014-04-25 02:40:17 -0700 Created attachment 230155 Patch .ended implementation is cleaned up. Not sure if this is the right way though. 1004465 2 230155 commit-queue 2014-04-27 19:38:14 -0700 Comment on attachment 230155 Patch Clearing flags on attachment: 230155 Committed r167868: <http://trac.webkit.org/changeset/167868> 1004466 3 commit-queue 2014-04-27 19:38:19 -0700 All reviewed patches have been landed. Closing bug. 230155 2014-04-25 02:40:17 -0700 2014-04-27 19:38:13 -0700 Patch MediaStream-132104.txt text/plain 13941 praveen.j SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Nzc5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA0LTI1ICBQcmF2ZWVu IFIgSmFkaGF2ICA8cHJhdmVlbi5qQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVh bV0gLmVuZGVkIHNob3VsZG4ndCBiZSBwYXJ0IG9mIE1lZGlhU3RyZWFtIElETAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMTA0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLmVuZGVkIGF0dHJpYnV0ZSBp cyBzcGVjJ2VkIG91dCBvZiBNZWRpYVN0cmVhbSBJREwuIEluc3RlYWQsIC5hY3RpdmUKKyAgICAg ICAgaXMgaW50cm9kdWNlZCB0byBoYW5kbGUgbW9yZSBzY2VuYXJpb3MuIFRoaXMgcGF0Y2ggcmVw bGFjZXMgYWxsICdlbmRlZCcKKyAgICAgICAgYXR0cmlidXRlIGNhbGxzIHdpdGggY29ycmVzcG9u ZGluZyAnYWN0aXZlJyBhdHRyaWJ1dGVzLiAKKworICAgICAgICBNZWRpYVN0cmVhbS1hZGQtcmVt b3ZlLXRyYWNrcy5odG1sIGlzIHVwZGF0ZWQuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtOjphZGRU cmFjayk6IFJlcGxhY2VkIGVuZGVkKCkgd2l0aCBhY3RpdmUoKS4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhU3RyZWFtOjpyZW1vdmVUcmFjayk6IHNldEVuZGVkKCkgaXNuJ3QgY2FsbGVkLiBzZXRB Y3RpdmUoKQorICAgICAgICBpcyByZXRhaW5lZCB3aGljaCBwcm9wYWdhdGVzIG9uaW5hY3RpdmUg ZXZlbnQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6dHJhY2tEaWRFbmQpOiBzZXRF bmRlZCgpIGlzbid0IGNhbGxlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtOjpyZW1v dmVSZW1vdGVTb3VyY2UpOiBSZXBsYWNlZCBlbmRlZCgpIHdpdGggYWN0aXZlKCkuCisgICAgICAg IChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6YWRkUmVtb3RlVHJhY2spOiBSZXBsYWNlZCBlbmRlZCgp IHdpdGggYWN0aXZlKCkuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6cmVtb3ZlUmVt b3RlVHJhY2spOiBSZXBsYWNlZCBlbmRlZCgpIHdpdGggYWN0aXZlKCkuCisgICAgICAgIChXZWJD b3JlOjpNZWRpYVN0cmVhbTo6ZW5kZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFTdHJlYW06OnNldEVuZGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3Ry ZWFtOjpzdHJlYW1EaWRFbmQpOiBEZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW0uaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtLmlkbDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uOjpkaWRSZW1vdmVSZW1v dGVTdHJlYW0pOiBSZXBsYWNlZCBzZXRFbmRlZCgpCisgICAgICAgIHdpdGggc2V0QWN0aXZlKCku CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Qcml2YXRlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtUHJpdmF0ZTo6TWVkaWFTdHJlYW1Qcml2YXRl KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtUHJpdmF0ZTo6c2V0QWN0aXZlKTogVXBk YXRlZCBjb21tZW50IGZyb20gYnVnIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMxOTczCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVByaXZh dGU6OnNldEVuZGVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVByaXZhdGUuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtUHJpdmF0 ZTo6ZW5kZWQpOiBEZWxldGVkLgorCiAyMDE0LTA0LTI1ICBJb24gUm9zY2EgIDxyb3NjYUBhZG9i ZS5jb20+CiAKICAgICAgICAgSW5jb21wbGV0ZSBib2R5IHBhaW50aW5nIHdoZW4gdXNpbmcgYmxl bmQgbW9kZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFT dHJlYW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW0uY3BwCShyZXZpc2lvbiAxNjc3ODgpCisrKyBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0 LDE4ICsxMTQsNiBAQCBNZWRpYVN0cmVhbTo6fk1lZGlhU3RyZWFtKCkKICAgICBtX3ByaXZhdGUt PnNldENsaWVudCgwKTsKIH0KIAotYm9vbCBNZWRpYVN0cmVhbTo6ZW5kZWQoKSBjb25zdAotewot ICAgIHJldHVybiBtX3ByaXZhdGUtPmVuZGVkKCk7Ci19Ci0KLXZvaWQgTWVkaWFTdHJlYW06OnNl dEVuZGVkKCkKLXsKLSAgICBpZiAoZW5kZWQoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIG1fcHJp dmF0ZS0+c2V0RW5kZWQoKTsKLX0KLQogYm9vbCBNZWRpYVN0cmVhbTo6YWN0aXZlKCkgY29uc3QK IHsKICAgICByZXR1cm4gbV9wcml2YXRlLT5hY3RpdmUoKTsKQEAgLTE1NSw3ICsxNDMsNyBAQCB2 b2lkIE1lZGlhU3RyZWFtOjpjbG9uZU1lZGlhU3RyZWFtVHJhY2tWCiAKIHZvaWQgTWVkaWFTdHJl YW06OmFkZFRyYWNrKFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gcHJwVHJhY2ssIEV4Y2Vw dGlvbkNvZGUmIGVjKQogewotICAgIGlmIChlbmRlZCgpKSB7CisgICAgaWYgKCFhY3RpdmUoKSkg ewogICAgICAgICBlYyA9IElOVkFMSURfU1RBVEVfRVJSOwogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtMTkwLDcgKzE3OCw3IEBAIGJvb2wgTWVkaWFTdHJlYW06OmFkZFRyYWNrKFBhc3NSZWZQ dHI8TWUKIAogdm9pZCBNZWRpYVN0cmVhbTo6cmVtb3ZlVHJhY2soUGFzc1JlZlB0cjxNZWRpYVN0 cmVhbVRyYWNrPiBwcnBUcmFjaywgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgaWYgKGVuZGVk KCkpIHsKKyAgICBpZiAoIWFjdGl2ZSgpKSB7CiAgICAgICAgIGVjID0gSU5WQUxJRF9TVEFURV9F UlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yMjcsMTAgKzIxNSw4IEBAIGJvb2wgTWVk aWFTdHJlYW06OnJlbW92ZVRyYWNrKFBhc3NSZWZQdHIKICAgICAgICAgbV9wcml2YXRlLT5yZW1v dmVTb3VyY2UodHJhY2stPnNvdXJjZSgpKTsKIAogICAgIHRyYWNrLT5yZW1vdmVPYnNlcnZlcih0 aGlzKTsKLSAgICBpZiAoIW1fYXVkaW9UcmFja3Muc2l6ZSgpICYmICFtX3ZpZGVvVHJhY2tzLnNp emUoKSkgewotICAgICAgICBzZXRFbmRlZCgpOyAvLyBGSVhNRSA6IHRvIGJlIHJlbW92ZWQgaW4g YnVnIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIxMDQKKyAgICBp ZiAoIW1fYXVkaW9UcmFja3Muc2l6ZSgpICYmICFtX3ZpZGVvVHJhY2tzLnNpemUoKSkKICAgICAg ICAgc2V0QWN0aXZlKGZhbHNlKTsKLSAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTI3 OSwyMCArMjY1LDEwIEBAIHZvaWQgTWVkaWFTdHJlYW06OnRyYWNrRGlkRW5kKCkKICAgICAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBzZXRFbmRlZCgpOyAvLyBGSVhNRSA6IHRvIGJlIHJl bW92ZWQgaW4gYnVnIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIx MDQKLQogICAgIGlmICghbV9hdWRpb1RyYWNrcy5zaXplKCkgJiYgIW1fdmlkZW9UcmFja3Muc2l6 ZSgpKQogICAgICAgICBzZXRBY3RpdmUoZmFsc2UpOwogfQogCi12b2lkIE1lZGlhU3RyZWFtOjpz dHJlYW1EaWRFbmQoKQotewotICAgIGlmIChlbmRlZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBzY2hlZHVsZURpc3BhdGNoRXZlbnQoRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuZW5kZWRF dmVudCwgZmFsc2UsIGZhbHNlKSk7Ci19Ci0KIHZvaWQgTWVkaWFTdHJlYW06OnNldFN0cmVhbUlz QWN0aXZlKGJvb2wgc3RyZWFtQWN0aXZlKQogewogICAgIGlmIChzdHJlYW1BY3RpdmUpCkBAIC0z MTUsNyArMjkxLDcgQEAgdm9pZCBNZWRpYVN0cmVhbTo6YWRkUmVtb3RlU291cmNlKE1lZGlhUwog dm9pZCBNZWRpYVN0cmVhbTo6cmVtb3ZlUmVtb3RlU291cmNlKE1lZGlhU3RyZWFtU291cmNlKiBz b3VyY2UpCiB7CiAgICAgQVNTRVJUKHNvdXJjZSk7Ci0gICAgaWYgKGVuZGVkKCkpCisgICAgaWYg KCFhY3RpdmUoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0 cmVhbVRyYWNrPj4qIHRyYWNrcyA9IHRyYWNrVmVjdG9yRm9yVHlwZShzb3VyY2UtPnR5cGUoKSk7 CkBAIC0zMzcsNyArMzEzLDcgQEAgdm9pZCBNZWRpYVN0cmVhbTo6cmVtb3ZlUmVtb3RlU291cmNl KE1lZAogdm9pZCBNZWRpYVN0cmVhbTo6YWRkUmVtb3RlVHJhY2soTWVkaWFTdHJlYW1UcmFja1By aXZhdGUqIHByaXZhdGVUcmFjaykKIHsKICAgICBBU1NFUlQocHJpdmF0ZVRyYWNrKTsKLSAgICBp ZiAoZW5kZWQoKSkKKyAgICBpZiAoIWFjdGl2ZSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBS ZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gdHJhY2s7CkBAIC0zNjMsNyArMzM5LDcgQEAgdm9pZCBN ZWRpYVN0cmVhbTo6YWRkUmVtb3RlVHJhY2soTWVkaWFTdAogdm9pZCBNZWRpYVN0cmVhbTo6cmVt b3ZlUmVtb3RlVHJhY2soTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUqIHByaXZhdGVUcmFjaykKIHsK ICAgICBBU1NFUlQocHJpdmF0ZVRyYWNrKTsKLSAgICBpZiAoZW5kZWQoKSkKKyAgICBpZiAoIWFj dGl2ZSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4g dHJhY2sgPSBnZXRUcmFja0J5SWQocHJpdmF0ZVRyYWNrLT5pZCgpKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgJKHJldmlzaW9u IDE2Nzc4OCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJl YW0uaAkod29ya2luZyBjb3B5KQpAQCAtNjcsMTEgKzY3LDggQEAgcHVibGljOgogICAgIFZlY3Rv cjxSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4+IGdldEF1ZGlvVHJhY2tzKCkgY29uc3QgeyByZXR1 cm4gbV9hdWRpb1RyYWNrczsgfQogICAgIFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4+ IGdldFZpZGVvVHJhY2tzKCkgY29uc3QgeyByZXR1cm4gbV92aWRlb1RyYWNrczsgfQogCi0gICAg Ym9vbCBlbmRlZCgpIGNvbnN0OwotICAgIHZvaWQgc2V0RW5kZWQoKTsKICAgICBQYXNzUmVmUHRy PE1lZGlhU3RyZWFtPiBjbG9uZSgpOwogCi0gICAgREVGSU5FX0FUVFJJQlVURV9FVkVOVF9MSVNU RU5FUihlbmRlZCk7CiAgICAgREVGSU5FX0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihhZGR0cmFj ayk7CiAgICAgREVGSU5FX0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihyZW1vdmV0cmFjayk7CiAK QEAgLTEwOSw3ICsxMDYsNiBAQCBwcml2YXRlOgogCiAgICAgLy8gTWVkaWFTdHJlYW1Qcml2YXRl Q2xpZW50CiAgICAgdmlydHVhbCB2b2lkIHRyYWNrRGlkRW5kKCkgb3ZlcnJpZGUgZmluYWw7Ci0g ICAgdmlydHVhbCB2b2lkIHN0cmVhbURpZEVuZCgpIG92ZXJyaWRlIGZpbmFsOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRTdHJlYW1Jc0FjdGl2ZShib29sKSBvdmVycmlkZSBmaW5hbDsKICAgICB2aXJ0 dWFsIHZvaWQgYWRkUmVtb3RlU291cmNlKE1lZGlhU3RyZWFtU291cmNlKikgb3ZlcnJpZGUgZmlu YWw7CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZVJlbW90ZVNvdXJjZShNZWRpYVN0cmVhbVNvdXJj ZSopIG92ZXJyaWRlIGZpbmFsOwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbS5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5pZGwJKHJldmlzaW9uIDE2Nzc4OCkKKysrIFNvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaWRsCSh3b3JraW5nIGNv cHkpCkBAIC00MiwxNiArNDIsMTIgQEAKICAgICBNZWRpYVN0cmVhbVRyYWNrIGdldFRyYWNrQnlJ ZChET01TdHJpbmcgdHJhY2tJZCk7CiAgICAgTWVkaWFTdHJlYW0gY2xvbmUoKTsKIAotICAgIHJl YWRvbmx5IGF0dHJpYnV0ZSBib29sZWFuIGVuZGVkOwotCi0gICAgYXR0cmlidXRlIEV2ZW50TGlz dGVuZXIgb25lbmRlZDsKLSAgICBhdHRyaWJ1dGUgRXZlbnRMaXN0ZW5lciBvbmFkZHRyYWNrOwot ICAgIGF0dHJpYnV0ZSBFdmVudExpc3RlbmVyIG9ucmVtb3ZldHJhY2s7Ci0KICAgICByZWFkb25s eSBhdHRyaWJ1dGUgYm9vbGVhbiBhY3RpdmU7CiAKICAgICBhdHRyaWJ1dGUgRXZlbnRMaXN0ZW5l ciBvbmFjdGl2ZTsKICAgICBhdHRyaWJ1dGUgRXZlbnRMaXN0ZW5lciBvbmluYWN0aXZlOworICAg IGF0dHJpYnV0ZSBFdmVudExpc3RlbmVyIG9uYWRkdHJhY2s7CisgICAgYXR0cmlidXRlIEV2ZW50 TGlzdGVuZXIgb25yZW1vdmV0cmFjazsKIAogICAgIC8vIEV2ZW50VGFyZ2V0IGludGVyZmFjZQog ICAgIHZvaWQgYWRkRXZlbnRMaXN0ZW5lcihET01TdHJpbmcgdHlwZSwKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rp b24uY3BwCShyZXZpc2lvbiAxNjc3ODgpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUxLDcgKzY1 MSw3IEBAIHZvaWQgUlRDUGVlckNvbm5lY3Rpb246OmRpZFJlbW92ZVJlbW90ZVMKIAogICAgIC8v IEZJWE1FOiB0aGlzIGNsYXNzIHNob3VsZG4ndCBrbm93IHRoYXQgdGhlIHByaXZhdGUgc3RyZWFt IGNsaWVudCBpcyBhIE1lZGlhU3RyZWFtIQogICAgIFJlZlB0cjxNZWRpYVN0cmVhbT4gc3RyZWFt ID0gc3RhdGljX2Nhc3Q8TWVkaWFTdHJlYW0qPihwcml2YXRlU3RyZWFtLT5jbGllbnQoKSk7Ci0g ICAgc3RyZWFtLT5zZXRFbmRlZCgpOworICAgIHN0cmVhbS0+c2V0QWN0aXZlKGZhbHNlKTsKIAog ICAgIGlmIChtX3NpZ25hbGluZ1N0YXRlID09IFNpZ25hbGluZ1N0YXRlQ2xvc2VkKQogICAgICAg ICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbVByaXZhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUHJpdmF0ZS5jcHAJKHJldmlzaW9uIDE2Nzc4OCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUHJpdmF0ZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw3ICsxMjgsNiBAQCB2b2lkIE1lZGlhU3RyZWFtUHJp dmF0ZTo6cmVtb3ZlUmVtb3RlVHJhCiBNZWRpYVN0cmVhbVByaXZhdGU6Ok1lZGlhU3RyZWFtUHJp dmF0ZShjb25zdCBTdHJpbmcmIGlkLCBjb25zdCBWZWN0b3I8UmVmUHRyPE1lZGlhU3RyZWFtU291 cmNlPj4mIGF1ZGlvU291cmNlcywgY29uc3QgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVNvdXJj ZT4+JiB2aWRlb1NvdXJjZXMpCiAgICAgOiBtX2NsaWVudCgwKQogICAgICwgbV9pZChpZCkKLSAg ICAsIG1fZW5kZWQoZmFsc2UpCiAgICAgLCBtX2lzQWN0aXZlKGZhbHNlKQogewogICAgIEFTU0VS VChtX2lkLmxlbmd0aCgpKTsKQEAgLTE0MCwxMSArMTM5LDYgQEAgTWVkaWFTdHJlYW1Qcml2YXRl OjpNZWRpYVN0cmVhbVByaXZhdGUoYwogCiAgICAgdW5zaWduZWQgcHJvdmlkZWRTb3VyY2VzU2l6 ZSA9IGF1ZGlvU291cmNlcy5zaXplKCkgKyB2aWRlb1NvdXJjZXMuc2l6ZSgpOwogICAgIHVuc2ln bmVkIHRyYWNrc1NpemUgPSBtX2F1ZGlvUHJpdmF0ZVRyYWNrcy5zaXplKCkgKyBtX3ZpZGVvUHJp dmF0ZVRyYWNrcy5zaXplKCk7Ci0gICAgLy8gSWYgc291cmNlcyB3ZXJlIHByb3ZpZGVkIGFuZCBu byB0cmFjayB3YXMgYWRkZWQgdG8gdGhlIE1lZGlhU3RyZWFtUHJpdmF0ZSdzIHRyYWNrcywgdGhp cyBtZWFucwotICAgIC8vIHRoYXQgdGhlIHRyYWNrcyB3ZXJlIGFsbCBlbmRlZC4KLSAgICAvLyBE ZXByZWNhdGVkLiB0byBiZSByZW1vdmVkIGluIGJ1ZyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMyMTA0Ci0gICAgaWYgKHByb3ZpZGVkU291cmNlc1NpemUgPiAwICYm ICF0cmFja3NTaXplKQotICAgICAgICBtX2VuZGVkID0gdHJ1ZTsKIAogICAgIGlmIChwcm92aWRl ZFNvdXJjZXNTaXplID4gMCAmJiB0cmFja3NTaXplID4gMCkKICAgICAgICAgbV9pc0FjdGl2ZSA9 IHRydWU7CkBAIC0xNTMsNyArMTQ3LDYgQEAgTWVkaWFTdHJlYW1Qcml2YXRlOjpNZWRpYVN0cmVh bVByaXZhdGUoYwogTWVkaWFTdHJlYW1Qcml2YXRlOjpNZWRpYVN0cmVhbVByaXZhdGUoY29uc3Qg U3RyaW5nJiBpZCwgY29uc3QgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZT4+ JiBhdWRpb1ByaXZhdGVUcmFja3MsIGNvbnN0IFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1UcmFj a1ByaXZhdGU+PiYgdmlkZW9Qcml2YXRlVHJhY2tzKQogICAgIDogbV9jbGllbnQoMCkKICAgICAs IG1faWQoaWQpCi0gICAgLCBtX2VuZGVkKGZhbHNlKQogICAgICwgbV9pc0FjdGl2ZShmYWxzZSkK IHsKICAgICBBU1NFUlQobV9pZC5sZW5ndGgoKSk7CkBAIC0xNjUsMzIgKzE1OCwyMCBAQCBNZWRp YVN0cmVhbVByaXZhdGU6Ok1lZGlhU3RyZWFtUHJpdmF0ZShjCiAKICAgICB1bnNpZ25lZCBwcm92 aWRlZFRyYWNrc1NpemUgPSBhdWRpb1ByaXZhdGVUcmFja3Muc2l6ZSgpICsgdmlkZW9Qcml2YXRl VHJhY2tzLnNpemUoKTsKICAgICB1bnNpZ25lZCB0cmFja3NTaXplID0gbV9hdWRpb1ByaXZhdGVU cmFja3Muc2l6ZSgpICsgbV92aWRlb1ByaXZhdGVUcmFja3Muc2l6ZSgpOwotICAgIC8vIElmIHRy YWNrcyB3ZXJlIHByb3ZpZGVkIGFuZCBubyBvbmUgd2FzIGFkZGVkIHRvIHRoZSBNZWRpYVN0cmVh bVByaXZhdGUncyB0cmFja3MsIHRoaXMgbWVhbnMKLSAgICAvLyB0aGF0IHRoZSB0cmFja3Mgd2Vy ZSBhbGwgZW5kZWQKLSAgICAvLyBEZXByZWNhdGVkLiB0byBiZSByZW1vdmVkIGluIGJ1ZyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMTA0Ci0gICAgaWYgKHByb3Zp ZGVkVHJhY2tzU2l6ZSA+IDAgJiYgIXRyYWNrc1NpemUpCi0gICAgICAgIG1fZW5kZWQgPSB0cnVl OwogCiAgICAgaWYgKHByb3ZpZGVkVHJhY2tzU2l6ZSA+IDAgJiYgdHJhY2tzU2l6ZSA+IDApCiAg ICAgICAgIG1faXNBY3RpdmUgPSB0cnVlOwogfQogCi12b2lkIE1lZGlhU3RyZWFtUHJpdmF0ZTo6 c2V0RW5kZWQoKQotewotICAgIGlmIChtX2NsaWVudCkKLSAgICAgICAgbV9jbGllbnQtPnN0cmVh bURpZEVuZCgpOwotCi0gICAgbV9lbmRlZCA9IHRydWU7Ci19Ci0KIHZvaWQgTWVkaWFTdHJlYW1Q cml2YXRlOjpzZXRBY3RpdmUoYm9vbCBhY3RpdmUpCiB7Ci0gICAgaWYgKG1faXNBY3RpdmUgIT0g YWN0aXZlKSB7Ci0gICAgICAgIG1faXNBY3RpdmUgPSBhY3RpdmU7CisgICAgaWYgKG1faXNBY3Rp dmUgPT0gYWN0aXZlKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2lzQWN0aXZlID0gYWN0aXZl OwogCi0gICAgICAgIGlmIChtX2NsaWVudCkKLSAgICAgICAgICAgIG1fY2xpZW50LT5zZXRTdHJl YW1Jc0FjdGl2ZShhY3RpdmUpOwotICAgIH0KKyAgICBpZiAobV9jbGllbnQpCisgICAgICAgIG1f Y2xpZW50LT5zZXRTdHJlYW1Jc0FjdGl2ZShhY3RpdmUpOwogfQogCiB2b2lkIE1lZGlhU3RyZWFt UHJpdmF0ZTo6YWRkVHJhY2soUGFzc1JlZlB0cjxNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZT4gcHJw VHJhY2spCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbVByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVByaXZhdGUuaAkocmV2aXNpb24gMTY3Nzg4KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Qcml2YXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ5LDcgKzQ5LDYgQEAgY2xhc3MgTWVkaWFTdHJlYW1Qcml2YXRlQ2xpZW50 IDogcHVibGljCiBwdWJsaWM6CiAgICAgdmlydHVhbCB+TWVkaWFTdHJlYW1Qcml2YXRlQ2xpZW50 KCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkRW5kKCkgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBzZXRTdHJlYW1Jc0FjdGl2ZShib29sKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGFk ZFJlbW90ZVNvdXJjZShNZWRpYVN0cmVhbVNvdXJjZSopID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg cmVtb3ZlUmVtb3RlU291cmNlKE1lZGlhU3RyZWFtU291cmNlKikgPSAwOwpAQCAtODcsMTAgKzg2 LDYgQEAgcHVibGljOgogICAgIHZvaWQgYWRkUmVtb3RlU291cmNlKE1lZGlhU3RyZWFtU291cmNl Kik7CiAgICAgdm9pZCByZW1vdmVSZW1vdGVTb3VyY2UoTWVkaWFTdHJlYW1Tb3VyY2UqKTsKIAot ICAgIC8vIERlcHJlY2F0ZWQuIHRvIGJlIHJlbW92ZWQgaW4gYnVnIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIxMDQKLSAgICBib29sIGVuZGVkKCkgY29uc3QgeyBy ZXR1cm4gbV9lbmRlZDsgfQotICAgIHZvaWQgc2V0RW5kZWQoKTsKLQogICAgIGJvb2wgYWN0aXZl KCkgY29uc3QgeyByZXR1cm4gbV9pc0FjdGl2ZTsgfQogICAgIHZvaWQgc2V0QWN0aXZlKGJvb2wp OwogCkBAIC0xMTEsNyArMTA2LDYgQEAgcHJpdmF0ZToKIAogICAgIFZlY3RvcjxSZWZQdHI8TWVk aWFTdHJlYW1UcmFja1ByaXZhdGU+PiBtX2F1ZGlvUHJpdmF0ZVRyYWNrczsKICAgICBWZWN0b3I8 UmVmUHRyPE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlPj4gbV92aWRlb1ByaXZhdGVUcmFja3M7Ci0g ICAgYm9vbCBtX2VuZGVkOyAvLyBEZXByZWNhdGVkLiB0byBiZSByZW1vdmVkIGluIGJ1ZyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMTA0CiAgICAgYm9vbCBtX2lz QWN0aXZlOwogfTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY3Nzk3KQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDQtMjUgIFBy YXZlZW4gUiBKYWRoYXYgIDxwcmF2ZWVuLmpAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW01lZGlh U3RyZWFtXSAuZW5kZWQgc2hvdWxkbid0IGJlIHBhcnQgb2YgTWVkaWFTdHJlYW0gSURMCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIxMDQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAuZW5kZWQgaXMgbm90 IHBhcnQgb2YgTWVkaWFTdHJlYW0gSURMLiBVcGRhdGVkIHRlc3QgY2FzZS4KKworICAgICAgICAq IGZhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0tYWRkLXJlbW92ZS10cmFja3MtZXhwZWN0ZWQu dHh0OgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0tYWRkLXJlbW92ZS10 cmFja3MuaHRtbDoKKwogMjAxNC0wNC0yNSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0 Lm9yZz4KIAogICAgICAgICBJbXBsZW1lbnQgQXJyYXkucHJvdG90eXBlLmZpbmQoKQpJbmRleDog TGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS1hZGQtcmVtb3ZlLXRyYWNr cy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbS1hZGQtcmVtb3ZlLXRyYWNrcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE2 Nzc4OCkKKysrIExheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0tYWRkLXJl bW92ZS10cmFja3MtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw2IEBA IFBBU1Mgc3RyZWFtMS5nZXRWaWRlb1RyYWNrcygpLmxlbmd0aCBpcwogKioqIHJlbW92ZSBhbGwg dHJhY2tzLCBzdHJlYW0uZW5kZWQgc2hvdWxkIHJldHVybiB0cnVlCiBQQVNTIHN0cmVhbTIuZ2V0 QXVkaW9UcmFja3MoKS5sZW5ndGggaXMgMAogUEFTUyBzdHJlYW0yLmdldFZpZGVvVHJhY2tzKCku bGVuZ3RoIGlzIDAKLVBBU1Mgc3RyZWFtMi5lbmRlZCBpcyB0cnVlCiAKICoqKiBpdCBzaG91bGQg YmUgaW1wb3NzaWJsZSB0byBhZGQgYSB0cmFjayBhZnRlciB0aGUgc3RyZWFtIGhhcyBlbmRlZAog UEFTUyBzdHJlYW0yLmFkZFRyYWNrKGF1ZGlvVHJhY2spIHRocmV3IGV4Y2VwdGlvbiBFcnJvcjog SW52YWxpZFN0YXRlRXJyb3I6IERPTSBFeGNlcHRpb24gMTEuCkluZGV4OiBMYXlvdXRUZXN0cy9m YXN0L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLWFkZC1yZW1vdmUtdHJhY2tzLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS1hZGQtcmVt b3ZlLXRyYWNrcy5odG1sCShyZXZpc2lvbiAxNjc3ODgpCisrKyBMYXlvdXRUZXN0cy9mYXN0L21l ZGlhc3RyZWFtL01lZGlhU3RyZWFtLWFkZC1yZW1vdmUtdHJhY2tzLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTEyOSw3ICsxMjksNiBAQAogICAgICAgICAgICAgICAgIHRyeVJlbW92ZVRyYWNrKHN0 cmVhbTIsIHN0cmVhbTIuZ2V0VmlkZW9UcmFja3MoKVswXSk7CiAgICAgICAgICAgICAgICAgc2hv dWxkQmUoJ3N0cmVhbTIuZ2V0QXVkaW9UcmFja3MoKS5sZW5ndGgnLCAnMCcpOwogICAgICAgICAg ICAgICAgIHNob3VsZEJlKCdzdHJlYW0yLmdldFZpZGVvVHJhY2tzKCkubGVuZ3RoJywgJzAnKTsK LSAgICAgICAgICAgICAgICBzaG91bGRCZVRydWUoJ3N0cmVhbTIuZW5kZWQnKTsKIAogICAgICAg ICAgICAgICAgIGRlYnVnKCI8YnI+KioqIGl0IHNob3VsZCBiZSBpbXBvc3NpYmxlIHRvIGFkZCBh IHRyYWNrIGFmdGVyIHRoZSBzdHJlYW0gaGFzIGVuZGVkIik7CiAgICAgICAgICAgICAgICAgc2hv dWxkVGhyb3coJ3N0cmVhbTIuYWRkVHJhY2soYXVkaW9UcmFjayknLCAnIkVycm9yOiBJbnZhbGlk U3RhdGVFcnJvcjogRE9NIEV4Y2VwdGlvbiAxMSInKTsK