175434 2017-08-10 11:15:12 -0700 WebRTC MediaStream created without tracks does not update active state after tracks are added 2017-08-28 15:38:18 -0700 1 1 1 Unclassified WebKit WebRTC Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 brian youennf commit-queue eric.carlson gp jonlee youennf oldest_to_newest 1337504 0 317827 brian 2017-08-10 11:15:12 -0700 Created attachment 317827 javascript test to illustrate the bug Summary: When a new MediaStream is created manually, its "active" field is set to false (which is correct). However, after adding an active track to the stream, its "active" field is not updated, and remains false. It should update to reflect the state of its tracks. Steps to Reproduce: 1) Create a MediaStream with a video track via getUserMedia ("ms1") 2) Create a new MediaStream manually (via something like "var ms2 = new MediaStream()" 3) Do: ms2.addTrack(ms1.getVideoTracks()[0]); Expected Results: ms2 should be active ("active: true") Observed Results: ms2 isn't active ("active: false") Version: Release 35 (Safari 11.0, WebKit 12604.1.29) Notes: Attached a simple example html file that reproduces the issue Configuration: This is running on a macbook, running Sierra 10.12.5 (16F73) 1337520 1 youennf 2017-08-10 11:42:04 -0700 rdar://problem/33358476 1337521 2 youennf 2017-08-10 11:42:58 -0700 Thanks for filing this bug. So you only rely on the active attribute, not on any event that would be sent if the active attribute value is changing, right? 1337522 3 brian 2017-08-10 11:44:45 -0700 i don't think we rely on any event, what i was running into was tests on the 'active' member failing, so that would at least let me get past where i was stuck. 1342852 4 brian 2017-08-28 10:26:25 -0700 hey youenn, any idea when this will be fixed in tech preview? 1342928 5 319204 youennf 2017-08-28 13:52:32 -0700 Created attachment 319204 Patch 1342950 6 319204 eric.carlson 2017-08-28 14:50:17 -0700 Comment on attachment 319204 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319204&action=review > LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-clone-track-expected.txt:2 > +FAIL check clone track after captureStream() cloned_track.requestFrame is not a function. (In 'cloned_track.requestFrame()', 'cloned_track.requestFrame' is undefined) This seems wrong. 1342961 7 youennf 2017-08-28 15:08:49 -0700 (In reply to Eric Carlson from comment #6) > Comment on attachment 319204 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=319204&action=review > > > LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-clone-track-expected.txt:2 > > +FAIL check clone track after captureStream() cloned_track.requestFrame is not a function. (In 'cloned_track.requestFrame()', 'cloned_track.requestFrame' is undefined) > > This seems wrong. I filed https://bugs.webkit.org/show_bug.cgi?id=176036 1342967 8 319204 commit-queue 2017-08-28 15:38:17 -0700 Comment on attachment 319204 Patch Clearing flags on attachment: 319204 Committed r221277: <http://trac.webkit.org/changeset/221277> 1342968 9 commit-queue 2017-08-28 15:38:18 -0700 All reviewed patches have been landed. Closing bug. 317827 2017-08-10 11:15:12 -0700 2017-08-10 11:15:12 -0700 javascript test to illustrate the bug safari_test.html text/html 1269 brian PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPG1ldGEgY2hhcnNldD0iVVRGLTgi PgogICAgPHRpdGxlPkhlbGxvIFdvcmxkITwvdGl0bGU+CiAgPC9oZWFkPgogIDxib2R5PgogICAg PGgxPkhlbGxvIFdvcmxkITwvaDE+CgogICAgPGRpdiBpZD0ibG9jYWxWaWRlbyI+CiAgICAgIDx2 aWRlbyBhdXRvcGxheSBtdXRlZD48L3ZpZGVvPgogICAgPC9kaXY+CiAgICA8ZGl2IGlkPSJyZW1v dGVWaWRlbyI+CiAgICAgIDx2aWRlbyBhdXRvcGxheSBtdXRlZD48L3ZpZGVvPgogICAgPC9kaXY+ CgogICAgPHNjcmlwdD4KICAgICAgdmFyIGxvY2FsTWVkaWFTdHJlYW0sCiAgICAgICAgICBsb2Nh bFZpZGVvVHJhY2ssCiAgICAgICAgICBsb2NhbFBlZXJDb25uZWN0aW9uLAogICAgICAgICAgcmVt b3RlUGVlckNvbm5lY3Rpb247CiAgICAgIHZhciBsb2NhbFZpZGVvRWwgPSBkb2N1bWVudC5xdWVy eVNlbGVjdG9yKCdkaXYjbG9jYWxWaWRlbyB2aWRlbycpOwogICAgICB2YXIgcmVtb3RlVmlkZW9F bCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ2RpdiNyZW1vdGVWaWRlbyB2aWRlbycpOwogICAg ICBmdW5jdGlvbiBnZXRNZWRpYSgpIHsKICAgICAgICBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdl dFVzZXJNZWRpYSh7dmlkZW86IHRydWV9KQogICAgICAgICAgICAudGhlbihnb3RNZWRpYSkKICAg ICAgICAgICAgLmNhdGNoKGVycm9yID0+IHsKICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKCJl cnJvciBnZXR0aW5nIG1lZGlhIHN0cmVhbTogIiwgZXJyb3IpOwogICAgICAgICAgICB9KTsKICAg ICAgfQoKICAgICAgZnVuY3Rpb24gZ290TWVkaWEoc3RyZWFtKSB7CiAgICAgICAgY29uc29sZS5s b2coImdvdCBtZWRpYSBzdHJlYW0gdmlhIGdVTSwgaXMgaXQgYWN0aXZlPyAiLCBzdHJlYW0uYWN0 aXZlKTsKICAgICAgICB2YXIgbmV3TXMgPSBuZXcgTWVkaWFTdHJlYW0oKTsKICAgICAgICBuZXdN cy5hZGRUcmFjayhzdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXSk7CiAgICAgICAgY29uc29sZS5s b2coIkV4cGVjdCBuZXdNcyB0byBiZSBhY3RpdmUsIGlzIGl0PyAiLCBuZXdNcy5hY3RpdmUpOwog ICAgICAgIGNvbnNvbGUubG9nKCJuZXdNczogIiwgbmV3TXMpOwogICAgICAgIGNvbnNvbGUubG9n KCJuZXdNcyB1bmRlcmx5aW5nIHZpZGVvIHRyYWNrOiAiLCBuZXdNcy5nZXRWaWRlb1RyYWNrcygp WzBdKTsKICAgICAgfQoKICAgICAgZ2V0TWVkaWEoKTsKICAgICAgCiAgICA8L3NjcmlwdD4KICA8 L2JvZHk+CjwvaHRtbD4K 319204 2017-08-28 13:52:32 -0700 2017-08-28 15:38:17 -0700 Patch bug-175434-20170828135231.patch text/plain 13066 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTBhYmYxNGQ4MjQ4MThk ZDhhYmJhNGQxZWNkZWMxZjBiM2JiY2M3NC4uZmRlMGYwNDlhZDFkOTc3OGJhODk0ZGQwNWFjMTQx MDM0OTk3YWNlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTA4LTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWJSVEMgTWVkaWFTdHJl YW0gY3JlYXRlZCB3aXRob3V0IHRyYWNrcyBkb2VzIG5vdCB1cGRhdGUgYWN0aXZlIHN0YXRlIGFm dGVyIHRyYWNrcyBhcmUgYWRkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3NTQzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0LgorCisgICAgICAgIFJlbW92aW5n IGFjdGl2ZS9pbmFjdGl2ZSBldmVudHMuCisgICAgICAgIGFjdGl2ZSBhdHRyaWJ1dGUgaXMgc3Rp bGwga2VwdCBhbmQgaXMgdXBkYXRlZCBzeW5jaHJvbm91c2x5IG9uIGV2ZXJ5IHRyYWNrIGNoYW5n ZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06Ok1lZGlhU3RyZWFtKToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhU3RyZWFtOjphY3RpdmVTdGF0dXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhU3RyZWFtOjppbnRlcm5hbEFkZFRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh U3RyZWFtOjp1cGRhdGVBY3RpdmVTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVh bTo6aGFzUGVuZGluZ0FjdGl2aXR5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3Ry ZWFtOjpzY2hlZHVsZUFjdGl2ZVN0YXRlQ2hhbmdlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhU3RyZWFtOjphY3Rpdml0eUV2ZW50VGltZXJGaXJlZCk6IERlbGV0ZWQuCisgICAg ICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oOgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaWRsOgorCisyMDE3LTA4LTI4ICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBbQ2FjaGUgQVBJXSBTdXBwb3J0IGNh Y2hlIG5hbWVzIHBlcnNpc3RlbmN5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzU5OTUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcAppbmRleCA5NTIxZTJiZDgxODBjMzY1OThlOGU5NTQ5 MzNjYTdhNzI5YjIzMGRjLi43NDNlY2RiNTk1MGU3MzlhMDc1ZGVhMjUzOGQ3MjU0MWZiMGUxMDhi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtLmNwcApAQCAtNzcsNyArNzcsNiBAQCBzdGF0aWMgaW5saW5lIE1lZGlhU3RyZWFtVHJhY2tQ cml2YXRlVmVjdG9yIGNyZWF0ZVRyYWNrUHJpdmF0ZVZlY3Rvcihjb25zdCBNZWRpYQogTWVkaWFT dHJlYW06Ok1lZGlhU3RyZWFtKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIGNvbnN0 IE1lZGlhU3RyZWFtVHJhY2tWZWN0b3ImIHRyYWNrcykKICAgICA6IEFjdGl2ZURPTU9iamVjdCgm Y29udGV4dCkKICAgICAsIG1fcHJpdmF0ZShNZWRpYVN0cmVhbVByaXZhdGU6OmNyZWF0ZShjcmVh dGVUcmFja1ByaXZhdGVWZWN0b3IodHJhY2tzKSkpCi0gICAgLCBtX2FjdGl2aXR5RXZlbnRUaW1l cigqdGhpcywgJk1lZGlhU3RyZWFtOjphY3Rpdml0eUV2ZW50VGltZXJGaXJlZCkKICAgICAsIG1f bWVkaWFTZXNzaW9uKFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpjcmVhdGUoKnRoaXMpKQogewogICAg IC8vIFRoaXMgY29uc3RydWN0b3IgcHJlc2VydmVzIE1lZGlhU3RyZWFtVHJhY2sgaW5zdGFuY2Vz IGFuZCBtdXN0IGJlIHVzZWQgYnkgY2FsbHMgb3JpZ2luYXRpbmcKQEAgLTk3LDcgKzk2LDYgQEAg TWVkaWFTdHJlYW06Ok1lZGlhU3RyZWFtKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQs IGNvbnN0IE1lZGlhU3RyZWFtVHJhY2sKIE1lZGlhU3RyZWFtOjpNZWRpYVN0cmVhbShTY3JpcHRF eGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBSZWY8TWVkaWFTdHJlYW1Qcml2YXRlPiYmIHN0cmVh bVByaXZhdGUpCiAgICAgOiBBY3RpdmVET01PYmplY3QoJmNvbnRleHQpCiAgICAgLCBtX3ByaXZh dGUoV1RGTW92ZShzdHJlYW1Qcml2YXRlKSkKLSAgICAsIG1fYWN0aXZpdHlFdmVudFRpbWVyKCp0 aGlzLCAmTWVkaWFTdHJlYW06OmFjdGl2aXR5RXZlbnRUaW1lckZpcmVkKQogICAgICwgbV9tZWRp YVNlc3Npb24oUGxhdGZvcm1NZWRpYVNlc3Npb246OmNyZWF0ZSgqdGhpcykpCiB7CiAgICAgc2V0 SXNBY3RpdmUobV9wcml2YXRlLT5hY3RpdmUoKSk7CkBAIC0xOTMsOSArMTkxLDcgQEAgdm9pZCBN ZWRpYVN0cmVhbTo6dHJhY2tEaWRFbmQoKQogCiB2b2lkIE1lZGlhU3RyZWFtOjphY3RpdmVTdGF0 dXNDaGFuZ2VkKCkKIHsKLSAgICAvLyBTY2hlZHVsZSB0aGUgYWN0aXZlIHN0YXRlIGNoYW5nZSBh bmQgZXZlbnQgZGlzcGF0Y2ggc2luY2UgdGhpcyBjYWxsYmFjayBtYXkgYmUgY2FsbGVkCi0gICAg Ly8gc3luY2hyb25vdXNseSBmcm9tIHRoZSBET00gQVBJIChlLmcuIGFzIGEgcmVzdWx0IG9mIGFk ZFRyYWNrKCkpLgotICAgIHNjaGVkdWxlQWN0aXZlU3RhdGVDaGFuZ2UoKTsKKyAgICB1cGRhdGVB Y3RpdmVTdGF0ZSgpOwogfQogCiB2b2lkIE1lZGlhU3RyZWFtOjpkaWRBZGRUcmFjayhNZWRpYVN0 cmVhbVRyYWNrUHJpdmF0ZSYgdHJhY2tQcml2YXRlKQpAQCAtMjMwLDYgKzIyNiw4IEBAIGJvb2wg TWVkaWFTdHJlYW06OmludGVybmFsQWRkVHJhY2soUmVmPE1lZGlhU3RyZWFtVHJhY2s+JiYgdHJh Y2tUb0FkZCwgU3RyZWFtTW9kCiAgICAgYXV0byYgdHJhY2sgPSAqcmVzdWx0Lml0ZXJhdG9yLT52 YWx1ZTsKICAgICB0cmFjay5hZGRPYnNlcnZlcigqdGhpcyk7CiAKKyAgICB1cGRhdGVBY3RpdmVT dGF0ZSgpOworCiAgICAgaWYgKHN0cmVhbU1vZGlmaWVyID09IFN0cmVhbU1vZGlmaWVyOjpEb21B UEkpCiAgICAgICAgIG1fcHJpdmF0ZS0+YWRkVHJhY2soJnRyYWNrLnByaXZhdGVUcmFjaygpLCBN ZWRpYVN0cmVhbVByaXZhdGU6Ok5vdGlmeUNsaWVudE9wdGlvbjo6RG9udE5vdGlmeSk7CiAgICAg ZWxzZQpAQCAtMjQ2LDYgKzI0NCw4IEBAIGJvb2wgTWVkaWFTdHJlYW06OmludGVybmFsUmVtb3Zl VHJhY2soY29uc3QgU3RyaW5nJiB0cmFja0lkLCBTdHJlYW1Nb2RpZmllciBzdHJlCiAKICAgICB0 cmFjay0+cmVtb3ZlT2JzZXJ2ZXIoKnRoaXMpOwogCisgICAgdXBkYXRlQWN0aXZlU3RhdGUoKTsK KwogICAgIGlmIChzdHJlYW1Nb2RpZmllciA9PSBTdHJlYW1Nb2RpZmllcjo6RG9tQVBJKQogICAg ICAgICBtX3ByaXZhdGUtPnJlbW92ZVRyYWNrKHRyYWNrLT5wcml2YXRlVHJhY2soKSwgTWVkaWFT dHJlYW1Qcml2YXRlOjpOb3RpZnlDbGllbnRPcHRpb246OkRvbnROb3RpZnkpOwogICAgIGVsc2UK QEAgLTM1Miw3ICszNTIsNyBAQCB2b2lkIE1lZGlhU3RyZWFtOjpjaGFyYWN0ZXJpc3RpY3NDaGFu Z2VkKCkKICAgICB9CiB9CiAKLXZvaWQgTWVkaWFTdHJlYW06OnNjaGVkdWxlQWN0aXZlU3RhdGVD aGFuZ2UoKQordm9pZCBNZWRpYVN0cmVhbTo6dXBkYXRlQWN0aXZlU3RhdGUoKQogewogICAgIGJv b2wgYWN0aXZlID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiB0cmFjayA6IG1fdHJhY2tTZXQudmFs dWVzKCkpIHsKQEAgLTM2NiwyMSArMzY2LDYgQEAgdm9pZCBNZWRpYVN0cmVhbTo6c2NoZWR1bGVB Y3RpdmVTdGF0ZUNoYW5nZSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIHNldElzQWN0aXZlKGFj dGl2ZSk7Ci0KLSAgICBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50TmFtZSA9IG1faXNBY3RpdmUg PyBldmVudE5hbWVzKCkuaW5hY3RpdmVFdmVudCA6IGV2ZW50TmFtZXMoKS5hY3RpdmVFdmVudDsK LSAgICBtX3NjaGVkdWxlZEFjdGl2aXR5RXZlbnRzLmFwcGVuZChFdmVudDo6Y3JlYXRlKGV2ZW50 TmFtZSwgZmFsc2UsIGZhbHNlKSk7Ci0KLSAgICBpZiAoIW1fYWN0aXZpdHlFdmVudFRpbWVyLmlz QWN0aXZlKCkpCi0gICAgICAgIG1fYWN0aXZpdHlFdmVudFRpbWVyLnN0YXJ0T25lU2hvdCgwX3Mp OwotfQotCi12b2lkIE1lZGlhU3RyZWFtOjphY3Rpdml0eUV2ZW50VGltZXJGaXJlZCgpCi17Ci0g ICAgVmVjdG9yPFJlZjxFdmVudD4+IGV2ZW50czsKLSAgICBldmVudHMuc3dhcChtX3NjaGVkdWxl ZEFjdGl2aXR5RXZlbnRzKTsKLQotICAgIGZvciAoYXV0byYgZXZlbnQgOiBldmVudHMpCi0gICAg ICAgIGRpc3BhdGNoRXZlbnQoZXZlbnQpOwogfQogCiBVUkxSZWdpc3RyeSYgTWVkaWFTdHJlYW06 OnJlZ2lzdHJ5KCkgY29uc3QKQEAgLTQ5Nyw3ICs0ODIsNyBAQCBib29sIE1lZGlhU3RyZWFtOjpj YW5TdXNwZW5kRm9yRG9jdW1lbnRTdXNwZW5zaW9uKCkgY29uc3QKIAogYm9vbCBNZWRpYVN0cmVh bTo6aGFzUGVuZGluZ0FjdGl2aXR5KCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9pc0FjdGl2ZSB8 fCAhbV9zY2hlZHVsZWRBY3Rpdml0eUV2ZW50cy5pc0VtcHR5KCk7CisgICAgcmV0dXJuIG1faXNB Y3RpdmU7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaAppbmRleCBmM2YxMDM5NTMzZTNiNjk0 YThmYTA5NDI0YTFlYWE2ODdmZWUxNDhkLi5lYzYyYjgxOWQ2NDg0YmFmZjVjYTUwOTgzNjYzZGMx NGZlYzkxZGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L01lZGlhU3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbS5oCkBAIC0xNTksNyArMTU5LDcgQEAgcHJpdmF0ZToKICAgICBjb25zdCBjaGFy KiBhY3RpdmVET01PYmplY3ROYW1lKCkgY29uc3QgZmluYWw7CiAgICAgYm9vbCBjYW5TdXNwZW5k Rm9yRG9jdW1lbnRTdXNwZW5zaW9uKCkgY29uc3QgZmluYWw7CiAKLSAgICB2b2lkIHNjaGVkdWxl QWN0aXZlU3RhdGVDaGFuZ2UoKTsKKyAgICB2b2lkIHVwZGF0ZUFjdGl2ZVN0YXRlKCk7CiAgICAg dm9pZCBhY3Rpdml0eUV2ZW50VGltZXJGaXJlZCgpOwogICAgIHZvaWQgc2V0SXNBY3RpdmUoYm9v bCk7CiAgICAgdm9pZCBzdGF0dXNEaWRDaGFuZ2UoKTsKQEAgLTE3MCw5ICsxNzAsNiBAQCBwcml2 YXRlOgogCiAgICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPj4gbV90 cmFja1NldDsKIAotICAgIFRpbWVyIG1fYWN0aXZpdHlFdmVudFRpbWVyOwotICAgIFZlY3RvcjxS ZWY8RXZlbnQ+PiBtX3NjaGVkdWxlZEFjdGl2aXR5RXZlbnRzOwotCiAgICAgVmVjdG9yPE9ic2Vy dmVyKj4gbV9vYnNlcnZlcnM7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtTWVkaWFTZXNz aW9uPiBtX21lZGlhU2Vzc2lvbjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL01lZGlhU3RyZWFtLmlkbAppbmRleCA5NzI4ZDQwNjhkMGQ2ZTllNTMwOTRkY2Iy ZTlhNTczYzYwMTY2OGUyLi5lNGI0ZjM2OWExZDNjYTQxOGU5ZTNiMzUzYWQ1M2ExMzc1NTRmN2I3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtLmlkbApAQCAtNTAsMTAgKzUwLDUgQEAKIAogICAgIGF0dHJpYnV0ZSBFdmVudEhhbmRsZXIg b25hZGR0cmFjazsKICAgICBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9ucmVtb3ZldHJhY2s7Ci0K LSAgICAvLyBGSVhNRSAxNjk4NzE6IGxlZ2FjeSBvciByZW1vdmU/Ci0gICAgYXR0cmlidXRlIEV2 ZW50SGFuZGxlciBvbmFjdGl2ZTsKLSAgICAvLyBGSVhNRSAxNjk4NzE6IGxlZ2FjeSBvciByZW1v dmU/Ci0gICAgYXR0cmlidXRlIEV2ZW50SGFuZGxlciBvbmluYWN0aXZlOwogfTsKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGNmNTMwOGZlODFiZWFkNjJiYzVkZjc3NTlmOTIzYTM3YzVlYjUzODMuLjU5N2RlZjg4YjBkY2Mz MTY5ZDY5YWFjMTExMmFjNzFlYmU0YmI4YjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAxNy0w OC0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViUlRD IE1lZGlhU3RyZWFtIGNyZWF0ZWQgd2l0aG91dCB0cmFja3MgZG9lcyBub3QgdXBkYXRlIGFjdGl2 ZSBzdGF0ZSBhZnRlciB0cmFja3MgYXJlIGFkZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU0MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbWVkaWFjYXB0dXJlZnJvbWVsZW1lbnQvQ2Fu dmFzQ2FwdHVyZU1lZGlhU3RyZWFtLWNsb25lLXRyYWNrLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBmYXN0L21lZGlhY2FwdHVyZWZyb21lbGVtZW50L0NhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbS1j cmVhdGlvbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbS1hZGQtcmVtb3ZlLXRyYWNrcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS1hZGQtcmVtb3ZlLXRyYWNrcy5odG1sOgorCisyMDE3LTA4LTI4 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBbQ2FjaGUgQVBJ XSBTdXBwb3J0IGNhY2hlIG5hbWVzIHBlcnNpc3RlbmN5CiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU5OTUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9tZWRpYWNhcHR1cmVmcm9tZWxlbWVudC9DYW52YXNDYXB0dXJlTWVkaWFTdHJlYW0t Y2xvbmUtdHJhY2stZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYWNhcHR1cmVm cm9tZWxlbWVudC9DYW52YXNDYXB0dXJlTWVkaWFTdHJlYW0tY2xvbmUtdHJhY2stZXhwZWN0ZWQu dHh0CmluZGV4IDExY2M3ZTI3ZmNiMTYzMGNhMTBiMGYwZWQwMDY5ODEwZTBiNjJlNDguLjgxZmU2 OTU2NTE3YmU4ZjNlNDliY2VhYzZjOTg3ZTE4OTE3NWU1YTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2Zhc3QvbWVkaWFjYXB0dXJlZnJvbWVsZW1lbnQvQ2FudmFzQ2FwdHVyZU1lZGlhU3RyZWFt LWNsb25lLXRyYWNrLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhY2Fw dHVyZWZyb21lbGVtZW50L0NhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbS1jbG9uZS10cmFjay1leHBl Y3RlZC50eHQKQEAgLTEsMyArMSwzIEBACiAKLUZBSUwgY2hlY2sgY2xvbmUgdHJhY2sgYWZ0ZXIg Y2FwdHVyZVN0cmVhbSgpIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkIHRydWUgYnV0IGdvdCBmYWxz ZQorRkFJTCBjaGVjayBjbG9uZSB0cmFjayBhZnRlciBjYXB0dXJlU3RyZWFtKCkgY2xvbmVkX3Ry YWNrLnJlcXVlc3RGcmFtZSBpcyBub3QgYSBmdW5jdGlvbi4gKEluICdjbG9uZWRfdHJhY2sucmVx dWVzdEZyYW1lKCknLCAnY2xvbmVkX3RyYWNrLnJlcXVlc3RGcmFtZScgaXMgdW5kZWZpbmVkKQog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhY2FwdHVyZWZyb21lbGVtZW50L0Nh bnZhc0NhcHR1cmVNZWRpYVN0cmVhbS1jcmVhdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L21lZGlhY2FwdHVyZWZyb21lbGVtZW50L0NhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbS1j cmVhdGlvbi1leHBlY3RlZC50eHQKaW5kZXggNTYxNThjODNiNTY3MTlkMzdiN2NjZDFmYThlNGM0 NjIwMTJlYzJjYi4uZGQwNmZlZmVkNWY4YjVhZDM3NzgxY2I4ZjMzMzI5MmVhMWE0NTQyZSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYWNhcHR1cmVmcm9tZWxlbWVudC9DYW52YXND YXB0dXJlTWVkaWFTdHJlYW0tY3JlYXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvbWVkaWFjYXB0dXJlZnJvbWVsZW1lbnQvQ2FudmFzQ2FwdHVyZU1lZGlhU3RyZWFtLWNy ZWF0aW9uLWV4cGVjdGVkLnR4dApAQCAtMSw1ICsxLDUgQEAKIAotRkFJTCBjaGVjayA8Y2FudmFz PiBjYXB0dXJlU3RyZWFtKHVuZGVmaW5lZCkgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgdHJ1ZSBi dXQgZ290IGZhbHNlCi1GQUlMIGNoZWNrIDxjYW52YXM+IGNhcHR1cmVTdHJlYW0oMCkgYXNzZXJ0 X2VxdWFsczogZXhwZWN0ZWQgdHJ1ZSBidXQgZ290IGZhbHNlCi1GQUlMIGNoZWNrIDxjYW52YXM+ IGNhcHR1cmVTdHJlYW0oMzApIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkIHRydWUgYnV0IGdvdCBm YWxzZQorUEFTUyBjaGVjayA8Y2FudmFzPiBjYXB0dXJlU3RyZWFtKHVuZGVmaW5lZCkgCitQQVNT IGNoZWNrIDxjYW52YXM+IGNhcHR1cmVTdHJlYW0oMCkgCitQQVNTIGNoZWNrIDxjYW52YXM+IGNh cHR1cmVTdHJlYW0oMzApIAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtLWFkZC1yZW1vdmUtdHJhY2tzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0tYWRkLXJlbW92ZS10cmFja3MtZXhwZWN0 ZWQudHh0CmluZGV4IDdlNjk1ZGY1MGM1MzY2ZTRjZGI2M2VlMjNhOGIyNjAwMGJhNjUwMTEuLmI3 YzkxOGY1Njg2NGZkZjcxZGZkZWJlMzZjYzBkOTAwMWU4OWM3MTkgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0tYWRkLXJlbW92ZS10cmFja3MtZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0t YWRkLXJlbW92ZS10cmFja3MtZXhwZWN0ZWQudHh0CkBAIC0zLDYgKzMsOCBAQCBUZXN0IGFkZGlu ZyBhbmQgcmVtb3ZpbmcgdHJhY2tzLgogT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVz IG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgogCiAKK1BB U1Mgc3RyZWFtQ29weS5hY3RpdmUgaXMgZmFsc2UKK1BBU1Mgc3RyZWFtQ29weS5hY3RpdmUgaXMg dHJ1ZQogUEFTUyBzdHJlYW0xLmFjdGl2ZSBpcyB0cnVlCiBQQVNTIHN0cmVhbTEuZ2V0QXVkaW9U cmFja3MoKS5sZW5ndGggaXMgMQogUEFTUyBzdHJlYW0xLmdldFZpZGVvVHJhY2tzKCkubGVuZ3Ro IGlzIDEKQEAgLTQ3LDEyICs0OSw4IEBAIFBBU1Mgc3RyZWFtMS5nZXRWaWRlb1RyYWNrcygpLmxl bmd0aCBpcyAyCiAqKiogcmVtb3ZlIGFsbCB0cmFja3MsIHN0cmVhbSB3aWxsIGJlY29tZSBpbmFj dGl2ZQogUEFTUyBzdHJlYW0yLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3RoIGlzIDAKIFBBU1Mgc3Ry ZWFtMi5nZXRWaWRlb1RyYWNrcygpLmxlbmd0aCBpcyAwCi0KLSoqKiBhY3RpdmUgYXR0cmlidXRl IGlzIHN0aWxsIHRydWUgKHVudGlsIGV2ZW50IGlzIGZpcmVkKQotRkFJTCBzdHJlYW0yLmFjdGl2 ZSBzaG91bGQgYmUgdHJ1ZS4gV2FzIGZhbHNlLgotCi1TdHJlYW0yIGlzIGFjdGl2ZS4KLUZBSUwg c3RyZWFtMi5hY3RpdmUgc2hvdWxkIGJlIHRydWUuIFdhcyBmYWxzZS4KK1BBU1Mgc3RyZWFtMi5h Y3RpdmUgaXMgZmFsc2UKK1BBU1Mgc3RyZWFtMi5hY3RpdmUgaXMgZmFsc2UKIFBBU1Mgc3VjY2Vz c2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS1hZGQtcmVtb3ZlLXRyYWNrcy5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS1hZGQtcmVtb3ZlLXRy YWNrcy5odG1sCmluZGV4IGVjNmMwYmE4Mjk1NGZmZmYxODA4MGVmNDVkMTg1YmZjOGVkNTAwMTYu LjcwYTU1ZWI0ZjQ4ZWU1Y2Q2MTQwNzYzZTFiMjE3MDM1OWU3OTgxMTUgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0tYWRkLXJlbW92ZS10cmFja3Mu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLWFkZC1y ZW1vdmUtdHJhY2tzLmh0bWwKQEAgLTExLDYgKzExLDcgQEAKICAgICAgICAgICAgIGRlc2NyaXB0 aW9uKCJUZXN0IGFkZGluZyBhbmQgcmVtb3ZpbmcgdHJhY2tzLiIpOwogCiAgICAgICAgICAgICB2 YXIgc3RyZWFtMTsKKyAgICAgICAgICAgIHZhciBzdHJlYW1Db3B5OwogICAgICAgICAgICAgdmFy IHN0cmVhbTI7CiAgICAgICAgICAgICB2YXIgYXVkaW9UcmFjazsKICAgICAgICAgICAgIHZhciB2 aWRlb1RyYWNrOwpAQCAtMzcsMjQgKzM4LDYgQEAKICAgICAgICAgICAgICAgICB0ZXN0RmFpbGVk KCJcImFkZHRyYWNrXCIgb3IgXCJyZW1vdmV0cmFja1wiIGV2ZW50cyBzaG91bGQgbm90IGZpcmUg YXMgYSByZXN1bHQgb2YgbG9jYWwgYWRkVHJhY2soKSBvciByZW1vdmVUcmFjaygpIG9wZXJhdGlv bnMuIik7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGZ1bmN0aW9uIHNob3VsZEZpcmVB Y3RpdmUoKSB7Ci0gICAgICAgICAgICAgICAgZGVidWcoIjxicj5TdHJlYW0yIGlzIGFjdGl2ZS4i KTsKLSAgICAgICAgICAgICAgICBzaG91bGRCZSgnc3RyZWFtMi5hY3RpdmUnLCAndHJ1ZScpOwot ICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwotICAgICAgICAgICAgfQotCi0gICAgICAg ICAgICBmdW5jdGlvbiBzaG91bGRGaXJlSW5BY3RpdmUoKSB7Ci0gICAgICAgICAgICAgICAgZGVi dWcoIjxicj5TdHJlYW0yIGlzIGluYWN0aXZlLiIpOwotICAgICAgICAgICAgICAgIHNob3VsZEJl KCdzdHJlYW0yLmFjdGl2ZScsICdmYWxzZScpOwotCi0gICAgICAgICAgICAgICAgZGVidWcoIjxi cj4qKiogYWRkIG5vbi1lbmRlZCB0cmFjayIpOwotICAgICAgICAgICAgICAgIHNob3VsZE5vdEJl KCdhdWRpb1RyYWNrLnJlYWR5U3RhdGUnLCAnImVuZGVkIicpOwotICAgICAgICAgICAgICAgIHRy eUFkZFRyYWNrKHN0cmVhbTIsIGF1ZGlvVHJhY2spOwotCi0gICAgICAgICAgICAgICAgZGVidWco Ijxicj4qKiogYWN0aXZlIGF0dHJpYnV0ZSBpcyBzdGlsbCBmYWxzZSAodW50aWwgZXZlbnQgaXMg ZmlyZWQpIik7Ci0gICAgICAgICAgICAgICAgc2hvdWxkQmUoJ3N0cmVhbTIuYWN0aXZlJywgJ2Zh bHNlJyk7Ci0gICAgICAgICAgICB9Ci0KICAgICAgICAgICAgIGZ1bmN0aW9uIGdvdFN0cmVhbTIo cykgewogICAgICAgICAgICAgICAgIHN0cmVhbTIgPSBzOwogCkBAIC02OSw4ICs1MiwxMCBAQAog ICAgICAgICAgICAgICAgIHN0cmVhbTEub25hZGR0cmFjayA9IHNob3VsZE5vdEZpcmU7CiAgICAg ICAgICAgICAgICAgc3RyZWFtMS5vbnJlbW92ZXRyYWNrID0gc2hvdWxkTm90RmlyZTsKIAotICAg ICAgICAgICAgICAgIHN0cmVhbTIub25hY3RpdmUgPSBzaG91bGRGaXJlQWN0aXZlOwotICAgICAg ICAgICAgICAgIHN0cmVhbTIub25pbmFjdGl2ZSA9IHNob3VsZEZpcmVJbkFjdGl2ZTsKKyAgICAg ICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxk QmUoJ3N0cmVhbTIuYWN0aXZlJywgJ2ZhbHNlJyk7CisgICAgICAgICAgICAgICAgICAgIGZpbmlz aEpTVGVzdCgpOworICAgICAgICAgICAgICAgIH0sIDEwMDApOwogCiAgICAgICAgICAgICAgICAg YXVkaW9UcmFjayA9IHN0cmVhbTEuZ2V0QXVkaW9UcmFja3MoKVswXTsKICAgICAgICAgICAgICAg ICB2aWRlb1RyYWNrID0gc3RyZWFtMS5nZXRWaWRlb1RyYWNrcygpWzBdOwpAQCAtMTI1LDEyICsx MTAsMTcgQEAKICAgICAgICAgICAgICAgICBzaG91bGRCZSgnc3RyZWFtMi5nZXRBdWRpb1RyYWNr cygpLmxlbmd0aCcsICcwJyk7CiAgICAgICAgICAgICAgICAgc2hvdWxkQmUoJ3N0cmVhbTIuZ2V0 VmlkZW9UcmFja3MoKS5sZW5ndGgnLCAnMCcpOwogCi0gICAgICAgICAgICAgICAgZGVidWcoIjxi cj4qKiogYWN0aXZlIGF0dHJpYnV0ZSBpcyBzdGlsbCB0cnVlICh1bnRpbCBldmVudCBpcyBmaXJl ZCkiKTsKLSAgICAgICAgICAgICAgICBzaG91bGRCZSgnc3RyZWFtMi5hY3RpdmUnLCAndHJ1ZScp OworICAgICAgICAgICAgICAgIHNob3VsZEJlKCdzdHJlYW0yLmFjdGl2ZScsICdmYWxzZScpOwog ICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBnb3RTdHJlYW0xKHMpIHsKICAg ICAgICAgICAgICAgICBzdHJlYW0xID0gczsKKworICAgICAgICAgICAgICAgIHN0cmVhbUNvcHkg PSBuZXcgTWVkaWFTdHJlYW0oKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgnc3RyZWFtQ29w eS5hY3RpdmUnLCAnZmFsc2UnKTsKKyAgICAgICAgICAgICAgICBzdHJlYW1Db3B5LmFkZFRyYWNr KHN0cmVhbTEuZ2V0VmlkZW9UcmFja3MoKVswXSk7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUo J3N0cmVhbUNvcHkuYWN0aXZlJywgJ3RydWUnKTsKKwogICAgICAgICAgICAgICAgIGdldFVzZXJN ZWRpYSgiYWxsb3ciLCB7YXVkaW86dHJ1ZSwgdmlkZW86dHJ1ZX0sIGdvdFN0cmVhbTIpOwogICAg ICAgICAgICAgfQogCg==