120815 2013-09-05 17:25:08 -0700 [MediaStream API] Allow empty MediaStreams 2013-09-06 11:27:56 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 eric.carlson eric.carlson commit-queue glenn hta jer.noble syoichi tommyw oldest_to_newest 925309 0 eric.carlson 2013-09-05 17:25:08 -0700 Consider merging https://chromium.googlesource.com/chromium/blink/+/10de838ebd0e65fd91b3bb98136941733a038bb8 The spec is a bit unclear ecactly what should happen with newly created MediaStreams that doesn't have any tracks. The current implementation is too strict and the spec is being worked upon to be clearer. In the meantime this patch doesn't set eneded to true in the constructor. 925703 1 210767 eric.carlson 2013-09-06 10:18:18 -0700 Created attachment 210767 Proposed patch 925733 2 210767 jer.noble 2013-09-06 11:24:06 -0700 Comment on attachment 210767 Proposed patch Net negative LOC, including tests! Impressive! r=me. 925734 3 210767 commit-queue 2013-09-06 11:27:54 -0700 Comment on attachment 210767 Proposed patch Clearing flags on attachment: 210767 Committed r155199: <http://trac.webkit.org/changeset/155199> 925735 4 commit-queue 2013-09-06 11:27:56 -0700 All reviewed patches have been landed. Closing bug. 210767 2013-09-06 10:18:18 -0700 2013-09-06 11:27:54 -0700 Proposed patch empty_media_stream_patch_2.txt text/plain 9854 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NTE5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA5LTA2ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbSBB UEldIEFsbG93IGVtcHR5IE1lZGlhU3RyZWFtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwODE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIHNwZWMgaXMgYSBiaXQgdW5jbGVhciBlY2FjdGx5IHdo YXQgc2hvdWxkIGhhcHBlbiB3aXRoIG5ld2x5IGNyZWF0ZWQgTWVkaWFTdHJlYW1zIAorICAgICAg ICB0aGF0IGRvZXNuJ3QgaGF2ZSBhbnkgdHJhY2tzLiBUaGUgY3VycmVudCBpbXBsZW1lbnRhdGlv biBpcyB0b28gc3RyaWN0IGFuZCB0aGUgc3BlYyAKKyAgICAgICAgaXMgYmVpbmcgd29ya2VkIHVw b24gdG8gYmUgY2xlYXJlci4gSW4gdGhlIG1lYW50aW1lIHRoaXMgcGF0Y2ggZG9lc24ndCBzZXQg ZW5lZGVkIHRvIAorICAgICAgICB0cnVlIGluIHRoZSBjb25zdHJ1Y3Rvci4gCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBleGlzdGluZyB0ZXN0IHVwZGF0ZWQuCisKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhU3RyZWFtUmVnaXN0cnk6Omxvb2t1cE1lZGlhU3RyZWFtRGVzY3JpcHRvcik6CisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmg6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I6Ok1lZGlhU3RyZWFtRGVzY3JpcHRv cik6CisKIDIwMTMtMDktMDYgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4K IAogICAgICAgICBBWDogYXJpYS1yZWxldmFudCBkb2VzIG5vdCBleHBvc2UgQVhBUklBUmVsZXZh bnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFt RGVzY3JpcHRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oCShyZXZpc2lvbiAxNTUwNTQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaAko d29ya2luZyBjb3B5KQpAQCAtMTA5LDkgKzEwOSw2IEBAIHByaXZhdGU6CiAKICAgICAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCB2aWRlb1NvdXJjZXMuc2l6ZSgpOyBpKyspCiAgICAgICAgICAg ICBtX3ZpZGVvQ29tcG9uZW50cy5hcHBlbmQoTWVkaWFTdHJlYW1Db21wb25lbnQ6OmNyZWF0ZSh0 aGlzLCB2aWRlb1NvdXJjZXNbaV0pKTsKLQotICAgICAgICBpZiAoIWF1ZGlvU291cmNlcy5zaXpl KCkgJiYgIXZpZGVvU291cmNlcy5zaXplKCkpCi0gICAgICAgICAgICBtX2VuZGVkID0gdHJ1ZTsK ICAgICB9CiAKICAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3IoY29uc3QgU3RyaW5nJiBpZCwgY29u c3QgTWVkaWFTdHJlYW1Db21wb25lbnRWZWN0b3ImIGF1ZGlvQ29tcG9uZW50cywgY29uc3QgTWVk aWFTdHJlYW1Db21wb25lbnRWZWN0b3ImIHZpZGVvQ29tcG9uZW50cykKSW5kZXg6IExheW91dFRl c3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlz aW9uIDE1NTE5MykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE4IEBACisyMDEzLTA5LTA2ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbSBBUEldIEFsbG93IGVtcHR5IE1lZGlhU3Ry ZWFtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIw ODE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHNwZWMgaXMgYSBiaXQgdW5jbGVhciBlY2FjdGx5IHdoYXQgc2hvdWxkIGhhcHBlbiB3aXRoIG5l d2x5IGNyZWF0ZWQgTWVkaWFTdHJlYW1zIAorICAgICAgICB0aGF0IGRvZXNuJ3QgaGF2ZSBhbnkg dHJhY2tzLiBUaGUgY3VycmVudCBpbXBsZW1lbnRhdGlvbiBpcyB0b28gc3RyaWN0IGFuZCB0aGUg c3BlYyAKKyAgICAgICAgaXMgYmVpbmcgd29ya2VkIHVwb24gdG8gYmUgY2xlYXJlci4gSW4gdGhl IG1lYW50aW1lIHRoaXMgcGF0Y2ggZG9lc24ndCBzZXQgZW5lZGVkIHRvIAorICAgICAgICB0cnVl IGluIHRoZSBjb25zdHJ1Y3Rvci4gCisKKyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL01lZGlh U3RyZWFtQ29uc3RydWN0b3ItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW1Db25zdHJ1Y3Rvci5odG1sOgorCiAyMDEzLTA5LTA2ICBEZW5pcyBOb21p eWFtYSAgPGQubm9taXlhbWFAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0dUS10gQWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6YWRkTm90aWZpY2F0aW9uTGlzdGVuZXIoKSBjcmFzaGVzIG9uIGRlYnVn IGJ1aWxkCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtQ29u c3RydWN0b3ItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW1Db25zdHJ1Y3Rvci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE1 NTA1NCkKKysrIExheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Db25zdHJ1 Y3Rvci1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTIxLDcgKzIxLDYgQEAgUEFTUyBb b2JqZWN0IE1lZGlhU3RyZWFtXSBpcyBkZWZpbmVkLgogUEFTUyBuZXdTdHJlYW0uY29uc3RydWN0 b3IubmFtZSBpcyAnTWVkaWFTdHJlYW0nCiBQQVNTIG5ld1N0cmVhbS5nZXRBdWRpb1RyYWNrcygp Lmxlbmd0aCBpcyBuQXVkaW8KIFBBU1MgbmV3U3RyZWFtLmdldFZpZGVvVHJhY2tzKCkubGVuZ3Ro IGlzIG5WaWRlbwotUEFTUyBuZXdTdHJlYW0uZW5kZWQgaXMgdHJ1ZQogUEFTUyBjaGVja0lkQXR0 cmlidXRlKG5ld1N0cmVhbS5pZCkgaXMgdHJ1ZQogUEFTUyBTdHJlYW0gY29uc3RydWN0ZWQKIFBB U1MgW29iamVjdCBNZWRpYVN0cmVhbV0gaXMgbm9uLW51bGwuCkBAIC0yOSw3ICsyOCw2IEBAIFBB U1MgW29iamVjdCBNZWRpYVN0cmVhbV0gaXMgZGVmaW5lZC4KIFBBU1MgbmV3U3RyZWFtLmNvbnN0 cnVjdG9yLm5hbWUgaXMgJ01lZGlhU3RyZWFtJwogUEFTUyBuZXdTdHJlYW0uZ2V0QXVkaW9UcmFj a3MoKS5sZW5ndGggaXMgbkF1ZGlvCiBQQVNTIG5ld1N0cmVhbS5nZXRWaWRlb1RyYWNrcygpLmxl bmd0aCBpcyBuVmlkZW8KLVBBU1MgbmV3U3RyZWFtLmVuZGVkIGlzIHRydWUKIFBBU1MgY2hlY2tJ ZEF0dHJpYnV0ZShuZXdTdHJlYW0uaWQpIGlzIHRydWUKIFBBU1MgU3RyZWFtIGNvbnN0cnVjdGVk CiBQQVNTIFtvYmplY3QgTWVkaWFTdHJlYW1dIGlzIG5vbi1udWxsLgpAQCAtMzcsNyArMzUsNiBA QCBQQVNTIFtvYmplY3QgTWVkaWFTdHJlYW1dIGlzIGRlZmluZWQuCiBQQVNTIG5ld1N0cmVhbS5j b25zdHJ1Y3Rvci5uYW1lIGlzICdNZWRpYVN0cmVhbScKIFBBU1MgbmV3U3RyZWFtLmdldEF1ZGlv VHJhY2tzKCkubGVuZ3RoIGlzIG5BdWRpbwogUEFTUyBuZXdTdHJlYW0uZ2V0VmlkZW9UcmFja3Mo KS5sZW5ndGggaXMgblZpZGVvCi1QQVNTIG5ld1N0cmVhbS5lbmRlZCBpcyBmYWxzZQogUEFTUyBj aGVja0lkQXR0cmlidXRlKG5ld1N0cmVhbS5pZCkgaXMgdHJ1ZQogUEFTUyBTdHJlYW0gY29uc3Ry dWN0ZWQKIFBBU1MgW29iamVjdCBNZWRpYVN0cmVhbV0gaXMgbm9uLW51bGwuCkBAIC00NSw3ICs0 Miw2IEBAIFBBU1MgW29iamVjdCBNZWRpYVN0cmVhbV0gaXMgZGVmaW5lZC4KIFBBU1MgbmV3U3Ry ZWFtLmNvbnN0cnVjdG9yLm5hbWUgaXMgJ01lZGlhU3RyZWFtJwogUEFTUyBuZXdTdHJlYW0uZ2V0 QXVkaW9UcmFja3MoKS5sZW5ndGggaXMgbkF1ZGlvCiBQQVNTIG5ld1N0cmVhbS5nZXRWaWRlb1Ry YWNrcygpLmxlbmd0aCBpcyBuVmlkZW8KLVBBU1MgbmV3U3RyZWFtLmVuZGVkIGlzIGZhbHNlCiBQ QVNTIGNoZWNrSWRBdHRyaWJ1dGUobmV3U3RyZWFtLmlkKSBpcyB0cnVlCiBQQVNTIFN0cmVhbSBj b25zdHJ1Y3RlZAogUEFTUyBbb2JqZWN0IE1lZGlhU3RyZWFtXSBpcyBub24tbnVsbC4KQEAgLTUz LDcgKzQ5LDYgQEAgUEFTUyBbb2JqZWN0IE1lZGlhU3RyZWFtXSBpcyBkZWZpbmVkLgogUEFTUyBu ZXdTdHJlYW0uY29uc3RydWN0b3IubmFtZSBpcyAnTWVkaWFTdHJlYW0nCiBQQVNTIG5ld1N0cmVh bS5nZXRBdWRpb1RyYWNrcygpLmxlbmd0aCBpcyBuQXVkaW8KIFBBU1MgbmV3U3RyZWFtLmdldFZp ZGVvVHJhY2tzKCkubGVuZ3RoIGlzIG5WaWRlbwotUEFTUyBuZXdTdHJlYW0uZW5kZWQgaXMgZmFs c2UKIFBBU1MgY2hlY2tJZEF0dHJpYnV0ZShuZXdTdHJlYW0uaWQpIGlzIHRydWUKIFBBU1MgU3Ry ZWFtIGNvbnN0cnVjdGVkCiBQQVNTIFtvYmplY3QgTWVkaWFTdHJlYW1dIGlzIG5vbi1udWxsLgpA QCAtNjEsNyArNTYsNiBAQCBQQVNTIFtvYmplY3QgTWVkaWFTdHJlYW1dIGlzIGRlZmluZWQuCiBQ QVNTIG5ld1N0cmVhbS5jb25zdHJ1Y3Rvci5uYW1lIGlzICdNZWRpYVN0cmVhbScKIFBBU1MgbmV3 U3RyZWFtLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3RoIGlzIG5BdWRpbwogUEFTUyBuZXdTdHJlYW0u Z2V0VmlkZW9UcmFja3MoKS5sZW5ndGggaXMgblZpZGVvCi1QQVNTIG5ld1N0cmVhbS5lbmRlZCBp cyBmYWxzZQogUEFTUyBjaGVja0lkQXR0cmlidXRlKG5ld1N0cmVhbS5pZCkgaXMgdHJ1ZQogUEFT UyBTdHJlYW0gY29uc3RydWN0ZWQKIFBBU1MgW29iamVjdCBNZWRpYVN0cmVhbV0gaXMgbm9uLW51 bGwuCkBAIC02OSw3ICs2Myw2IEBAIFBBU1MgW29iamVjdCBNZWRpYVN0cmVhbV0gaXMgZGVmaW5l ZC4KIFBBU1MgbmV3U3RyZWFtLmNvbnN0cnVjdG9yLm5hbWUgaXMgJ01lZGlhU3RyZWFtJwogUEFT UyBuZXdTdHJlYW0uZ2V0QXVkaW9UcmFja3MoKS5sZW5ndGggaXMgbkF1ZGlvCiBQQVNTIG5ld1N0 cmVhbS5nZXRWaWRlb1RyYWNrcygpLmxlbmd0aCBpcyBuVmlkZW8KLVBBU1MgbmV3U3RyZWFtLmVu ZGVkIGlzIGZhbHNlCiBQQVNTIGNoZWNrSWRBdHRyaWJ1dGUobmV3U3RyZWFtLmlkKSBpcyB0cnVl CiBQQVNTIFN0cmVhbSBjb25zdHJ1Y3RlZAogUEFTUyBbb2JqZWN0IE1lZGlhU3RyZWFtXSBpcyBu b24tbnVsbC4KQEAgLTc3LDcgKzcwLDYgQEAgUEFTUyBbb2JqZWN0IE1lZGlhU3RyZWFtXSBpcyBk ZWZpbmVkLgogUEFTUyBuZXdTdHJlYW0uY29uc3RydWN0b3IubmFtZSBpcyAnTWVkaWFTdHJlYW0n CiBQQVNTIG5ld1N0cmVhbS5nZXRBdWRpb1RyYWNrcygpLmxlbmd0aCBpcyBuQXVkaW8KIFBBU1Mg bmV3U3RyZWFtLmdldFZpZGVvVHJhY2tzKCkubGVuZ3RoIGlzIG5WaWRlbwotUEFTUyBuZXdTdHJl YW0uZW5kZWQgaXMgdHJ1ZQogUEFTUyBjaGVja0lkQXR0cmlidXRlKG5ld1N0cmVhbS5pZCkgaXMg dHJ1ZQogUEFTUyBTdHJlYW0gY29uc3RydWN0ZWQKIFBBU1MgW29iamVjdCBNZWRpYVN0cmVhbV0g aXMgbm9uLW51bGwuCkBAIC04NSw3ICs3Nyw2IEBAIFBBU1MgW29iamVjdCBNZWRpYVN0cmVhbV0g aXMgZGVmaW5lZC4KIFBBU1MgbmV3U3RyZWFtLmNvbnN0cnVjdG9yLm5hbWUgaXMgJ01lZGlhU3Ry ZWFtJwogUEFTUyBuZXdTdHJlYW0uZ2V0QXVkaW9UcmFja3MoKS5sZW5ndGggaXMgbkF1ZGlvCiBQ QVNTIG5ld1N0cmVhbS5nZXRWaWRlb1RyYWNrcygpLmxlbmd0aCBpcyBuVmlkZW8KLVBBU1MgbmV3 U3RyZWFtLmVuZGVkIGlzIHRydWUKIFBBU1MgY2hlY2tJZEF0dHJpYnV0ZShuZXdTdHJlYW0uaWQp IGlzIHRydWUKIFBBU1MgU3RyZWFtIGNvbnN0cnVjdGVkCiBQQVNTIFtvYmplY3QgTWVkaWFTdHJl YW1dIGlzIG5vbi1udWxsLgpAQCAtOTMsNyArODQsNiBAQCBQQVNTIFtvYmplY3QgTWVkaWFTdHJl YW1dIGlzIGRlZmluZWQuCiBQQVNTIG5ld1N0cmVhbS5jb25zdHJ1Y3Rvci5uYW1lIGlzICdNZWRp YVN0cmVhbScKIFBBU1MgbmV3U3RyZWFtLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3RoIGlzIG5BdWRp bwogUEFTUyBuZXdTdHJlYW0uZ2V0VmlkZW9UcmFja3MoKS5sZW5ndGggaXMgblZpZGVvCi1QQVNT IG5ld1N0cmVhbS5lbmRlZCBpcyB0cnVlCiBQQVNTIGNoZWNrSWRBdHRyaWJ1dGUobmV3U3RyZWFt LmlkKSBpcyB0cnVlCiBQQVNTIFN0cmVhbSBjb25zdHJ1Y3RlZAogUEFTUyBbb2JqZWN0IE1lZGlh U3RyZWFtXSBpcyBub24tbnVsbC4KQEAgLTEwMSw3ICs5MSw2IEBAIFBBU1MgW29iamVjdCBNZWRp YVN0cmVhbV0gaXMgZGVmaW5lZC4KIFBBU1MgbmV3U3RyZWFtLmNvbnN0cnVjdG9yLm5hbWUgaXMg J01lZGlhU3RyZWFtJwogUEFTUyBuZXdTdHJlYW0uZ2V0QXVkaW9UcmFja3MoKS5sZW5ndGggaXMg bkF1ZGlvCiBQQVNTIG5ld1N0cmVhbS5nZXRWaWRlb1RyYWNrcygpLmxlbmd0aCBpcyBuVmlkZW8K LVBBU1MgbmV3U3RyZWFtLmVuZGVkIGlzIHRydWUKIFBBU1MgY2hlY2tJZEF0dHJpYnV0ZShuZXdT dHJlYW0uaWQpIGlzIHRydWUKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIApJbmRl eDogTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbUNvbnN0cnVjdG9yLmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bUNvbnN0cnVjdG9yLmh0bWwJKHJldmlzaW9uIDE1NTA1NCkKKysrIExheW91dFRlc3RzL2Zhc3Qv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Db25zdHJ1Y3Rvci5odG1sCSh3b3JraW5nIGNvcHkpCkBA IC03NiwyMSArNzYsMjEgQEAgZnVuY3Rpb24gdGVzdENvbnN0cnVjdG9yKHMpIHsKICAgICBzaG91 bGRUaHJvdygnbmV3IHdlYmtpdE1lZGlhU3RyZWFtKG51bGwpJyk7CiAgICAgc2hvdWxkVGhyb3co J25ldyB3ZWJraXRNZWRpYVN0cmVhbSh1bmRlZmluZWQpJyk7CiAKLSAgICB2ZXJpZnlTdHJlYW0o bmV3IHdlYmtpdE1lZGlhU3RyZWFtKCksIDAsIDAsIHRydWUpOwotICAgIHZlcmlmeVN0cmVhbShu ZXcgd2Via2l0TWVkaWFTdHJlYW0oW10pLCAwLCAwLCB0cnVlKTsKKyAgICB2ZXJpZnlTdHJlYW0o bmV3IHdlYmtpdE1lZGlhU3RyZWFtKCksIDAsIDApOworICAgIHZlcmlmeVN0cmVhbShuZXcgd2Vi a2l0TWVkaWFTdHJlYW0oW10pLCAwLCAwKTsKIAotICAgIHZlcmlmeVN0cmVhbShuZXcgd2Via2l0 TWVkaWFTdHJlYW0ocyksIHMuZ2V0QXVkaW9UcmFja3MoKS5sZW5ndGgsIHMuZ2V0VmlkZW9UcmFj a3MoKS5sZW5ndGgsIGZhbHNlKTsKKyAgICB2ZXJpZnlTdHJlYW0obmV3IHdlYmtpdE1lZGlhU3Ry ZWFtKHMpLCBzLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3RoLCBzLmdldFZpZGVvVHJhY2tzKCkubGVu Z3RoKTsKIAotICAgIHZlcmlmeVN0cmVhbShuZXcgd2Via2l0TWVkaWFTdHJlYW0oW3MuZ2V0QXVk aW9UcmFja3MoKVswXV0pLCAxLCAwLCBmYWxzZSk7Ci0gICAgdmVyaWZ5U3RyZWFtKG5ldyB3ZWJr aXRNZWRpYVN0cmVhbShbcy5nZXRWaWRlb1RyYWNrcygpWzBdXSksIDAsIDEsIGZhbHNlKTsKLSAg ICB2ZXJpZnlTdHJlYW0obmV3IHdlYmtpdE1lZGlhU3RyZWFtKFtzLmdldEF1ZGlvVHJhY2tzKClb MF0sIHMuZ2V0VmlkZW9UcmFja3MoKVswXV0pLCAxLCAxLCBmYWxzZSk7Ci0gICAgdmVyaWZ5U3Ry ZWFtKG5ldyB3ZWJraXRNZWRpYVN0cmVhbShbcy5nZXRWaWRlb1RyYWNrcygpWzBdLCBzLmdldEF1 ZGlvVHJhY2tzKClbMF0sIHMuZ2V0VmlkZW9UcmFja3MoKVswXV0pLCAxLCAxLCBmYWxzZSk7Cisg ICAgdmVyaWZ5U3RyZWFtKG5ldyB3ZWJraXRNZWRpYVN0cmVhbShbcy5nZXRBdWRpb1RyYWNrcygp WzBdXSksIDEsIDApOworICAgIHZlcmlmeVN0cmVhbShuZXcgd2Via2l0TWVkaWFTdHJlYW0oW3Mu Z2V0VmlkZW9UcmFja3MoKVswXV0pLCAwLCAxKTsKKyAgICB2ZXJpZnlTdHJlYW0obmV3IHdlYmtp dE1lZGlhU3RyZWFtKFtzLmdldEF1ZGlvVHJhY2tzKClbMF0sIHMuZ2V0VmlkZW9UcmFja3MoKVsw XV0pLCAxLCAxKTsKKyAgICB2ZXJpZnlTdHJlYW0obmV3IHdlYmtpdE1lZGlhU3RyZWFtKFtzLmdl dFZpZGVvVHJhY2tzKClbMF0sIHMuZ2V0QXVkaW9UcmFja3MoKVswXSwgcy5nZXRWaWRlb1RyYWNr cygpWzBdXSksIDEsIDEpOwogCiAgICAgcy5vbmVuZGVkID0gZnVuY3Rpb24gKCkgewotICAgICAg ICB2ZXJpZnlTdHJlYW0obmV3IHdlYmtpdE1lZGlhU3RyZWFtKFtzLmdldEF1ZGlvVHJhY2tzKClb MF1dKSwgMCwgMCwgdHJ1ZSk7Ci0gICAgICAgIHZlcmlmeVN0cmVhbShuZXcgd2Via2l0TWVkaWFT dHJlYW0oW3MuZ2V0VmlkZW9UcmFja3MoKVswXV0pLCAwLCAwLCB0cnVlKTsKLSAgICAgICAgdmVy aWZ5U3RyZWFtKG5ldyB3ZWJraXRNZWRpYVN0cmVhbShbcy5nZXRBdWRpb1RyYWNrcygpWzBdLCBz LmdldFZpZGVvVHJhY2tzKClbMF1dKSwgMCwgMCwgdHJ1ZSk7Ci0gICAgICAgIHZlcmlmeVN0cmVh bShuZXcgd2Via2l0TWVkaWFTdHJlYW0ocyksIDAsIDAsIHRydWUpOworICAgICAgICB2ZXJpZnlT dHJlYW0obmV3IHdlYmtpdE1lZGlhU3RyZWFtKFtzLmdldEF1ZGlvVHJhY2tzKClbMF1dKSwgMCwg MCk7CisgICAgICAgIHZlcmlmeVN0cmVhbShuZXcgd2Via2l0TWVkaWFTdHJlYW0oW3MuZ2V0Vmlk ZW9UcmFja3MoKVswXV0pLCAwLCAwKTsKKyAgICAgICAgdmVyaWZ5U3RyZWFtKG5ldyB3ZWJraXRN ZWRpYVN0cmVhbShbcy5nZXRBdWRpb1RyYWNrcygpWzBdLCBzLmdldFZpZGVvVHJhY2tzKClbMF1d KSwgMCwgMCk7CisgICAgICAgIHZlcmlmeVN0cmVhbShuZXcgd2Via2l0TWVkaWFTdHJlYW0ocyks IDAsIDApOwogCiAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwogICAgIH07CkBAIC05OCw3ICs5OCw3 IEBAIGZ1bmN0aW9uIHRlc3RDb25zdHJ1Y3RvcihzKSB7CiAgICAgcy5zdG9wKCk7CiB9CiAKLWZ1 bmN0aW9uIHZlcmlmeVN0cmVhbShzLCBudW1BdWRpb1RyYWNrcywgbnVtVmlkZW9UcmFja3MsIGVu ZGVkKSB7CitmdW5jdGlvbiB2ZXJpZnlTdHJlYW0ocywgbnVtQXVkaW9UcmFja3MsIG51bVZpZGVv VHJhY2tzKSB7CiAgICAgbmV3U3RyZWFtID0gczsKICAgICBuQXVkaW8gPSBudW1BdWRpb1RyYWNr czsKICAgICBuVmlkZW8gPSBudW1WaWRlb1RyYWNrczsKQEAgLTExMCwxMSArMTEwLDYgQEAgZnVu Y3Rpb24gdmVyaWZ5U3RyZWFtKHMsIG51bUF1ZGlvVHJhY2tzLAogICAgIHNob3VsZEJlKCduZXdT dHJlYW0uZ2V0QXVkaW9UcmFja3MoKS5sZW5ndGgnLCAnbkF1ZGlvJyk7CiAgICAgc2hvdWxkQmUo J25ld1N0cmVhbS5nZXRWaWRlb1RyYWNrcygpLmxlbmd0aCcsICduVmlkZW8nKTsKIAotICAgIGlm IChlbmRlZCkKLSAgICAgICAgc2hvdWxkQmVUcnVlKCduZXdTdHJlYW0uZW5kZWQnKTsKLSAgICBl bHNlCi0gICAgICAgIHNob3VsZEJlRmFsc2UoJ25ld1N0cmVhbS5lbmRlZCcpOwotCiAgICAgc2hv dWxkQmVUcnVlKCdjaGVja0lkQXR0cmlidXRlKG5ld1N0cmVhbS5pZCknKTsKIH0KIAo=