120874 2013-09-06 11:49:35 -0700 MediaStream API: Enhance MediaStreamDescriptor add/remove component 2013-09-10 10:30:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 121101 1 eric.carlson thiago.lacerda commit-queue eric.carlson glenn hta jer.noble luciano.wolf tommyw oldest_to_newest 925752 0 eric.carlson 2013-09-06 11:49:35 -0700 Consider merging https://chromium.googlesource.com/chromium/blink/+/67fcacf13ce922a762d7a1c6fb9e1b8e51e662ea This patch allows the embedder to build up a MediaStreamDescriptor before announcing it to JS. Also made a bit of refactoring to clean up the code in this area. 926778 1 211055 thiago.lacerda 2013-09-09 10:36:01 -0700 Created attachment 211055 Patch 926790 2 211055 eric.carlson 2013-09-09 10:50:55 -0700 Comment on attachment 211055 Patch This is not a complete merge of the blink patch. It can't be completed until bug 120872 lands. 926929 3 211097 thiago.lacerda 2013-09-09 15:01:33 -0700 Created attachment 211097 Patch 926979 4 thiago.lacerda 2013-09-09 16:07:22 -0700 Updating patch after https://bugs.webkit.org/show_bug.cgi?id=120872 and https://bugs.webkit.org/show_bug.cgi?id=121034 are landed 927278 5 211097 commit-queue 2013-09-10 06:29:12 -0700 Comment on attachment 211097 Patch Clearing flags on attachment: 211097 Committed r155434: <http://trac.webkit.org/changeset/155434> 927279 6 commit-queue 2013-09-10 06:29:14 -0700 All reviewed patches have been landed. Closing bug. 211055 2013-09-09 10:36:01 -0700 2013-09-09 15:01:26 -0700 Patch bug-120874-20130909143559.patch text/plain 6568 thiago.lacerda U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1MzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDU5MjAxM2Y0NjhlMjBl YmE1ZTYxMjIyZjA3MzJhNmRhMzlmODgzMS4uMTExN2Y1NjliNjdkZjI4N2I0ZTU4ZjI4MTA0ODVh NjJmNGVkNTg2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA5LTA5ICBUaGlh Z28gZGUgQmFycm9zIExhY2VyZGEgIDx0aGlhZ28ubGFjZXJkYUBvcGVuYm9zc2Eub3JnPgorCisg ICAgICAgIE1lZGlhU3RyZWFtIEFQSTogRW5oYW5jZSBNZWRpYVN0cmVhbURlc2NyaXB0b3IgYWRk L3JlbW92ZSBjb21wb25lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyMDg3NAorCisgICAgICAgIE1lcmdlZCBmcm9tIGJsaW5rIHBhdGNoCisgICAg ICAgIGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9ibGluay8rLzY3 ZmNhY2YxM2NlOTIyYTc2MmQ3YTFjNmZiOWUxYjhlNTFlNjYyZWEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisg ICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVN0cmVhbTo6YWRkVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFT dHJlYW06OnJlbW92ZVRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtOjphZGRS ZW1vdGVUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6cmVtb3ZlUmVtb3Rl VHJhY2spOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3Jp cHRvci5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjphZGRDb21w b25lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjpyZW1vdmVD b21wb25lbnQpOgorCiAyMDEzLTA5LTA5ICBIdWdvIFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFByZXBhcmluZyBXZWJDb3JlIHRvIHJlY2VpdmUgTml4 IFBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbS5jcHAKaW5kZXggNzMwNTJjYjFhMjA4Yzc2MGVhYzE5ZjRmZTJmMzVjNjQyNzg5Y2Y4Yi4u ZjAxMjYzZDU1ZjhiN2M0YjhmNGRlNzVhZjliMWIyZDJhY2JjZjQ2OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKQEAgLTE1NSwx NSArMTU1LDE0IEBAIHZvaWQgTWVkaWFTdHJlYW06OmFkZFRyYWNrKFBhc3NSZWZQdHI8TWVkaWFT dHJlYW1UcmFjaz4gcHJwVHJhY2ssIEV4Y2VwdGlvbkNvZGUmCiAKICAgICBzd2l0Y2ggKGNvbXBv bmVudC0+c291cmNlKCktPnR5cGUoKSkgewogICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3VyY2U6OlR5 cGVBdWRpbzoKLSAgICAgICAgbV9kZXNjcmlwdG9yLT5hZGRBdWRpb0NvbXBvbmVudChjb21wb25l bnQucmVsZWFzZSgpKTsKICAgICAgICAgbV9hdWRpb1RyYWNrcy5hcHBlbmQobmV3VHJhY2spOwog ICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW86Ci0g ICAgICAgIG1fZGVzY3JpcHRvci0+YWRkVmlkZW9Db21wb25lbnQoY29tcG9uZW50LnJlbGVhc2Uo KSk7CiAgICAgICAgIG1fdmlkZW9UcmFja3MuYXBwZW5kKG5ld1RyYWNrKTsKICAgICAgICAgYnJl YWs7CiAgICAgfQogCisgICAgbV9kZXNjcmlwdG9yLT5hZGRDb21wb25lbnQoY29tcG9uZW50LnJl bGVhc2UoKSk7CiAgICAgTWVkaWFTdHJlYW1DZW50ZXI6Omluc3RhbmNlKCkuZGlkQWRkTWVkaWFT dHJlYW1UcmFjayhtX2Rlc2NyaXB0b3IuZ2V0KCksIG5ld1RyYWNrLT5jb21wb25lbnQoKSk7CiB9 CiAKQEAgLTE4MSwyNCArMTgwLDIyIEBAIHZvaWQgTWVkaWFTdHJlYW06OnJlbW92ZVRyYWNrKFBh c3NSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gcHJwVHJhY2sgLCBFeGNlcHRpb25DCiAKICAgICBS ZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gdHJhY2sgPSBwcnBUcmFjazsKIAorICAgIHNpemVfdCBw b3MgPSBub3RGb3VuZDsKICAgICBzd2l0Y2ggKHRyYWNrLT5jb21wb25lbnQoKS0+c291cmNlKCkt PnR5cGUoKSkgewotICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVBdWRpbzogewotICAg ICAgICBzaXplX3QgcG9zID0gbV9hdWRpb1RyYWNrcy5maW5kKHRyYWNrKTsKLSAgICAgICAgaWYg KHBvcyAhPSBub3RGb3VuZCkgeworICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVBdWRp bzoKKyAgICAgICAgcG9zID0gbV9hdWRpb1RyYWNrcy5maW5kKHRyYWNrKTsKKyAgICAgICAgaWYg KHBvcyAhPSBub3RGb3VuZCkKICAgICAgICAgICAgIG1fYXVkaW9UcmFja3MucmVtb3ZlKHBvcyk7 Ci0gICAgICAgICAgICBtX2Rlc2NyaXB0b3ItPnJlbW92ZUF1ZGlvQ29tcG9uZW50KHRyYWNrLT5j b21wb25lbnQoKSk7Ci0gICAgICAgIH0KICAgICAgICAgYnJlYWs7Ci0gICAgfQotICAgIGNhc2Ug TWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVWaWRlbzogewotICAgICAgICBzaXplX3QgcG9zID0gbV92 aWRlb1RyYWNrcy5maW5kKHRyYWNrKTsKLSAgICAgICAgaWYgKHBvcyAhPSBub3RGb3VuZCkgewor ICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVWaWRlbzoKKyAgICAgICAgcG9zID0gbV92 aWRlb1RyYWNrcy5maW5kKHRyYWNrKTsKKyAgICAgICAgaWYgKHBvcyAhPSBub3RGb3VuZCkKICAg ICAgICAgICAgIG1fdmlkZW9UcmFja3MucmVtb3ZlKHBvcyk7Ci0gICAgICAgICAgICBtX2Rlc2Ny aXB0b3ItPnJlbW92ZVZpZGVvQ29tcG9uZW50KHRyYWNrLT5jb21wb25lbnQoKSk7Ci0gICAgICAg IH0KICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIH0KKworICAgIGlmIChwb3MgIT0gbm90Rm91 bmQpCisgICAgICAgIG1fZGVzY3JpcHRvci0+cmVtb3ZlQ29tcG9uZW50KHRyYWNrLT5jb21wb25l bnQoKSk7CiAKICAgICBpZiAoIW1fYXVkaW9UcmFja3Muc2l6ZSgpICYmICFtX3ZpZGVvVHJhY2tz LnNpemUoKSkKICAgICAgICAgbV9kZXNjcmlwdG9yLT5zZXRFbmRlZCgpOwpAQCAtMjg2LDYgKzI4 Myw3IEBAIHZvaWQgTWVkaWFTdHJlYW06OmFkZFJlbW90ZVRyYWNrKE1lZGlhU3RyZWFtQ29tcG9u ZW50KiBjb21wb25lbnQpCiAgICAgICAgIG1fdmlkZW9UcmFja3MuYXBwZW5kKHRyYWNrKTsKICAg ICAgICAgYnJlYWs7CiAgICAgfQorICAgIG1fZGVzY3JpcHRvci0+YWRkQ29tcG9uZW50KGNvbXBv bmVudCk7CiAKICAgICBzY2hlZHVsZURpc3BhdGNoRXZlbnQoTWVkaWFTdHJlYW1UcmFja0V2ZW50 OjpjcmVhdGUoZXZlbnROYW1lcygpLmFkZHRyYWNrRXZlbnQsIGZhbHNlLCBmYWxzZSwgdHJhY2sp KTsKIH0KQEAgLTMxNSw2ICszMTMsOCBAQCB2b2lkIE1lZGlhU3RyZWFtOjpyZW1vdmVSZW1vdGVU cmFjayhNZWRpYVN0cmVhbUNvbXBvbmVudCogY29tcG9uZW50KQogICAgIGlmIChpbmRleCA9PSBu b3RGb3VuZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgbV9kZXNjcmlwdG9yLT5yZW1vdmVDb21w b25lbnQoY29tcG9uZW50KTsKKwogICAgIFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPiB0cmFjayA9 ICgqdHJhY2tzKVtpbmRleF07CiAgICAgdHJhY2tzLT5yZW1vdmUoaW5kZXgpOwogICAgIHNjaGVk dWxlRGlzcGF0Y2hFdmVudChNZWRpYVN0cmVhbVRyYWNrRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVz KCkucmVtb3ZldHJhY2tFdmVudCwgZmFsc2UsIGZhbHNlLCB0cmFjaykpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9y LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2Ny aXB0b3IuaAppbmRleCA0ODMzOGUyZTIzMGI5ZTkzMDUzNzMzNjVlMWFiNjFmMjE4M2YwN2JlLi41 ODJlZTcwNTZjZWEwZjY5ZGM1NmM3ZTQ1MDc3MmE3OGExYTRjOGRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2Ny aXB0b3IuaApAQCAtNzQsMjIgKzc0LDM5IEBAIHB1YmxpYzoKIAogICAgIHVuc2lnbmVkIG51bWJl ck9mQXVkaW9Db21wb25lbnRzKCkgY29uc3QgeyByZXR1cm4gbV9hdWRpb0NvbXBvbmVudHMuc2l6 ZSgpOyB9CiAgICAgTWVkaWFTdHJlYW1Db21wb25lbnQqIGF1ZGlvQ29tcG9uZW50KHVuc2lnbmVk IGluZGV4KSBjb25zdCB7IHJldHVybiBtX2F1ZGlvQ29tcG9uZW50c1tpbmRleF0uZ2V0KCk7IH0K LSAgICB2b2lkIGFkZEF1ZGlvQ29tcG9uZW50KFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1Db21wb25l bnQ+IGNvbXBvbmVudCkgeyBtX2F1ZGlvQ29tcG9uZW50cy5hcHBlbmQoY29tcG9uZW50KTsgfQot ICAgIHZvaWQgcmVtb3ZlQXVkaW9Db21wb25lbnQoTWVkaWFTdHJlYW1Db21wb25lbnQqIGNvbXBv bmVudCkKLSAgICB7Ci0gICAgICAgIHNpemVfdCBwb3MgPSBtX2F1ZGlvQ29tcG9uZW50cy5maW5k KGNvbXBvbmVudCk7Ci0gICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpCi0gICAgICAgICAgICBt X2F1ZGlvQ29tcG9uZW50cy5yZW1vdmUocG9zKTsKLSAgICB9CiAKICAgICB1bnNpZ25lZCBudW1i ZXJPZlZpZGVvQ29tcG9uZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fdmlkZW9Db21wb25lbnRzLnNp emUoKTsgfQogICAgIE1lZGlhU3RyZWFtQ29tcG9uZW50KiB2aWRlb0NvbXBvbmVudCh1bnNpZ25l ZCBpbmRleCkgY29uc3QgeyByZXR1cm4gbV92aWRlb0NvbXBvbmVudHNbaW5kZXhdLmdldCgpOyB9 Ci0gICAgdm9pZCBhZGRWaWRlb0NvbXBvbmVudChQYXNzUmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9u ZW50PiBjb21wb25lbnQpIHsgbV92aWRlb0NvbXBvbmVudHMuYXBwZW5kKGNvbXBvbmVudCk7IH0K LSAgICB2b2lkIHJlbW92ZVZpZGVvQ29tcG9uZW50KE1lZGlhU3RyZWFtQ29tcG9uZW50KiBjb21w b25lbnQpCisKKyAgICB2b2lkIGFkZENvbXBvbmVudChQYXNzUmVmUHRyPE1lZGlhU3RyZWFtQ29t cG9uZW50PiBjb21wb25lbnQpCisgICAgeworICAgICAgICBzd2l0Y2ggKGNvbXBvbmVudC0+c291 cmNlKCktPnR5cGUoKSkgeworICAgICAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVk aW86CisgICAgICAgICAgICBpZiAobV9hdWRpb0NvbXBvbmVudHMuZmluZChjb21wb25lbnQpID09 IG5vdEZvdW5kKQorICAgICAgICAgICAgICAgIG1fYXVkaW9Db21wb25lbnRzLmFwcGVuZChjb21w b25lbnQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3Vy Y2U6OlR5cGVWaWRlbzoKKyAgICAgICAgICAgIGlmIChtX3ZpZGVvQ29tcG9uZW50cy5maW5kKGNv bXBvbmVudCkgPT0gbm90Rm91bmQpCisgICAgICAgICAgICAgICAgbV92aWRlb0NvbXBvbmVudHMu YXBwZW5kKGNvbXBvbmVudCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0K KworICAgIHZvaWQgcmVtb3ZlQ29tcG9uZW50KFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1Db21wb25l bnQ+IGNvbXBvbmVudCkKICAgICB7Ci0gICAgICAgIHNpemVfdCBwb3MgPSBtX3ZpZGVvQ29tcG9u ZW50cy5maW5kKGNvbXBvbmVudCk7Ci0gICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpCi0gICAg ICAgICAgICBtX3ZpZGVvQ29tcG9uZW50cy5yZW1vdmUocG9zKTsKKyAgICAgICAgc2l6ZV90IHBv cyA9IG5vdEZvdW5kOworICAgICAgICBzd2l0Y2ggKGNvbXBvbmVudC0+c291cmNlKCktPnR5cGUo KSkgeworICAgICAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVkaW86CisgICAgICAg ICAgICBwb3MgPSBtX2F1ZGlvQ29tcG9uZW50cy5maW5kKGNvbXBvbmVudCk7CisgICAgICAgICAg ICBpZiAocG9zICE9IG5vdEZvdW5kKQorICAgICAgICAgICAgICAgIG1fYXVkaW9Db21wb25lbnRz LnJlbW92ZShwb3MpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgTWVkaWFTdHJl YW1Tb3VyY2U6OlR5cGVWaWRlbzoKKyAgICAgICAgICAgIHBvcyA9IG1fdmlkZW9Db21wb25lbnRz LmZpbmQoY29tcG9uZW50KTsKKyAgICAgICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpCisgICAg ICAgICAgICAgICAgbV92aWRlb0NvbXBvbmVudHMucmVtb3ZlKHBvcyk7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGJvb2wgZW5kZWQoKSBjb25zdCB7IHJldHVy biBtX2VuZGVkOyB9Cg== 211097 2013-09-09 15:01:33 -0700 2013-09-10 06:29:12 -0700 Patch bug-120874-20130909190131.patch text/plain 7765 thiago.lacerda U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1Mzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBiNDZlYzY2MDI5YTNl ZmQ2M2ZjODQ1YTk0MDI3MWFlOThlYmFlNy4uMjZlYjc5MzljNTc4ZmViNmU3ZmY2NmFhNjg4ZWRm MDMyZjU3OWE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEzLTA5LTA5ICBUaGlh Z28gZGUgQmFycm9zIExhY2VyZGEgIDx0aGlhZ28ubGFjZXJkYUBvcGVuYm9zc2Eub3JnPgogCisg ICAgICAgIE1lZGlhU3RyZWFtIEFQSTogRW5oYW5jZSBNZWRpYVN0cmVhbURlc2NyaXB0b3IgYWRk L3JlbW92ZSBjb21wb25lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyMDg3NAorCisgICAgICAgIE1lcmdlIGJsaW5rIGh0dHBzOi8vY2hyb21pdW0u Z29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9ibGluay8rLzY3ZmNhY2YxM2NlOTIyYTc2MmQ3YTFj NmZiOWUxYjhlNTFlNjYyZWEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6 YWRkVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06OnJlbW92ZVRyYWNrKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtOjphZGRSZW1vdGVUcmFjayk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6cmVtb3ZlUmVtb3RlVHJhY2spOgorICAgICAgICAqIHBs YXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yOjphZGRSZW1vdGVUcmFjayk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3I6OnJlbW92ZVJlbW90ZVRyYWNrKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6YWRkQ29tcG9uZW50KToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6cmVtb3ZlQ29tcG9uZW50KToKKwor MjAxMy0wOS0wOSAgVGhpYWdvIGRlIEJhcnJvcyBMYWNlcmRhICA8dGhpYWdvLmxhY2VyZGFAb3Bl bmJvc3NhLm9yZz4KKwogICAgICAgICBbQnVnIEZpeF0gQ2FsbGluZyBtX2F1ZGlvQ29tcG9uZW50 cy5yZW1vdmUgaW4gcmVtb3ZlQXVkaW9Db21wb25lbnQgKE1lZGlhU3RyZWFtRGVzY3JpcHRvcikK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTAzNAog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0u Y3BwCmluZGV4IGQxYTYwYTc1ZGEzMzFlZGUzMDk1M2Q1OTI5OGNiNWQyMjQ4YTgwMTYuLjIxYzhm Y2RmYzY4OTVmOWE4ZTc0YTQyNmU3MWQ4ZWE2NmRkNWFiZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwCkBAIC0xNTUsMTUgKzE1 NSwxNCBAQCB2b2lkIE1lZGlhU3RyZWFtOjphZGRUcmFjayhQYXNzUmVmUHRyPE1lZGlhU3RyZWFt VHJhY2s+IHBycFRyYWNrLCBFeGNlcHRpb25Db2RlJgogCiAgICAgc3dpdGNoIChjb21wb25lbnQt PnNvdXJjZSgpLT50eXBlKCkpIHsKICAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVk aW86Ci0gICAgICAgIG1fZGVzY3JpcHRvci0+YWRkQXVkaW9Db21wb25lbnQoY29tcG9uZW50LnJl bGVhc2UoKSk7CiAgICAgICAgIG1fYXVkaW9UcmFja3MuYXBwZW5kKG5ld1RyYWNrKTsKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBNZWRpYVN0cmVhbVNvdXJjZTo6VHlwZVZpZGVvOgotICAgICAg ICBtX2Rlc2NyaXB0b3ItPmFkZFZpZGVvQ29tcG9uZW50KGNvbXBvbmVudC5yZWxlYXNlKCkpOwog ICAgICAgICBtX3ZpZGVvVHJhY2tzLmFwcGVuZChuZXdUcmFjayk7CiAgICAgICAgIGJyZWFrOwog ICAgIH0KIAorICAgIG1fZGVzY3JpcHRvci0+YWRkQ29tcG9uZW50KGNvbXBvbmVudC5yZWxlYXNl KCkpOwogICAgIE1lZGlhU3RyZWFtQ2VudGVyOjppbnN0YW5jZSgpLmRpZEFkZE1lZGlhU3RyZWFt VHJhY2sobV9kZXNjcmlwdG9yLmdldCgpLCBuZXdUcmFjay0+Y29tcG9uZW50KCkpOwogfQogCkBA IC0xODEsMjQgKzE4MCwyNCBAQCB2b2lkIE1lZGlhU3RyZWFtOjpyZW1vdmVUcmFjayhQYXNzUmVm UHRyPE1lZGlhU3RyZWFtVHJhY2s+IHBycFRyYWNrLCBFeGNlcHRpb25DbwogCiAgICAgUmVmUHRy PE1lZGlhU3RyZWFtVHJhY2s+IHRyYWNrID0gcHJwVHJhY2s7CiAKKyAgICBzaXplX3QgcG9zID0g bm90Rm91bmQ7CiAgICAgc3dpdGNoICh0cmFjay0+Y29tcG9uZW50KCktPnNvdXJjZSgpLT50eXBl KCkpIHsKLSAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVkaW86IHsKLSAgICAgICAg c2l6ZV90IHBvcyA9IG1fYXVkaW9UcmFja3MuZmluZCh0cmFjayk7Ci0gICAgICAgIGlmIChwb3Mg IT0gbm90Rm91bmQpIHsKKyAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVkaW86Cisg ICAgICAgIHBvcyA9IG1fYXVkaW9UcmFja3MuZmluZCh0cmFjayk7CisgICAgICAgIGlmIChwb3Mg IT0gbm90Rm91bmQpCiAgICAgICAgICAgICBtX2F1ZGlvVHJhY2tzLnJlbW92ZShwb3MpOwotICAg ICAgICAgICAgbV9kZXNjcmlwdG9yLT5yZW1vdmVBdWRpb0NvbXBvbmVudCh0cmFjay0+Y29tcG9u ZW50KCkpOwotICAgICAgICB9CiAgICAgICAgIGJyZWFrOwotICAgIH0KLSAgICBjYXNlIE1lZGlh U3RyZWFtU291cmNlOjpUeXBlVmlkZW86IHsKLSAgICAgICAgc2l6ZV90IHBvcyA9IG1fdmlkZW9U cmFja3MuZmluZCh0cmFjayk7Ci0gICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpIHsKKyAgICBj YXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW86CisgICAgICAgIHBvcyA9IG1fdmlkZW9U cmFja3MuZmluZCh0cmFjayk7CisgICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpCiAgICAgICAg ICAgICBtX3ZpZGVvVHJhY2tzLnJlbW92ZShwb3MpOwotICAgICAgICAgICAgbV9kZXNjcmlwdG9y LT5yZW1vdmVWaWRlb0NvbXBvbmVudCh0cmFjay0+Y29tcG9uZW50KCkpOwotICAgICAgICB9CiAg ICAgICAgIGJyZWFrOwogICAgIH0KLSAgICB9CisKKyAgICBpZiAocG9zID09IG5vdEZvdW5kKQor ICAgICAgICByZXR1cm47CisKKyAgICBtX2Rlc2NyaXB0b3ItPnJlbW92ZUNvbXBvbmVudCh0cmFj ay0+Y29tcG9uZW50KCkpOwogCiAgICAgaWYgKCFtX2F1ZGlvVHJhY2tzLnNpemUoKSAmJiAhbV92 aWRlb1RyYWNrcy5zaXplKCkpCiAgICAgICAgIG1fZGVzY3JpcHRvci0+c2V0RW5kZWQoKTsKQEAg LTI4MCwxNCArMjc5LDEzIEBAIHZvaWQgTWVkaWFTdHJlYW06OmFkZFJlbW90ZVRyYWNrKE1lZGlh U3RyZWFtQ29tcG9uZW50KiBjb21wb25lbnQpCiAgICAgUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+ IHRyYWNrID0gTWVkaWFTdHJlYW1UcmFjazo6Y3JlYXRlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQo KSwgY29tcG9uZW50KTsKICAgICBzd2l0Y2ggKGNvbXBvbmVudC0+c291cmNlKCktPnR5cGUoKSkg ewogICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVBdWRpbzoKLSAgICAgICAgbV9kZXNj cmlwdG9yLT5hZGRBdWRpb0NvbXBvbmVudChjb21wb25lbnQpOwogICAgICAgICBtX2F1ZGlvVHJh Y2tzLmFwcGVuZCh0cmFjayk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFTdHJlYW1T b3VyY2U6OlR5cGVWaWRlbzoKLSAgICAgICAgbV9kZXNjcmlwdG9yLT5hZGRWaWRlb0NvbXBvbmVu dChjb21wb25lbnQpOwogICAgICAgICBtX3ZpZGVvVHJhY2tzLmFwcGVuZCh0cmFjayk7CiAgICAg ICAgIGJyZWFrOwogICAgIH0KKyAgICBtX2Rlc2NyaXB0b3ItPmFkZENvbXBvbmVudChjb21wb25l bnQpOwogCiAgICAgc2NoZWR1bGVEaXNwYXRjaEV2ZW50KE1lZGlhU3RyZWFtVHJhY2tFdmVudDo6 Y3JlYXRlKGV2ZW50TmFtZXMoKS5hZGR0cmFja0V2ZW50LCBmYWxzZSwgZmFsc2UsIHRyYWNrKSk7 CiB9CkBAIC0zMTcsMTQgKzMxNSw3IEBAIHZvaWQgTWVkaWFTdHJlYW06OnJlbW92ZVJlbW90ZVRy YWNrKE1lZGlhU3RyZWFtQ29tcG9uZW50KiBjb21wb25lbnQpCiAgICAgaWYgKGluZGV4ID09IG5v dEZvdW5kKQogICAgICAgICByZXR1cm47CiAKLSAgICBzd2l0Y2ggKGNvbXBvbmVudC0+c291cmNl KCktPnR5cGUoKSkgewotICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVBdWRpbzoKLSAg ICAgICAgbV9kZXNjcmlwdG9yLT5yZW1vdmVBdWRpb0NvbXBvbmVudChjb21wb25lbnQpOwotICAg ICAgICBicmVhazsKLSAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW86Ci0gICAg ICAgIG1fZGVzY3JpcHRvci0+cmVtb3ZlQXVkaW9Db21wb25lbnQoY29tcG9uZW50KTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgfQorICAgIG1fZGVzY3JpcHRvci0+cmVtb3ZlQ29tcG9uZW50KGNvbXBv bmVudCk7CiAKICAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gdHJhY2sgPSAoKnRyYWNrcylb aW5kZXhdOwogICAgIHRyYWNrcy0+cmVtb3ZlKGluZGV4KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgK aW5kZXggZjNiNWE3YzkzMGY3ZGQzZThkMDY3Y2ViYmViMmEzOWYyMGJkZjhhYy4uM2EwYWNiYTBk N2NlYzhlY2EyNjYzY2MzYTdmY2E0NjE3OTM5MmZkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgK QEAgLTc0LDM0ICs3NCw1NSBAQCBwdWJsaWM6CiAKICAgICB1bnNpZ25lZCBudW1iZXJPZkF1ZGlv Q29tcG9uZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fYXVkaW9Db21wb25lbnRzLnNpemUoKTsgfQog ICAgIE1lZGlhU3RyZWFtQ29tcG9uZW50KiBhdWRpb0NvbXBvbmVudCh1bnNpZ25lZCBpbmRleCkg Y29uc3QgeyByZXR1cm4gbV9hdWRpb0NvbXBvbmVudHNbaW5kZXhdLmdldCgpOyB9Ci0gICAgdm9p ZCBhZGRBdWRpb0NvbXBvbmVudChQYXNzUmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9uZW50PiBjb21w b25lbnQpIHsgbV9hdWRpb0NvbXBvbmVudHMuYXBwZW5kKGNvbXBvbmVudCk7IH0KLSAgICB2b2lk IHJlbW92ZUF1ZGlvQ29tcG9uZW50KE1lZGlhU3RyZWFtQ29tcG9uZW50KiBjb21wb25lbnQpCi0g ICAgewotICAgICAgICBzaXplX3QgcG9zID0gbV9hdWRpb0NvbXBvbmVudHMuZmluZChjb21wb25l bnQpOwotICAgICAgICBpZiAocG9zICE9IG5vdEZvdW5kKQotICAgICAgICAgICAgbV9hdWRpb0Nv bXBvbmVudHMucmVtb3ZlKHBvcyk7Ci0gICAgfQogCiAgICAgdm9pZCBhZGRSZW1vdGVUcmFjayhN ZWRpYVN0cmVhbUNvbXBvbmVudCogY29tcG9uZW50KQogICAgIHsKICAgICAgICAgaWYgKG1fY2xp ZW50KQogICAgICAgICAgICAgbV9jbGllbnQtPmFkZFJlbW90ZVRyYWNrKGNvbXBvbmVudCk7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIGFkZENvbXBvbmVudChjb21wb25lbnQpOwogICAgIH0K IAogICAgIHZvaWQgcmVtb3ZlUmVtb3RlVHJhY2soTWVkaWFTdHJlYW1Db21wb25lbnQqIGNvbXBv bmVudCkKICAgICB7CiAgICAgICAgIGlmIChtX2NsaWVudCkKICAgICAgICAgICAgIG1fY2xpZW50 LT5yZW1vdmVSZW1vdGVUcmFjayhjb21wb25lbnQpOworICAgICAgICBlbHNlCisgICAgICAgICAg ICByZW1vdmVDb21wb25lbnQoY29tcG9uZW50KTsKICAgICB9CiAKICAgICB1bnNpZ25lZCBudW1i ZXJPZlZpZGVvQ29tcG9uZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fdmlkZW9Db21wb25lbnRzLnNp emUoKTsgfQogICAgIE1lZGlhU3RyZWFtQ29tcG9uZW50KiB2aWRlb0NvbXBvbmVudCh1bnNpZ25l ZCBpbmRleCkgY29uc3QgeyByZXR1cm4gbV92aWRlb0NvbXBvbmVudHNbaW5kZXhdLmdldCgpOyB9 Ci0gICAgdm9pZCBhZGRWaWRlb0NvbXBvbmVudChQYXNzUmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9u ZW50PiBjb21wb25lbnQpIHsgbV92aWRlb0NvbXBvbmVudHMuYXBwZW5kKGNvbXBvbmVudCk7IH0K LSAgICB2b2lkIHJlbW92ZVZpZGVvQ29tcG9uZW50KE1lZGlhU3RyZWFtQ29tcG9uZW50KiBjb21w b25lbnQpCisKKyAgICB2b2lkIGFkZENvbXBvbmVudChQYXNzUmVmUHRyPE1lZGlhU3RyZWFtQ29t cG9uZW50PiBjb21wb25lbnQpCisgICAgeworICAgICAgICBzd2l0Y2ggKGNvbXBvbmVudC0+c291 cmNlKCktPnR5cGUoKSkgeworICAgICAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVk aW86CisgICAgICAgICAgICBpZiAobV9hdWRpb0NvbXBvbmVudHMuZmluZChjb21wb25lbnQpID09 IG5vdEZvdW5kKQorICAgICAgICAgICAgICAgIG1fYXVkaW9Db21wb25lbnRzLmFwcGVuZChjb21w b25lbnQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgTWVkaWFTdHJlYW1Tb3Vy Y2U6OlR5cGVWaWRlbzoKKyAgICAgICAgICAgIGlmIChtX3ZpZGVvQ29tcG9uZW50cy5maW5kKGNv bXBvbmVudCkgPT0gbm90Rm91bmQpCisgICAgICAgICAgICAgICAgbV92aWRlb0NvbXBvbmVudHMu YXBwZW5kKGNvbXBvbmVudCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0K KworICAgIHZvaWQgcmVtb3ZlQ29tcG9uZW50KFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1Db21wb25l bnQ+IGNvbXBvbmVudCkKICAgICB7Ci0gICAgICAgIHNpemVfdCBwb3MgPSBtX3ZpZGVvQ29tcG9u ZW50cy5maW5kKGNvbXBvbmVudCk7Ci0gICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpCi0gICAg ICAgICAgICBtX3ZpZGVvQ29tcG9uZW50cy5yZW1vdmUocG9zKTsKKyAgICAgICAgc2l6ZV90IHBv cyA9IG5vdEZvdW5kOworICAgICAgICBzd2l0Y2ggKGNvbXBvbmVudC0+c291cmNlKCktPnR5cGUo KSkgeworICAgICAgICBjYXNlIE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVkaW86CisgICAgICAg ICAgICBwb3MgPSBtX2F1ZGlvQ29tcG9uZW50cy5maW5kKGNvbXBvbmVudCk7CisgICAgICAgICAg ICBpZiAocG9zICE9IG5vdEZvdW5kKQorICAgICAgICAgICAgICAgIG1fYXVkaW9Db21wb25lbnRz LnJlbW92ZShwb3MpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgTWVkaWFTdHJl YW1Tb3VyY2U6OlR5cGVWaWRlbzoKKyAgICAgICAgICAgIHBvcyA9IG1fdmlkZW9Db21wb25lbnRz LmZpbmQoY29tcG9uZW50KTsKKyAgICAgICAgICAgIGlmIChwb3MgIT0gbm90Rm91bmQpCisgICAg ICAgICAgICAgICAgbV92aWRlb0NvbXBvbmVudHMucmVtb3ZlKHBvcyk7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGJvb2wgZW5kZWQoKSBjb25zdCB7IHJldHVy biBtX2VuZGVkOyB9Cg==