152509 2015-12-22 12:53:38 -0800 [MediaStream] MediaStreamTrackPrivate.source should be a reference 2015-12-22 13:49:46 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson webkit-bug-importer oldest_to_newest 1150944 0 eric.carlson 2015-12-22 12:53:38 -0800 MediaStreamTrackPrivate.source can never be NULL so it should be a reference. 1150958 1 267802 eric.carlson 2015-12-22 13:38:21 -0800 Created attachment 267802 Proposed patch. 1150966 2 eric.carlson 2015-12-22 13:49:35 -0800 Committed r194371: https://trac.webkit.org/r194371 267802 2015-12-22 13:38:21 -0800 2015-12-22 13:43:31 -0800 Proposed patch. source_cleanup_patch.txt text/plain 6530 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NDM2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE1LTEyLTIyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g TWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuc291cmNlIHNob3VsZCBiZSBhIHJlZmVyZW5jZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNTA5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LCBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06OnRyYWNrVmVj dG9yRm9yVHlwZSk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRy YWNrLmg6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEVE1GU2VuZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJUQ0RUTUZTZW5kZXI6OmNyZWF0ZSk6CisgICAgICAgICogTW9k dWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlVzZXJNZWRpYVJlcXVlc3Q6OmRpZENyZWF0ZVN0cmVhbSk6CisgICAgICAgICogcGxhdGZvcm0v bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Qcml2YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhU3RyZWFtUHJpdmF0ZTo6cGxhdGZvcm1MYXllcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVN0cmVhbVByaXZhdGU6OmN1cnJlbnRGcmFtZUltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6TWVkaWFTdHJlYW1UcmFja1ByaXZhdGUpOgorICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmg6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZTo6c291cmNlKToKKwogMjAx NS0xMi0yMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gRXZlcnl0aGluZyBicm9rZW4gaW4gR1RLKyAzLjE5CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcAkocmV2 aXNpb24gMTk0MzYyKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxNSw3ICszMTUsNyBAQCBNZWRpYVN0cmVh bVRyYWNrVmVjdG9yIE1lZGlhU3RyZWFtOjp0cmFjCiB7CiAgICAgTWVkaWFTdHJlYW1UcmFja1Zl Y3RvciB0cmFja3M7CiAgICAgZm9yIChhdXRvJiB0cmFjayA6IG1fdHJhY2tTZXQudmFsdWVzKCkp IHsKLSAgICAgICAgaWYgKHRyYWNrLT5zb3VyY2UoKS0+dHlwZSgpID09IGZpbHRlclR5cGUpCisg ICAgICAgIGlmICh0cmFjay0+c291cmNlKCkudHlwZSgpID09IGZpbHRlclR5cGUpCiAgICAgICAg ICAgICB0cmFja3MuYXBwZW5kKHRyYWNrKTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCShyZXZp c2lvbiAxOTQzNjIpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlh U3RyZWFtVHJhY2suaAkod29ya2luZyBjb3B5KQpAQCAtODMsNyArODMsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBhcHBseUNvbnN0cmFpbnRzKGNvbnN0IERpY3Rpb25hcnkmKTsKICAgICB2b2lkIGFw cGx5Q29uc3RyYWludHMoY29uc3QgTWVkaWFDb25zdHJhaW50cyYpOwogCi0gICAgUmVhbHRpbWVN ZWRpYVNvdXJjZSogc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9wcml2YXRlLT5zb3VyY2UoKTsg fQorICAgIFJlYWx0aW1lTWVkaWFTb3VyY2UmIHNvdXJjZSgpIGNvbnN0IHsgcmV0dXJuIG1fcHJp dmF0ZS0+c291cmNlKCk7IH0KICAgICBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYgcHJpdmF0ZVRy YWNrKCkgeyByZXR1cm4gbV9wcml2YXRlLmdldCgpOyB9CiAKICAgICBBdWRpb1NvdXJjZVByb3Zp ZGVyKiBhdWRpb1NvdXJjZVByb3ZpZGVyKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1JUQ0RUTUZTZW5kZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRFRNRlNlbmRlci5jcHAJKHJldmlzaW9uIDE5NDM2 MikKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRFRNRlNlbmRlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgc3RhdGljIGNvbnN0IGxvbmcgZGVm YXVsdEludGVyVG9uZUdhcE1zIAogUmVmUHRyPFJUQ0RUTUZTZW5kZXI+IFJUQ0RUTUZTZW5kZXI6 OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBSVENQZWVyQ29ubmVjdGlv bkhhbmRsZXIqIHBlZXJDb25uZWN0aW9uSGFuZGxlciwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbVRy YWNrPiBwcnBUcmFjaywgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgUmVmUHRyPE1lZGlhU3Ry ZWFtVHJhY2s+IHRyYWNrID0gcHJwVHJhY2s7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFJUQ0RUTUZT ZW5kZXJIYW5kbGVyPiBoYW5kbGVyID0gcGVlckNvbm5lY3Rpb25IYW5kbGVyLT5jcmVhdGVEVE1G U2VuZGVyKHRyYWNrLT5zb3VyY2UoKSk7CisgICAgc3RkOjp1bmlxdWVfcHRyPFJUQ0RUTUZTZW5k ZXJIYW5kbGVyPiBoYW5kbGVyID0gcGVlckNvbm5lY3Rpb25IYW5kbGVyLT5jcmVhdGVEVE1GU2Vu ZGVyKCZ0cmFjay0+c291cmNlKCkpOwogICAgIGlmICghaGFuZGxlcikgewogICAgICAgICBlYyA9 IE5PVF9TVVBQT1JURURfRVJSOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1 ZXN0LmNwcAkocmV2aXNpb24gMTk0MzYyKQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY3LDEzICsx NjcsMTMgQEAgdm9pZCBVc2VyTWVkaWFSZXF1ZXN0OjpkaWRDcmVhdGVTdHJlYW0oUAogICAgIGlm IChtX2F1ZGlvQ29uc3RyYWludHMpIHsKICAgICAgICAgZm9yIChhdXRvJiB0cmFjayA6IHN0cmVh bS0+Z2V0QXVkaW9UcmFja3MoKSkgewogICAgICAgICAgICAgdHJhY2stPmFwcGx5Q29uc3RyYWlu dHMoKm1fYXVkaW9Db25zdHJhaW50cyk7Ci0gICAgICAgICAgICB0cmFjay0+c291cmNlKCktPnN0 YXJ0UHJvZHVjaW5nRGF0YSgpOworICAgICAgICAgICAgdHJhY2stPnNvdXJjZSgpLnN0YXJ0UHJv ZHVjaW5nRGF0YSgpOwogICAgICAgICB9CiAgICAgfQogICAgIGlmIChtX3ZpZGVvQ29uc3RyYWlu dHMpIHsKICAgICAgICAgZm9yIChhdXRvJiB0cmFjayA6IHN0cmVhbS0+Z2V0VmlkZW9UcmFja3Mo KSkgewogICAgICAgICAgICAgdHJhY2stPmFwcGx5Q29uc3RyYWludHMoKm1fdmlkZW9Db25zdHJh aW50cyk7Ci0gICAgICAgICAgICB0cmFjay0+c291cmNlKCktPnN0YXJ0UHJvZHVjaW5nRGF0YSgp OworICAgICAgICAgICAgdHJhY2stPnNvdXJjZSgpLnN0YXJ0UHJvZHVjaW5nRGF0YSgpOwogICAg ICAgICB9CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbVByaXZhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUHJpdmF0ZS5jcHAJKHJldmlzaW9uIDE5NDM2 MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUHJp dmF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNyw3ICsyMTcsNyBAQCBQbGF0Zm9ybUxheWVy KiBNZWRpYVN0cmVhbVByaXZhdGU6OnBsYXRmCiAgICAgaWYgKCFtX2FjdGl2ZVZpZGVvVHJhY2sp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgcmV0dXJuIG1fYWN0aXZlVmlkZW9UcmFj ay0+c291cmNlKCktPnBsYXRmb3JtTGF5ZXIoKTsKKyAgICByZXR1cm4gbV9hY3RpdmVWaWRlb1Ry YWNrLT5zb3VyY2UoKS5wbGF0Zm9ybUxheWVyKCk7CiB9CiAKIHZvaWQgTWVkaWFTdHJlYW1Qcml2 YXRlOjpwYWludEN1cnJlbnRGcmFtZUluQ29udGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQs IGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKQEAgLTI0MSw3ICsyNDEsNyBAQCBSZWZQdHI8SW1hZ2U+ IE1lZGlhU3RyZWFtUHJpdmF0ZTo6Y3VycmVuCiAgICAgaWYgKCFhY3RpdmUoKSB8fCAhbV9hY3Rp dmVWaWRlb1RyYWNrKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIHJldHVybiBtX2Fj dGl2ZVZpZGVvVHJhY2stPnNvdXJjZSgpLT5jdXJyZW50RnJhbWVJbWFnZSgpOworICAgIHJldHVy biBtX2FjdGl2ZVZpZGVvVHJhY2stPnNvdXJjZSgpLmN1cnJlbnRGcmFtZUltYWdlKCk7CiB9CiAK IHZvaWQgTWVkaWFTdHJlYW1Qcml2YXRlOjp1cGRhdGVBY3RpdmVWaWRlb1RyYWNrKCkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2 YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZS5jcHAJKHJldmlzaW9uIDE5NDM2MikKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsNyBAQCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFj a1ByaXZhdGU+IE1lZGlhU3RyCiAKIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpNZWRpYVN0cmVh bVRyYWNrUHJpdmF0ZShjb25zdCBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYgb3RoZXIpCiAgICAg OiBSZWZDb3VudGVkKCkKLSAgICAsIG1fc291cmNlKG90aGVyLnNvdXJjZSgpKQorICAgICwgbV9z b3VyY2UoJm90aGVyLnNvdXJjZSgpKQogICAgICwgbV9pZChjcmVhdGVDYW5vbmljYWxVVUlEU3Ry aW5nKCkpCiAgICAgLCBtX2lzRW5hYmxlZChvdGhlci5lbmFibGVkKCkpCiAgICAgLCBtX2lzRW5k ZWQob3RoZXIuZW5kZWQoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2tQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuaAkocmV2aXNp b24gMTk0MzYyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFT dHJlYW1UcmFja1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzcsNyArNzcsNyBAQCBwdWJs aWM6CiAKICAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFja1ByaXZhdGU+IGNsb25lKCk7CiAKLSAg ICBSZWFsdGltZU1lZGlhU291cmNlKiBzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS5n ZXQoKTsgfQorICAgIFJlYWx0aW1lTWVkaWFTb3VyY2UmIHNvdXJjZSgpIGNvbnN0IHsgcmV0dXJu ICptX3NvdXJjZS5nZXQoKTsgfQogICAgIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgdHlwZSgp IGNvbnN0OwogCiAgICAgdm9pZCBlbmRUcmFjaygpOwo=