193554 2019-01-17 15:15:01 -0800 A track source should be unmuted whenever reenabled after setDirection changes 2019-01-18 09:19:33 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1495662 0 youennf 2019-01-17 15:15:01 -0800 A track source should be unmuted whenever reenabled after setDirection changes 1495664 1 webkit-bug-importer 2019-01-17 15:15:28 -0800 <rdar://problem/47366196> 1495687 2 359426 youennf 2019-01-17 16:53:49 -0800 Created attachment 359426 Patch 1495732 3 359426 eric.carlson 2019-01-17 21:15:58 -0800 Comment on attachment 359426 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359426&action=review > LayoutTests/webrtc/video-setDirection.html:100 > + assert_equals(stream, video.srcObject); Why does this fail? 1495872 4 youennf 2019-01-18 08:52:45 -0800 (In reply to Eric Carlson from comment #3) > Comment on attachment 359426 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=359426&action=review > > > LayoutTests/webrtc/video-setDirection.html:100 > > + assert_equals(stream, video.srcObject); > > Why does this fail? Libwebrtc tell us that the media stream is gone (through OnRemoveStream) so we remove it and recreate it later on. We should probably keep a weak of the MediaStream instead. If still there, we could then reuse it. Otherwise, recreating a new one would be unobservable. 1495884 5 359426 commit-queue 2019-01-18 09:19:31 -0800 Comment on attachment 359426 Patch Clearing flags on attachment: 359426 Committed r240152: <https://trac.webkit.org/changeset/240152> 1495885 6 commit-queue 2019-01-18 09:19:33 -0800 All reviewed patches have been landed. Closing bug. 359426 2019-01-17 16:53:49 -0800 2019-01-18 09:19:31 -0800 Patch bug-193554-20190117165348.patch text/plain 11050 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU4YTg2MmY2YjJlNzdh YzEwZGFjOTNjYTM3MTM1MWYzZTAwNmJjYS4uNjFkNGE4MWVhNDJjNDMwNmIzMzU3NmJhZDg4ZjBj MzkzMGZjZjcwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAxLTE3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBIHRyYWNrIHNvdXJjZSBz aG91bGQgYmUgdW5tdXRlZCB3aGVuZXZlciByZWVuYWJsZWQgYWZ0ZXIgc2V0RGlyZWN0aW9uIGNo YW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MzU1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDczNjYxOTY+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgdHJhY2sgZ2V0cyB1 bm11dGVkIGFmdGVyIGJlaW5nIGZpcmVkIGFzIHBhcnQgb2YgdHJhY2sgZXZlbnQuCisgICAgICAg IFRlc3QgaXMgdHJpZ2dlcmluZyBzb21lIGV4aXN0aW5nIGlzc3VlcyB3aXRoIE1lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy4KKyAgICAgICAgR2l2ZW4gdGhlIGVucXVldWluZyBv ZiBzYW1wbGVzIGhhcHBlbnMgaW4gYSBkaWZmZXJlbnQgZnJhbWUgdGhhbiB0aGUgdGhyZWFkIHVz ZWQgdG8gdXBkYXRlIG1lZGlhIHN0cmVhbSBhbmQgdGhlIGFjdGl2ZSB2aWRlbyB0cmFjaywKKyAg ICAgICAgc29tZSBlbnF1ZXVlZCBzYW1wbGVzIG1pZ2h0IG5vdCBiZSBmcm9tIHRoZSByaWdodCBh Y3RpdmUgdmlkZW8gdHJhY2sgb3IgdGhlcmUgbWlnaHQgYmUgbm8gYWN0aXZlIHZpZGVvIHRyYWNr LgorCisgICAgICAgIFRlc3Q6IHdlYnJ0Yy92aWRlby1zZXREaXJlY3Rpb24uaHRtbAorCisgICAg ICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2lu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpmaXJlVHJh Y2tFdmVudCk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2Vi UlRDTWVkaWFFbmRwb2ludC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5xdWV1 ZVZpZGVvU2FtcGxlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6cmVxdWVzdE5vdGlmaWNhdGlvbldoZW5SZWFkeUZvclZpZGVvRGF0YSk6 CisKIDIwMTktMDEtMTcgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIFtF TUVdIFJlbW92ZSBBbWF6b24gUHJpbWUgVmlkZW8gZnJvbSBxdWlya3MgbGlzdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD TWVkaWFFbmRwb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xp YndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAppbmRleCBhZDgyMDk1N2MxYTZhMzU2 ZTU0M2Q3Zjc2YjRjM2FjNTI3NzJkZDJkLi40Yzc2YWMzNGFlZWZlOGFkMjFkNTcyZTA1NTgzMzFi NTUwNTE2ZWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNw cApAQCAtNDA3LDIxICs0MDcsMjQgQEAgdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjphZGRS ZW1vdGVUcmFjayhydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpSdHBSZWNlaXYKICAgICBmaXJl VHJhY2tFdmVudChyZWNlaXZlci5yZWxlYXNlTm9uTnVsbCgpLCB0cmFjaywgcnRjU3RyZWFtcywg bnVsbHB0cik7CiB9CiAKLXZvaWQgTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6ZmlyZVRyYWNrRXZl bnQoUmVmPFJUQ1J0cFJlY2VpdmVyPiYmIHJlY2VpdmVyLCBSZWY8TWVkaWFTdHJlYW1UcmFjaz4m JiB0cmFjaywgY29uc3Qgc3RkOjp2ZWN0b3I8cnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6TWVk aWFTdHJlYW1JbnRlcmZhY2U+PiYgcnRjU3RyZWFtcywgUmVmUHRyPFJUQ1J0cFRyYW5zY2VpdmVy PiYmIHRyYW5zY2VpdmVyKQordm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpmaXJlVHJhY2tF dmVudChSZWY8UlRDUnRwUmVjZWl2ZXI+JiYgcmVjZWl2ZXIsIE1lZGlhU3RyZWFtVHJhY2smIHRy YWNrLCBjb25zdCBzdGQ6OnZlY3RvcjxydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpNZWRpYVN0 cmVhbUludGVyZmFjZT4+JiBydGNTdHJlYW1zLCBSZWZQdHI8UlRDUnRwVHJhbnNjZWl2ZXI+JiYg dHJhbnNjZWl2ZXIpCiB7CiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbT4+IHN0cmVhbXM7 CiAgICAgZm9yIChhdXRvJiBydGNTdHJlYW0gOiBydGNTdHJlYW1zKSB7CiAgICAgICAgIGF1dG8m IG1lZGlhU3RyZWFtID0gbWVkaWFTdHJlYW1Gcm9tUlRDU3RyZWFtKCpydGNTdHJlYW0uZ2V0KCkp OwogICAgICAgICBzdHJlYW1zLmFwcGVuZCgmbWVkaWFTdHJlYW0pOwotICAgICAgICBtZWRpYVN0 cmVhbS5hZGRUcmFja0Zyb21QbGF0Zm9ybSh0cmFjay5nZXQoKSk7CisgICAgICAgIG1lZGlhU3Ry ZWFtLmFkZFRyYWNrRnJvbVBsYXRmb3JtKHRyYWNrKTsKICAgICB9CiAgICAgYXV0byBzdHJlYW1J ZHMgPSBXVEY6Om1hcChzdHJlYW1zLCBbXShhdXRvJiBzdHJlYW0pIC0+IFN0cmluZyB7CiAgICAg ICAgIHJldHVybiBzdHJlYW0tPmlkKCk7CiAgICAgfSk7Ci0gICAgbV9yZW1vdGVTdHJlYW1zRnJv bVJlbW90ZVRyYWNrLmFkZCh0cmFjay5wdHIoKSwgV1RGTW92ZShzdHJlYW1JZHMpKTsKKyAgICBt X3JlbW90ZVN0cmVhbXNGcm9tUmVtb3RlVHJhY2suYWRkKCZ0cmFjaywgV1RGTW92ZShzdHJlYW1J ZHMpKTsKIAogICAgIG1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLmNvbm5lY3Rpb24oKS5maXJlRXZl bnQoUlRDVHJhY2tFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS50cmFja0V2ZW50LAotICAgICAg ICBFdmVudDo6Q2FuQnViYmxlOjpObywgRXZlbnQ6OklzQ2FuY2VsYWJsZTo6Tm8sIFdURk1vdmUo cmVjZWl2ZXIpLCBXVEZNb3ZlKHRyYWNrKSwgV1RGTW92ZShzdHJlYW1zKSwgV1RGTW92ZSh0cmFu c2NlaXZlcikpKTsKKyAgICAgICAgRXZlbnQ6OkNhbkJ1YmJsZTo6Tm8sIEV2ZW50OjpJc0NhbmNl bGFibGU6Ok5vLCBXVEZNb3ZlKHJlY2VpdmVyKSwgJnRyYWNrLCBXVEZNb3ZlKHN0cmVhbXMpLCBX VEZNb3ZlKHRyYW5zY2VpdmVyKSkpOworCisgICAgLy8gRklYTUU6IEFzIHBlciBzcGVjLCB3ZSBz aG91bGQgc2V0IG11dGVkIHRvICdmYWxzZScgd2hlbiBzdGFydGluZyB0byByZWNlaXZlIHRoZSBj b250ZW50IGZyb20gbmV0d29yay4KKyAgICB0cmFjay5zb3VyY2UoKS5zZXRNdXRlZChmYWxzZSk7 CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRFeGlzdGluZ1JlY2VpdmVyU291cmNlVHJhY2so UmVhbHRpbWVNZWRpYVNvdXJjZSYgZXhpc3RpbmdTb3VyY2UsIHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJ bnRlcmZhY2UmIHJ0Y1JlY2VpdmVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRw b2ludC5oCmluZGV4IDE5ZTg1NmMwODg3NzI1ZjdhMmZjMGRjOGYwMzE4Yjg4MTRlZWNhMTMuLjQ3 YTFjOTI5Y2E0NjVkZDg1ZWY1MWM2Yzk1NzNjNGUxNDUzZDhhNzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5k cG9pbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKQEAgLTE0Myw3ICsxNDMsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgbmV3VHJhbnNjZWl2ZXIocnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwVHJh bnNjZWl2ZXJJbnRlcmZhY2U+JiYpOwogICAgIHZvaWQgcmVtb3ZlUmVtb3RlVHJhY2socnRjOjpz Y29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJbnRlcmZhY2U+JiYpOwogCi0gICAgdm9p ZCBmaXJlVHJhY2tFdmVudChSZWY8UlRDUnRwUmVjZWl2ZXI+JiYsIFJlZjxNZWRpYVN0cmVhbVRy YWNrPiYmLCBjb25zdCBzdGQ6OnZlY3RvcjxydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpNZWRp YVN0cmVhbUludGVyZmFjZT4+JiwgUmVmUHRyPFJUQ1J0cFRyYW5zY2VpdmVyPiYmKTsKKyAgICB2 b2lkIGZpcmVUcmFja0V2ZW50KFJlZjxSVENSdHBSZWNlaXZlcj4mJiwgTWVkaWFTdHJlYW1UcmFj ayYsIGNvbnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJydGM6Ok1lZGlhU3Ry ZWFtSW50ZXJmYWNlPj4mLCBSZWZQdHI8UlRDUnRwVHJhbnNjZWl2ZXI+JiYpOwogCiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgVD4KICAgICBPcHRpb25hbDxCYWNrZW5kcz4gY3JlYXRlVHJhbnNjZWl2 ZXJCYWNrZW5kcyhUJiYsIGNvbnN0IFJUQ1J0cFRyYW5zY2VpdmVySW5pdCYsIExpYldlYlJUQ1J0 cFNlbmRlckJhY2tlbmQ6OlNvdXJjZSYmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQppbmRl eCAyMzhhMmVhMzk1OGMzMWI2NmJmZDQ4NjdkZGFhZDhhNTg1ZDlhNTM5Li45MzViMWJmYzIzNmU5 NWFmNmQwNjFiYWZmYjQ5Y2YyYzRlN2E1NDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1t CkBAIC0zNTksOCArMzU5LDYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFW Rk9iakM6OmVucXVldWVDb3JyZWN0ZWRWaWRlb1NhbXBsZShNZWRpYVNhbXAKIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmVucXVldWVWaWRlb1NhbXBsZShNZWRp YVN0cmVhbVRyYWNrUHJpdmF0ZSYgdHJhY2ssIE1lZGlhU2FtcGxlJiBzYW1wbGUpCiB7Ci0gICAg QVNTRVJUKG1fdmlkZW9UcmFja01hcC5jb250YWlucyh0cmFjay5pZCgpKSk7Ci0KICAgICBpZiAo JnRyYWNrICE9IG1fbWVkaWFTdHJlYW1Qcml2YXRlLT5hY3RpdmVWaWRlb1RyYWNrKCkpCiAgICAg ICAgIHJldHVybjsKIApAQCAtNDE0LDYgKzQxMiwxMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cmVxdWVzdE5vdGlmaWNhdGlvbldoZW5SZWFkeUZvclZpZGVv RAogCiAgICAgICAgIFttX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciBzdG9wUmVxdWVzdGluZ01l ZGlhRGF0YV07CiAKKyAgICAgICAgaWYgKCFtX2FjdGl2ZVZpZGVvVHJhY2spIHsKKyAgICAgICAg ICAgIG1fcGVuZGluZ1ZpZGVvU2FtcGxlUXVldWUuY2xlYXIoKTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorCiAgICAgICAgIHdoaWxlICghbV9wZW5kaW5nVmlkZW9TYW1wbGVRdWV1 ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGlmICghW21fc2FtcGxlQnVmZmVyRGlzcGxheUxh eWVyIGlzUmVhZHlGb3JNb3JlTWVkaWFEYXRhXSkgewogICAgICAgICAgICAgICAgIHJlcXVlc3RO b3RpZmljYXRpb25XaGVuUmVhZHlGb3JWaWRlb0RhdGEoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0MjI5ZTZjMTcyNDll ZDQ4YzMzZGI1YzBjNWI2OGM4OWM4ODZkNWIwLi4zNDg3MDY1MjI3YWFiYzZjN2NjZTFkNjU3YmU5 ZjdiMDNmZTYwZGQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDEtMTcgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEEgdHJhY2sgc291cmNlIHNob3Vs ZCBiZSB1bm11dGVkIHdoZW5ldmVyIHJlZW5hYmxlZCBhZnRlciBzZXREaXJlY3Rpb24gY2hhbmdl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNTU0 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzM2NjE5Nj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYnJ0Yy92aWRlby1zZXREaXJlY3Rpb24t ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWJydGMvdmlkZW8tc2V0RGlyZWN0aW9u Lmh0bWw6IEFkZGVkLgorCiAyMDE5LTAxLTE3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KIAogICAgICAgICBBZGQgYSBuZXcgU1BJIHRvIHJlcXVlc3QgZm9yIGNhY2hlIHN0b3Jh Z2UgcXVvdGEgaW5jcmVhc2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1z ZXREaXJlY3Rpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXNldERp cmVjdGlvbi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDU3MWI4NDA4Yjc2NTY4Y2FhZWU0Mzc2 NDM4MzIyOGE1NjIyMWNhOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92 aWRlby1zZXREaXJlY3Rpb24tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAorCisKK1BBU1Mg R29pbmcgZnJvbSBzZW5kcmVjdiB0byBpbmFjdGl2ZSBhbmQgYmFjayB0byBzZW5kcmVjdiAKK0ZB SUwgVGhlIE1lZGlhU3RyZWFtIHNob3VsZCByZW1haW4gdGhlIHNhbWUgYXNzZXJ0X2VxdWFsczog ZXhwZWN0ZWQgb2JqZWN0ICJbb2JqZWN0IE1lZGlhU3RyZWFtXSIgYnV0IGdvdCBvYmplY3QgIltv YmplY3QgTWVkaWFTdHJlYW1dIgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlk ZW8tc2V0RGlyZWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tc2V0RGlyZWN0 aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uZjIxYzFjM2M3NzRhZTY3NGFmNGVlODA1NTQ2OTNmN2ZjNzJm YTNkNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1zZXREaXJl Y3Rpb24uaHRtbApAQCAtMCwwICsxLDEwOCBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRtbD4KKyAg ICA8aGVhZD4KKyAgICAgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgorICAgICAgICA8dGl0bGU+ VGVzdGluZyB2aWRlbyBleGNoYW5nZSB1c2luZyBzZXREaXJlY3Rpb24gd2l0aCByZW5lZ290aWF0 aW9uIGZyb20gb2ZmZXJlciB0byByZWNlaXZlcjwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQgc3Jj PSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0 IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICA8 L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8iIGF1dG9wbGF5PSIi PjwvdmlkZW8+CisgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhcyIgd2lkdGg9IjY0MCIgaGVpZ2h0 PSI0ODAiPjwvY2FudmFzPgorICAgICAgICA8c2NyaXB0IHNyYyA9InJvdXRpbmVzLmpzIj48L3Nj cmlwdD4KKyAgICAgICAgPHNjcmlwdD4KK3ZpZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InZpZGVvIik7CitjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FudmFzIik7CisK K2Z1bmN0aW9uIGdyYWJGcmFtZURhdGEoeCwgeSwgdywgaCkKK3sKKyAgICBjYW52YXMud2lkdGgg PSB2aWRlby52aWRlb1dpZHRoOworICAgIGNhbnZhcy5oZWlnaHQgPSB2aWRlby52aWRlb0hlaWdo dDsKKworICAgIGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmRyYXdJbWFnZSh2aWRlbywgeCwgeSwg dywgaCwgeCwgeSwgdywgaCk7CisgICAgcmV0dXJuIGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmdl dEltYWdlRGF0YSh4LCB5LCB3LCBoKS5kYXRhOworfQorCitmdW5jdGlvbiB0ZXN0SW1hZ2UoKQor eworICAgIGNvbnN0IGRhdGEgPSBncmFiRnJhbWVEYXRhKDEwLCAzMjUsIDI1MCwgMSk7CisKKyAg ICB2YXIgaW5kZXggPSAyMDsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4XSA8IDEwMCk7Cisg ICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleCArIDFdIDwgMTAwKTsKKyAgICBhc3NlcnRfdHJ1ZShk YXRhW2luZGV4ICsgMl0gPCAxMDApOworCisgICAgaW5kZXggPSA4MDsKKyAgICBhc3NlcnRfdHJ1 ZShkYXRhW2luZGV4XSA+IDIwMCk7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleCArIDFdID4g MjAwKTsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMl0gPiAyMDApOworCisgICAgaW5k ZXggKz0gODA7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleF0gPiAyMDApOworICAgIGFzc2Vy dF90cnVlKGRhdGFbaW5kZXggKyAxXSA+IDIwMCk7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRl eCArIDJdIDwgMTAwKTsKK30KKwordmFyIHBjMSwgcGMyOworYXN5bmMgZnVuY3Rpb24gcmVuZWdv dGlhdGUoKQoreworICAgIGxldCBkID0gYXdhaXQgcGMxLmNyZWF0ZU9mZmVyKCk7CisgICAgYXdh aXQgcGMxLnNldExvY2FsRGVzY3JpcHRpb24oZCk7CisgICAgYXdhaXQgcGMyLnNldFJlbW90ZURl c2NyaXB0aW9uKGQpOworICAgIGQgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2VyKCk7CisgICAgYXdh aXQgcGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKGQpOworICAgIGF3YWl0IHBjMi5zZXRMb2NhbERl c2NyaXB0aW9uKGQpOworfQorCitwcm9taXNlX3Rlc3QoYXN5bmMgKHQpID0+IHsKKyAgICBpZiAo d2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVybWlz c2lvbih0cnVlKTsKKworICAgIGNvbnN0IGxvY2FsU3RyZWFtID0gYXdhaXQgbmF2aWdhdG9yLm1l ZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoe3ZpZGVvOiB0cnVlfSk7CisgICAgY29uc3Qgc3RyZWFt ID0gYXdhaXQgbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4geworICAgICAgICBjcmVh dGVDb25uZWN0aW9ucygoZmlyc3RDb25uZWN0aW9uKSA9PiB7CisgICAgICAgICAgICBwYzEgPSBm aXJzdENvbm5lY3Rpb247CisgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJhY2sobG9j YWxTdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXSwgbG9jYWxTdHJlYW0pOworICAgICAgICB9LCAo c2Vjb25kQ29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgcGMyID0gc2Vjb25kQ29ubmVjdGlv bjsKKyAgICAgICAgICAgIHNlY29uZENvbm5lY3Rpb24ub250cmFjayA9ICh0cmFja0V2ZW50KSA9 PiB7IHJlc29sdmUodHJhY2tFdmVudC5zdHJlYW1zWzBdKTsgfTsKKyAgICAgICAgfSk7CisgICAg ICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJUZXN0IHRpbWVkIG91dCIpLCA1MDAwKTsKKyAg ICB9KTsKKworICAgIHZpZGVvLnNyY09iamVjdCA9IHN0cmVhbTsKKyAgICBhd2FpdCB2aWRlby5w bGF5KCk7CisKKyAgICB0ZXN0SW1hZ2UoKTsKKworICAgIGxldCBwcm9taXNlID0gbmV3IFByb21p c2UoKHJlc29sdmUpID0+IHsKKyAgICAgICAgcGMyLmdldFJlY2VpdmVycygpWzBdLnRyYWNrLm9u bXV0ZSA9IHJlc29sdmU7CisgICAgfSk7CisKKyAgICBwYzEuZ2V0VHJhbnNjZWl2ZXJzKClbMF0u ZGlyZWN0aW9uID0gImluYWN0aXZlIjsKKyAgICBhd2FpdCByZW5lZ290aWF0ZSgpOworICAgIGF3 YWl0IHByb21pc2U7CisKKyAgICBwcm9taXNlID0gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHsK KyAgICAgICAgcGMyLmdldFJlY2VpdmVycygpWzBdLnRyYWNrLm9udW5tdXRlID0gcmVzb2x2ZTsK KyAgICB9KTsKKworICAgIHBjMS5nZXRUcmFuc2NlaXZlcnMoKVswXS5kaXJlY3Rpb24gPSAic2Vu ZHJlY3YiOworICAgIGNvbnN0IHN0cmVhbVByb21pc2UgPSBuZXcgUHJvbWlzZShyZXNvbHZlID0+ IHsKKyAgICAgICAgcGMyLm9udHJhY2sgPSAodHJhY2tFdmVudCkgPT4geyByZXNvbHZlICh0cmFj a0V2ZW50LnN0cmVhbXNbMF0pOyB9OworICAgIH0pOworCisgICAgYXdhaXQgcmVuZWdvdGlhdGUo KTsKKyAgICB2aWRlby5zcmNPYmplY3QgPSBhd2FpdCBzdHJlYW1Qcm9taXNlOworICAgIGF3YWl0 IHByb21pc2U7CisKKyAgICB0ZXN0KCgpID0+IHsKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhzdHJl YW0sIHZpZGVvLnNyY09iamVjdCk7CisgICAgfSwgIlRoZSBNZWRpYVN0cmVhbSBzaG91bGQgcmVt YWluIHRoZSBzYW1lIik7CisgICAgYXdhaXQgdmlkZW8ucGxheSgpOworCisgICAgdGVzdEltYWdl KCk7Cit9LCAiR29pbmcgZnJvbSBzZW5kcmVjdiB0byBpbmFjdGl2ZSBhbmQgYmFjayB0byBzZW5k cmVjdiIpOworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==