121941 2013-09-25 22:02:39 -0700 [MediaStream API] update SourceInfo object to match spec 2013-11-14 07:39:04 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 124288 1 eric.carlson eric.carlson cdumez commit-queue dino esprehn+autocc glenn hta jer.noble kondapallykalyan thiago.lacerda tommyw oldest_to_newest 933361 0 eric.carlson 2013-09-25 22:02:39 -0700 ISSUES: id should be sourceId kind should be only "video" or "audio" facing is non-standard <rdar://problem/15022522> 933996 1 212820 eric.carlson 2013-09-27 10:31:25 -0700 Created attachment 212820 Proposed patch 934003 2 eric.carlson 2013-09-27 10:41:50 -0700 Committed r156554: https://trac.webkit.org/r156554 212820 2013-09-27 10:31:25 -0700 2013-09-27 10:41:58 -0700 Proposed patch update_source_info_2.txt text/plain 13651 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjU1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA5LTI3ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbSBB UEldIHVwZGF0ZSBTb3VyY2VJbmZvIG9iamVjdCB0byBtYXRjaCBzcGVjCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE5NDEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGV4aXN0aW5n IHRlc3QgdXBkYXRlZC4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vU291cmNlSW5m by5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VJbmZvOjpraW5kKTogR2V0IHJpZCBvZiAi bm9uZSIuCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9Tb3VyY2VJbmZvLmg6CisgICAg ICAgIChXZWJDb3JlOjpTb3VyY2VJbmZvOjpzb3VyY2VJZCk6IFJlbmFtZWQgZnJvbSAiaWQiLgor ICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vU291cmNlSW5mby5pZGw6CisKKyAgICAgICAg KiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrU291cmNlc1JlcXVlc3RDbGll bnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYWNrU291cmNlSW5mbzo6Y3JlYXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OlRyYWNrU291cmNlSW5mbzo6a2luZCk6CisgICAgICAgIChXZWJDb3JlOjpU cmFja1NvdXJjZUluZm86OlRyYWNrU291cmNlSW5mbyk6CisKKyAgICAgICAgKiBwbGF0Zm9ybS9t b2NrL01vY2tNZWRpYVN0cmVhbUNlbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNb2NrTWVk aWFTdHJlYW1DZW50ZXI6OmdldE1lZGlhU3RyZWFtVHJhY2tTb3VyY2VzKTogImZhY2luZyIgaXNu J3QgYSBwYXJ0IG9mIHNvdXJjZUluZm8uCisgICAgICAgICAgICBSZXR1cm4gYSBub24tTlVMTCBJ RCBiZWNhdXNlIGEgc291cmNlIG11c3QgYWx3YXlzIGhhdmUgb25lLgorCiAyMDEzLTA5LTI2ICBE YXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICByZW5hbWUgS1VSTCB0byBV UkwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vU291cmNlSW5mby5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Tb3Vy Y2VJbmZvLmNwcAkocmV2aXNpb24gMTU2NTIxKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9Tb3VyY2VJbmZvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsNiBA QCBTb3VyY2VJbmZvOjpTb3VyY2VJbmZvKFBhc3NSZWZQdHI8VHJhY2tTCiAKIGNvbnN0IEF0b21p Y1N0cmluZyYgU291cmNlSW5mbzo6a2luZCgpIGNvbnN0CiB7Ci0gICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPEF0b21pY1N0cmluZz4gbm9uZSgibm9uZSIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0 RnJvbUxpdGVyYWwpOwogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxBdG9taWNTdHJpbmc+IGF1 ZGlvS2luZCgiYXVkaW8iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKICAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8QXRvbWljU3RyaW5nPiB2aWRlb0tpbmQoInZpZGVvIiwg QXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7CiAKQEAgLTU0LDMyICs1Myw2IEBA IGNvbnN0IEF0b21pY1N0cmluZyYgU291cmNlSW5mbzo6a2luZCgpIGMKICAgICAgICAgcmV0dXJu IGF1ZGlvS2luZDsKICAgICBjYXNlIFRyYWNrU291cmNlSW5mbzo6VmlkZW86CiAgICAgICAgIHJl dHVybiB2aWRlb0tpbmQ7Ci0gICAgY2FzZSBUcmFja1NvdXJjZUluZm86Ok5vbmU6Ci0gICAgICAg IHJldHVybiBub25lOwotICAgIH0KLQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJl dHVybiBlbXB0eUF0b207Ci19Ci0KLWNvbnN0IEF0b21pY1N0cmluZyYgU291cmNlSW5mbzo6ZmFj aW5nKCkgY29uc3QKLXsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8QXRvbWljU3RyaW5nPiB1 c2VyRmFjaW5nKCJ1c2VyIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7Ci0g ICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEF0b21pY1N0cmluZz4gZW52aXJvbm1lbnRGYWNpbmco ImVudmlyb25tZW50IiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7Ci0gICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPEF0b21pY1N0cmluZz4gbGVmdEZhY2luZygibGVmdCIsIEF0 b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpOwotICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxBdG9taWNTdHJpbmc+IHJpZ2h0RmFjaW5nKCJyaWdodCIsIEF0b21pY1N0cmluZzo6Q29u c3RydWN0RnJvbUxpdGVyYWwpOwotCi0gICAgc3dpdGNoIChtX3RyYWNrU291cmNlSW5mby0+ZmFj aW5nKCkpIHsKLSAgICBjYXNlIFRyYWNrU291cmNlSW5mbzo6Tm9uZToKLSAgICAgICAgcmV0dXJu IGVtcHR5QXRvbTsKLSAgICBjYXNlIFRyYWNrU291cmNlSW5mbzo6VXNlcjoKLSAgICAgICAgcmV0 dXJuIHVzZXJGYWNpbmc7Ci0gICAgY2FzZSBUcmFja1NvdXJjZUluZm86OkVudmlyb25tZW50Ogot ICAgICAgICByZXR1cm4gZW52aXJvbm1lbnRGYWNpbmc7Ci0gICAgY2FzZSBUcmFja1NvdXJjZUlu Zm86OkxlZnQ6Ci0gICAgICAgIHJldHVybiBsZWZ0RmFjaW5nOwotICAgIGNhc2UgVHJhY2tTb3Vy Y2VJbmZvOjpSaWdodDoKLSAgICAgICAgcmV0dXJuIHJpZ2h0RmFjaW5nOwogICAgIH0KIAogICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9Tb3VyY2VJbmZvLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9Tb3VyY2VJbmZvLmgJKHJldmlzaW9uIDE1NjUyMSkKKysrIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vU291cmNlSW5mby5oCSh3b3JraW5nIGNvcHkpCkBA IC00MiwxMCArNDIsOSBAQCBjbGFzcyBTb3VyY2VJbmZvIDogcHVibGljIFJlZkNvdW50ZWQ8U291 CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U291cmNlSW5mbz4gY3JlYXRlKFBhc3NS ZWZQdHI8VHJhY2tTb3VyY2VJbmZvPik7CiAKLSAgICBjb25zdCBBdG9taWNTdHJpbmcmIGlkKCkg Y29uc3QgeyByZXR1cm4gbV90cmFja1NvdXJjZUluZm8tPmlkKCk7IH0KKyAgICBjb25zdCBBdG9t aWNTdHJpbmcmIHNvdXJjZUlkKCkgY29uc3QgeyByZXR1cm4gbV90cmFja1NvdXJjZUluZm8tPmlk KCk7IH0KICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGxhYmVsKCkgY29uc3QgeyByZXR1cm4gbV90 cmFja1NvdXJjZUluZm8tPmxhYmVsKCk7IH0KICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGtpbmQo KSBjb25zdDsKLSAgICBjb25zdCBBdG9taWNTdHJpbmcmIGZhY2luZygpIGNvbnN0OwogCiBwcml2 YXRlOgogICAgIFNvdXJjZUluZm8oUGFzc1JlZlB0cjxUcmFja1NvdXJjZUluZm8+KTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vU291cmNlSW5mby5pZGwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Tb3VyY2VJbmZvLmlk bAkocmV2aXNpb24gMTU2NTIxKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9Tb3VyY2VJbmZvLmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjgsOCArMjgsNyBAQAogICAgIE5v SW50ZXJmYWNlT2JqZWN0LAogICAgIENvbmRpdGlvbmFsPU1FRElBX1NUUkVBTSwKIF0gaW50ZXJm YWNlIFNvdXJjZUluZm8gewotICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgaWQ7Cisg ICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyBzb3VyY2VJZDsKICAgICByZWFkb25seSBh dHRyaWJ1dGUgRE9NU3RyaW5nIGtpbmQ7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmlu ZyBsYWJlbDsKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGZhY2luZzsKIH07Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNr U291cmNlc1JlcXVlc3RDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrU291cmNlc1JlcXVlc3RDbGllbnQuaAko cmV2aXNpb24gMTU2NTIxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW1UcmFja1NvdXJjZXNSZXF1ZXN0Q2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAg LTM2LDMyICszNiwyOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFRyYWNrU291cmNl SW5mbyA6IHB1YmxpYyBSZWZDb3VudGVkPFRyYWNrU291cmNlSW5mbz4gewogcHVibGljOgotICAg IGVudW0gU291cmNlS2luZCB7IE5vU291cmNlLCBBdWRpbywgVmlkZW8gfTsKLSAgICBlbnVtIFZp ZGVvRmFjaW5nTW9kZSB7IE5vbmUsIFVzZXIsIEVudmlyb25tZW50LCBMZWZ0LCBSaWdodCB9Owor ICAgIGVudW0gU291cmNlS2luZCB7IEF1ZGlvLCBWaWRlbyB9OwogCi0gICAgc3RhdGljIFBhc3NS ZWZQdHI8VHJhY2tTb3VyY2VJbmZvPiBjcmVhdGUoY29uc3QgQXRvbWljU3RyaW5nJiBpZCwgU291 cmNlS2luZCBraW5kLCBjb25zdCBBdG9taWNTdHJpbmcmIGxhYmVsLCBWaWRlb0ZhY2luZ01vZGUg ZmFjaW5nKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFRyYWNrU291cmNlSW5mbz4gY3JlYXRlKGNv bnN0IEF0b21pY1N0cmluZyYgaWQsIFNvdXJjZUtpbmQga2luZCwgY29uc3QgQXRvbWljU3RyaW5n JiBsYWJlbCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgVHJhY2tTb3VyY2VJ bmZvKGlkLCBraW5kLCBsYWJlbCwgZmFjaW5nKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihu ZXcgVHJhY2tTb3VyY2VJbmZvKGlkLCBraW5kLCBsYWJlbCkpOwogICAgIH0KIAogICAgIGNvbnN0 IEF0b21pY1N0cmluZyYgaWQoKSBjb25zdCB7IHJldHVybiBtX2lkOyB9CiAgICAgY29uc3QgQXRv bWljU3RyaW5nJiBsYWJlbCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFiZWw7IH0KICAgICBTb3VyY2VL aW5kIGtpbmQoKSBjb25zdCB7IHJldHVybiBtX2tpbmQ7IH0KLSAgICBWaWRlb0ZhY2luZ01vZGUg ZmFjaW5nKCkgY29uc3QgeyByZXR1cm4gbV9mYWNpbmc7IH0KIAogcHJpdmF0ZToKLSAgICBUcmFj a1NvdXJjZUluZm8oY29uc3QgQXRvbWljU3RyaW5nJiBpZCwgU291cmNlS2luZCBraW5kLCBjb25z dCBBdG9taWNTdHJpbmcmIGxhYmVsLCBWaWRlb0ZhY2luZ01vZGUgZmFjaW5nKQorICAgIFRyYWNr U291cmNlSW5mbyhjb25zdCBBdG9taWNTdHJpbmcmIGlkLCBTb3VyY2VLaW5kIGtpbmQsIGNvbnN0 IEF0b21pY1N0cmluZyYgbGFiZWwpCiAgICAgICAgIDogbV9pZChpZCkKICAgICAgICAgLCBtX2tp bmQoa2luZCkKICAgICAgICAgLCBtX2xhYmVsKGxhYmVsKQotICAgICAgICAsIG1fZmFjaW5nKGZh Y2luZykKICAgICB7CiAgICAgfQogICAgIAogICAgIEF0b21pY1N0cmluZyBtX2lkOwogICAgIFNv dXJjZUtpbmQgbV9raW5kOwogICAgIEF0b21pY1N0cmluZyBtX2xhYmVsOwotICAgIFZpZGVvRmFj aW5nTW9kZSBtX2ZhY2luZzsKIH07CiAKIGNsYXNzIE1lZGlhU3RyZWFtVHJhY2tTb3VyY2VzUmVx dWVzdENsaWVudCA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhU3RyZWFtVHJhY2tTb3VyY2VzUmVx dWVzdENsaWVudD4gewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrTWVk aWFTdHJlYW1DZW50ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21vY2svTW9ja01lZGlhU3RyZWFtQ2VudGVyLmNwcAkocmV2aXNpb24gMTU2NTIyKQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrTWVkaWFTdHJlYW1DZW50ZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNTUsOCArMTU1LDggQEAgYm9vbCBNb2NrTWVkaWFTdHJlYW1DZW50ZXI6 OmdldE1lZGlhU3RyZQogICAgIFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrU291cmNlc1JlcXVlc3RD bGllbnQ+IHJlcXVlc3RDbGllbnQgPSBwcnBDbGllbnQ7CiAgICAgVmVjdG9yPFJlZlB0cjxUcmFj a1NvdXJjZUluZm8+PiBzb3VyY2VzKDIpOwogCi0gICAgc291cmNlc1swXSA9IFRyYWNrU291cmNl SW5mbzo6Y3JlYXRlKGVtcHR5U3RyaW5nKCksIFRyYWNrU291cmNlSW5mbzo6QXVkaW8sICJNb2Nr IGF1ZGlvIGRldmljZSIsIFRyYWNrU291cmNlSW5mbzo6Tm9uZSk7Ci0gICAgc291cmNlc1sxXSA9 IFRyYWNrU291cmNlSW5mbzo6Y3JlYXRlKGVtcHR5U3RyaW5nKCksIFRyYWNrU291cmNlSW5mbzo6 VmlkZW8sICJNb2NrIHZpZGVvIGRldmljZSIsIFRyYWNrU291cmNlSW5mbzo6RW52aXJvbm1lbnQp OworICAgIHNvdXJjZXNbMF0gPSBUcmFja1NvdXJjZUluZm86OmNyZWF0ZSgiTW9ja19hdWRpb19k ZXZpY2VfSUQiLCBUcmFja1NvdXJjZUluZm86OkF1ZGlvLCAiTW9jayBhdWRpbyBkZXZpY2UiKTsK KyAgICBzb3VyY2VzWzFdID0gVHJhY2tTb3VyY2VJbmZvOjpjcmVhdGUoIk1vY2tfdmlkZW9fZGV2 aWNlX0lEIiwgVHJhY2tTb3VyY2VJbmZvOjpWaWRlbywgIk1vY2sgdmlkZW8gZGV2aWNlIik7CiAK ICAgICByZXF1ZXN0Q2xpZW50LT5kaWRDb21wbGV0ZVJlcXVlc3Qoc291cmNlcyk7CiAgICAgcmV0 dXJuIHRydWU7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTY1NTEpCisrKyBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wOS0yNyAgRXJpYyBD YXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWVkaWFTdHJlYW0g QVBJXSB1cGRhdGUgU291cmNlSW5mbyBvYmplY3QgdG8gbWF0Y2ggc3BlYworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxOTQxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL01l ZGlhU3RyZWFtVHJhY2stZ2V0U291cmNlcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLWdldFNvdXJjZXMuaHRtbDoKKwogMjAxMy0wOS0y NyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvLnByYWRhQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtHVEtdIEdUSyBkb2VzIG5vdCBleHBvc2UgaGVhZGluZyBsZXZlbCBjb3JyZWN0bHkuIFdh czogYWNjZXNzaWJpbGl0eS9oZWFkaW5nLWxldmVsLmh0bWwgaXMgZmFpbGluZwpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLWdldFNvdXJjZXMtZXhw ZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1UcmFjay1nZXRTb3VyY2VzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTU2NTIxKQor KysgTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLWdldFNvdXJj ZXMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zLDE1ICszLDMxIEBAIFRlc3RzIE1l ZGlhU3RyZWFtVHJhY2s6OmdldFNvdXJjZXMuCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBz ZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAK IAorCisqKiogY2FsbGluZyBNZWRpYVN0cmVhbVRyYWNrLmdldFNvdXJjZXMoKSAqKioKIFBBU1Mg TWVkaWFTdHJlYW1UcmFjay5nZXRTb3VyY2VzKGdvdFNvdXJjZXMxKTsgZGlkIG5vdCB0aHJvdyBl eGNlcHRpb24uCi1QQVNTIGdvdFNvdXJjZXMxIHdhcyBjYWxsZWQuCi1QQVNTIHNvdXJjZXMubGVu Z3RoID4gMCBpcyB0cnVlCi1QQVNTIGdvdFN0cmVhbSB3YXMgY2FsbGVkLgorUEFTUyBjYWxsYmFj ayBjYWxsZWQuCitzb3VyY2VzMVswXS5zb3VyY2VJZCA9ICJNb2NrX2F1ZGlvX2RldmljZV9JRCIK K3NvdXJjZXMxWzBdLmxhYmVsID0gIk1vY2sgYXVkaW8gZGV2aWNlIgorc291cmNlczFbMF0ua2lu ZCA9ICJhdWRpbyIKK3NvdXJjZXMxWzFdLnNvdXJjZUlkID0gIk1vY2tfdmlkZW9fZGV2aWNlX0lE Igorc291cmNlczFbMV0ubGFiZWwgPSAiTW9jayB2aWRlbyBkZXZpY2UiCitzb3VyY2VzMVsxXS5r aW5kID0gInZpZGVvIgorCisqKiogY2FsbGluZyBuYXZpZ2F0b3Iud2Via2l0R2V0VXNlck1lZGlh KCkgKioqCitQQVNTIG5hdmlnYXRvci53ZWJraXRHZXRVc2VyTWVkaWEoY29uc3RyYWludHMsIGNh bGxiYWNrLCBlcnJvcikgZGlkIG5vdCB0aHJvdyBleGNlcHRpb24uCitQQVNTIGNhbGxiYWNrIGNh bGxlZC4KKworKioqIGNhbGxpbmcgTWVkaWFTdHJlYW1UcmFjay5nZXRTb3VyY2VzKCkgKioqCiBQ QVNTIE1lZGlhU3RyZWFtVHJhY2suZ2V0U291cmNlcyhnb3RTb3VyY2VzMik7IGRpZCBub3QgdGhy b3cgZXhjZXB0aW9uLgotUEFTUyBnb3RTb3VyY2VzMiB3YXMgY2FsbGVkLgotUEFTUyBzb3VyY2Vz Lmxlbmd0aCA+IDAgaXMgdHJ1ZQotUEFTUyBzb3VyY2VzWzBdLmlkID09PSBwcmV2aW91c0lkIGlz IHRydWUKLVBBU1Mgc291cmNlc1swXS5sYWJlbC5sZW5ndGggPiAwIGlzIHRydWUKK1BBU1MgY2Fs bGJhY2sgY2FsbGVkLgorUEFTUyBzb3VyY2VzMi5sZW5ndGggPT0gc291cmNlczEubGVuZ3RoIGlz IHRydWUKK1BBU1Mgc291cmNlczJbMF0uc291cmNlSWQgPT09IHNvdXJjZXMxWzBdLnNvdXJjZUlk IGlzIHRydWUKK1BBU1Mgc291cmNlczJbMF0ubGFiZWwgPT09IHNvdXJjZXMxWzBdLmxhYmVsIGlz IHRydWUKK1BBU1Mgc291cmNlczJbMF0ua2luZCA9PT0gc291cmNlczFbMF0ua2luZCBpcyB0cnVl CitQQVNTIHNvdXJjZXMyWzFdLnNvdXJjZUlkID09PSBzb3VyY2VzMVsxXS5zb3VyY2VJZCBpcyB0 cnVlCitQQVNTIHNvdXJjZXMyWzFdLmxhYmVsID09PSBzb3VyY2VzMVsxXS5sYWJlbCBpcyB0cnVl CitQQVNTIHNvdXJjZXMyWzFdLmtpbmQgPT09IHNvdXJjZXMxWzFdLmtpbmQgaXMgdHJ1ZQogUEFT UyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCkluZGV4OiBMYXlv dXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2stZ2V0U291cmNlcy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1U cmFjay1nZXRTb3VyY2VzLmh0bWwJKHJldmlzaW9uIDE1NjUyMSkKKysrIExheW91dFRlc3RzL2Zh c3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay1nZXRTb3VyY2VzLmh0bWwJKHdvcmtpbmcg Y29weSkKQEAgLTksOCArOSw4IEBACiAgICAgICAgIDxzY3JpcHQ+CiAgICAgICAgICAgICBkZXNj cmlwdGlvbigiVGVzdHMgTWVkaWFTdHJlYW1UcmFjazo6Z2V0U291cmNlcy4iKTsKIAotICAgICAg ICAgICAgdmFyIHNvdXJjZXMgPSBudWxsOwotICAgICAgICAgICAgdmFyIHByZXZpb3VzSWQ7Cisg ICAgICAgICAgICB2YXIgc291cmNlczEgPSBudWxsOworICAgICAgICAgICAgdmFyIHNvdXJjZXMy ID0gbnVsbDsKICAgICAgICAgICAgIHZhciB0aW1lciA9IG51bGw7CiAKICAgICAgICAgICAgIGZ1 bmN0aW9uIGZpbmlzaFRlc3QoKQpAQCAtMjUsNDIgKzI1LDUyIEBACiAgICAgICAgICAgICAgICAg ZmluaXNoVGVzdCgpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBmdW5jdGlvbiBnZXRV c2VyTWVkaWEoY29uc3RyYWludHMsIGNhbGxiYWNrKQorICAgICAgICAgICAgZnVuY3Rpb24gZ2V0 VXNlck1lZGlhKF9jb25zdHJhaW50cywgX2NhbGxiYWNrKQogICAgICAgICAgICAgewogICAgICAg ICAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAgICAgICAgIHByaW1lVGltZW91dCgiVGltZW91 dCB3YWl0aW5nIGZvciB3ZWJraXRHZXRVc2VyTWVkaWEoKSIpOwotICAgICAgICAgICAgICAgICAg ICBuYXZpZ2F0b3Iud2Via2l0R2V0VXNlck1lZGlhKGNvbnN0cmFpbnRzLCBjYWxsYmFjaywgZXJy b3IpOworICAgICAgICAgICAgICAgICAgICBjb25zdHJhaW50cyA9IF9jb25zdHJhaW50czsKKyAg ICAgICAgICAgICAgICAgICAgY2FsbGJhY2sgPSBfY2FsbGJhY2s7CisgICAgICAgICAgICAgICAg ZGVidWcoIjxicj4qKiogY2FsbGluZyBuYXZpZ2F0b3Iud2Via2l0R2V0VXNlck1lZGlhKCkgKioq Iik7CisgICAgICAgICAgICAgICAgICAgIHNob3VsZE5vdFRocm93KCJuYXZpZ2F0b3Iud2Via2l0 R2V0VXNlck1lZGlhKGNvbnN0cmFpbnRzLCBjYWxsYmFjaywgZXJyb3IpIik7CiAgICAgICAgICAg ICAgICAgfSBjYXRjaCAoZSkgewogICAgICAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKCd3ZWJr aXRHZXRVc2VyTWVkaWEgdGhyZXcgZXhjZXB0aW9uIDonICsgZSk7CiAgICAgICAgICAgICAgICAg ICAgIGZpbmlzaFRlc3QoKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgIGZ1bmN0aW9uIGdvdFNvdXJjZXMyKHMpCisgICAgICAgICAgICBmdW5jdGlvbiBn b3RTb3VyY2VzMihzb3VyY2VzKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHRlc3RQ YXNzZWQoJ2dvdFNvdXJjZXMyIHdhcyBjYWxsZWQuJyk7Ci0gICAgICAgICAgICAgICAgc291cmNl cyA9IHM7Ci0gICAgICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCdzb3VyY2VzLmxlbmd0aCA+IDAn KTsKLSAgICAgICAgICAgICAgICBzaG91bGRCZVRydWUoJ3NvdXJjZXNbMF0uaWQgPT09IHByZXZp b3VzSWQnKTsKLSAgICAgICAgICAgICAgICBzaG91bGRCZVRydWUoJ3NvdXJjZXNbMF0ubGFiZWwu bGVuZ3RoID4gMCcpOworICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQoJ2NhbGxiYWNrIGNhbGxl ZC4nKTsKKyAgICAgICAgICAgICAgICBzb3VyY2VzMiA9IHNvdXJjZXM7CisgICAgICAgICAgICAg ICAgc2hvdWxkQmVUcnVlKCdzb3VyY2VzMi5sZW5ndGggPT0gc291cmNlczEubGVuZ3RoJyk7Cisg ICAgICAgICAgICAgICAgZm9yIChpID0gMDsgaSA8IHNvdXJjZXMyLmxlbmd0aDsgKytpKSB7Cisg ICAgICAgICAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgic291cmNlczJbIiArIGkgKyAiXS5zb3Vy Y2VJZCA9PT0gc291cmNlczFbIiArIGkgKyAiXS5zb3VyY2VJZCIpOworICAgICAgICAgICAgICAg ICAgICBzaG91bGRCZVRydWUoInNvdXJjZXMyWyIgKyBpICsgIl0ubGFiZWwgPT09IHNvdXJjZXMx WyIgKyBpICsgIl0ubGFiZWwiKTsKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCJz b3VyY2VzMlsiICsgaSArICJdLmtpbmQgPT09IHNvdXJjZXMxWyIgKyBpICsgIl0ua2luZCIpOwor ICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIGZpbmlzaFRlc3QoKTsKICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgZnVuY3Rpb24gZ290U3RyZWFtKHMpCisgICAgICAgICAg ICBmdW5jdGlvbiBnb3RTdHJlYW0oc3RyZWFtKQogICAgICAgICAgICAgewotICAgICAgICAgICAg ICAgIHRlc3RQYXNzZWQoJ2dvdFN0cmVhbSB3YXMgY2FsbGVkLicpOwotCisgICAgICAgICAgICAg ICAgdGVzdFBhc3NlZCgnY2FsbGJhY2sgY2FsbGVkLicpOwogICAgICAgICAgICAgICAgIHByaW1l VGltZW91dCgiVGltZW91dCB3YWl0aW5nIGZvciBNZWRpYVN0cmVhbVRyYWNrLmdldFNvdXJjZXMo KSIpOworCisgICAgICAgICAgICAgICAgZGVidWcoIjxicj4qKiogY2FsbGluZyBNZWRpYVN0cmVh bVRyYWNrLmdldFNvdXJjZXMoKSAqKioiKTsKICAgICAgICAgICAgICAgICBzaG91bGROb3RUaHJv dygnTWVkaWFTdHJlYW1UcmFjay5nZXRTb3VyY2VzKGdvdFNvdXJjZXMyKTsnKTsKICAgICAgICAg ICAgIH0KIAotICAgICAgICAgICAgZnVuY3Rpb24gZ290U291cmNlczEocykKKyAgICAgICAgICAg IGZ1bmN0aW9uIGdvdFNvdXJjZXMxKHNvdXJjZXMpCiAgICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgdGVzdFBhc3NlZCgnZ290U291cmNlczEgd2FzIGNhbGxlZC4nKTsKLSAgICAgICAgICAg ICAgICBzb3VyY2VzID0gczsKLSAgICAgICAgICAgICAgICBzaG91bGRCZVRydWUoJ3NvdXJjZXMu bGVuZ3RoID4gMCcpOwotICAgICAgICAgICAgICAgIHByZXZpb3VzSWQgPSBzb3VyY2VzWzBdLmlk OworICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQoJ2NhbGxiYWNrIGNhbGxlZC4nKTsKKyAgICAg ICAgICAgICAgICBzb3VyY2VzMSA9IHNvdXJjZXM7CisgICAgICAgICAgICAgICAgZm9yIChpID0g MDsgaSA8IHNvdXJjZXMxLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAgICAgIGRlYnVn KCJzb3VyY2VzMVsiICsgaSArICJdLnNvdXJjZUlkID0gXCIiICsgc291cmNlczFbaV0uc291cmNl SWQgKyAiXCIiKTsKKyAgICAgICAgICAgICAgICAgICAgZGVidWcoInNvdXJjZXMxWyIgKyBpICsg Il0ubGFiZWwgPSBcIiIgKyBzb3VyY2VzMVtpXS5sYWJlbCArICJcIiIpOworICAgICAgICAgICAg ICAgICAgICBkZWJ1Zygic291cmNlczFbIiArIGkgKyAiXS5raW5kID0gXCIiICsgc291cmNlczFb aV0ua2luZCArICJcIiIpOworICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIGdl dFVzZXJNZWRpYSh7YXVkaW86dHJ1ZSwgdmlkZW86dHJ1ZX0sIGdvdFN0cmVhbSk7CiAgICAgICAg ICAgICB9CkBAIC03Miw2ICs4Miw3IEBACiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHBy aW1lVGltZW91dCgiVGltZW91dCB3YWl0aW5nIGZvciBNZWRpYVN0cmVhbVRyYWNrLmdldFNvdXJj ZXMoKSIpOworICAgICAgICAgICAgZGVidWcoIjxicj4qKiogY2FsbGluZyBNZWRpYVN0cmVhbVRy YWNrLmdldFNvdXJjZXMoKSAqKioiKTsKICAgICAgICAgICAgIHNob3VsZE5vdFRocm93KCdNZWRp YVN0cmVhbVRyYWNrLmdldFNvdXJjZXMoZ290U291cmNlczEpOycpOwogCiAgICAgICAgICAgICB3 aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7Cg==