231920 2021-10-18 16:43:24 -0700 [macOS] Refactor CGDisplayStreamCaptureSource::createDisplayStream 2021-10-18 17:51:54 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1805773 0 eric.carlson 2021-10-18 16:43:24 -0700 Minor cleanup, refactor CGDisplayStreamCaptureSource::createDisplayStream to not take parameters. 1805774 1 webkit-bug-importer 2021-10-18 16:43:39 -0700 <rdar://problem/84393654> 1805778 2 441658 eric.carlson 2021-10-18 16:52:11 -0700 Created attachment 441658 Patch 1805811 3 ews-feeder 2021-10-18 17:51:52 -0700 Committed r284421 (243189@main): <https://commits.webkit.org/243189@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441658. 441658 2021-10-18 16:52:11 -0700 2021-10-18 17:51:53 -0700 Patch bug-231920-20211018165211.patch text/plain 6495 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Mzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjNmYmRlMzdjNGRiYzUx MGRjMTMxNzgwMzM3YzIwNjExNGFmNWRmMC4uYzE0NjQyNGIyNmRjYjBjNzJkYmEwYWJkNThkODE0 MGVhNjQ2MzgzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEwLTE4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gUmVm YWN0b3IgQ0dEaXNwbGF5U3RyZWFtQ2FwdHVyZVNvdXJjZTo6Y3JlYXRlRGlzcGxheVN0cmVhbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxOTIwCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDM5MzY1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGZ1bmN0aW9uYWwgY2hh bmdlLgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NHRGlzcGxheVN0cmVh bUNhcHR1cmVTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0dEaXNwbGF5U3RyZWFtQ2Fw dHVyZVNvdXJjZTo6c3RhcnREaXNwbGF5U3RyZWFtKTogRG9uJ3QgcGFzcyB0aGUgZnJhbWUKKyAg ICAgICAgYXZhaWxhYmxlIGhhbmRsZXIgb3IgY2FwdHVyZSBxdWV1ZSB0byBjcmVhdGVEaXNwbGF5 U3RyZWFtLgorICAgICAgICAoV2ViQ29yZTo6Q0dEaXNwbGF5U3RyZWFtQ2FwdHVyZVNvdXJjZTo6 ZnJhbWVBdmFpbGFibGVIYW5kbGVyKTogUmVtb3ZlIGEgYmxhbmsgbGluZS4KKyAgICAgICAgKFdl YkNvcmU6OkNHRGlzcGxheVN0cmVhbUNhcHR1cmVTb3VyY2U6OmNhcHR1cmVRdWV1ZSk6IE5ldyBh Y2Nlc3Nvci4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ0dEaXNwbGF5U3Ry ZWFtQ2FwdHVyZVNvdXJjZS5oOgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NHRGlzcGxheVN0cmVhbVNjcmVlbkNhcHR1cmVTb3VyY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9tZWRpYXN0cmVhbS9tYWMvQ0dEaXNwbGF5U3RyZWFtU2NyZWVuQ2FwdHVyZVNvdXJjZS5tbToK KyAgICAgICAgKFdlYkNvcmU6OkNHRGlzcGxheVN0cmVhbVNjcmVlbkNhcHR1cmVTb3VyY2U6OmNy ZWF0ZURpc3BsYXlTdHJlYW0pOiBQYXJhbWV0ZXJzIHJlbW92ZWQuCisKIDIwMjEtMTAtMTggIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZl cnQgcjI4NDIxNgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0NHRGlzcGxheVN0cmVhbUNhcHR1cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NHRGlzcGxheVN0cmVhbUNhcHR1cmVTb3VyY2UuY3Bw CmluZGV4IGYzYmJiN2M1OGIzZjNmZTU0MDhhZjBhMjEzOGQyZDBmODIwMjFlNTcuLjc2YWJlNTQ2 NDk2NWViMDhlYzk0YmFlY2I3NWU5YjI0NWM2ZjJiNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9DR0Rpc3BsYXlTdHJlYW1DYXB0dXJlU291cmNl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ0dEaXNw bGF5U3RyZWFtQ2FwdHVyZVNvdXJjZS5jcHAKQEAgLTgxLDExICs4MSw4IEBAIGJvb2wgQ0dEaXNw bGF5U3RyZWFtQ2FwdHVyZVNvdXJjZTo6c3RhcnREaXNwbGF5U3RyZWFtKCkKICAgICBpZiAoIWNo ZWNrRGlzcGxheVN0cmVhbSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIW1f Y2FwdHVyZVF1ZXVlKQotICAgICAgICBtX2NhcHR1cmVRdWV1ZSA9IGFkb3B0T1NPYmplY3QoZGlz cGF0Y2hfcXVldWVfY3JlYXRlKCJDR0Rpc3BsYXlTdHJlYW1DYXB0dXJlU291cmNlIENhcHR1cmUg UXVldWUiLCBESVNQQVRDSF9RVUVVRV9TRVJJQUwpKTsKLQogICAgIGlmICghbV9kaXNwbGF5U3Ry ZWFtKSB7Ci0gICAgICAgIG1fZGlzcGxheVN0cmVhbSA9IGNyZWF0ZURpc3BsYXlTdHJlYW0oZnJh bWVBdmFpbGFibGVIYW5kbGVyKCksIG1fY2FwdHVyZVF1ZXVlLmdldCgpKTsKKyAgICAgICAgbV9k aXNwbGF5U3RyZWFtID0gY3JlYXRlRGlzcGxheVN0cmVhbSgpOwogICAgICAgICBpZiAoIW1fZGlz cGxheVN0cmVhbSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMTc5LDcgKzE3Niwx NCBAQCBDR0Rpc3BsYXlTdHJlYW1GcmFtZUF2YWlsYWJsZUhhbmRsZXIgQ0dEaXNwbGF5U3RyZWFt Q2FwdHVyZVNvdXJjZTo6ZnJhbWVBdmFpbGFibAogICAgIH07CiAKICAgICByZXR1cm4gbV9mcmFt ZUF2YWlsYWJsZUhhbmRsZXIuZ2V0KCk7Cit9CisKK2Rpc3BhdGNoX3F1ZXVlX3QgQ0dEaXNwbGF5 U3RyZWFtQ2FwdHVyZVNvdXJjZTo6Y2FwdHVyZVF1ZXVlKCkKK3sKKyAgICBpZiAoIW1fY2FwdHVy ZVF1ZXVlKQorICAgICAgICBtX2NhcHR1cmVRdWV1ZSA9IGFkb3B0T1NPYmplY3QoZGlzcGF0Y2hf cXVldWVfY3JlYXRlKCJDR0Rpc3BsYXlTdHJlYW1DYXB0dXJlU291cmNlIENhcHR1cmUgUXVldWUi LCBESVNQQVRDSF9RVUVVRV9TRVJJQUwpKTsKIAorICAgIHJldHVybiBtX2NhcHR1cmVRdWV1ZS5n ZXQoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NHRGlzcGxheVN0cmVhbUNhcHR1cmVTb3Vy Y2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9DR0Rpc3BsYXlT dHJlYW1DYXB0dXJlU291cmNlLmgKaW5kZXggNWExMzE2NmJhNGYzZWNhZmE4YmU3NWU0NzMzNTgw MGI0OWUxZTM4Ny4uNmNiMmU3N2E4YzZiZjZiYTVlMDA2M2M0YTZhM2I1YWM1YjJhNzk5YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NHRGlzcGxh eVN0cmVhbUNhcHR1cmVTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvQ0dEaXNwbGF5U3RyZWFtQ2FwdHVyZVNvdXJjZS5oCkBAIC00NiwxMiArNDYs MTUgQEAgcHVibGljOgogCiBwcm90ZWN0ZWQ6CiAgICAgdXNpbmcgRnJhbWVBdmFpbGFibGVDYWxs YmFjayA9IHZvaWQgKF4pKENHRGlzcGxheVN0cmVhbUZyYW1lU3RhdHVzLCB1aW50NjRfdCwgSU9T dXJmYWNlUmVmLCBDR0Rpc3BsYXlTdHJlYW1VcGRhdGVSZWYpOwotICAgIHZpcnR1YWwgUmV0YWlu UHRyPENHRGlzcGxheVN0cmVhbVJlZj4gY3JlYXRlRGlzcGxheVN0cmVhbShGcmFtZUF2YWlsYWJs ZUNhbGxiYWNrLCBkaXNwYXRjaF9xdWV1ZV90KSA9IDA7CisgICAgdmlydHVhbCBSZXRhaW5QdHI8 Q0dEaXNwbGF5U3RyZWFtUmVmPiBjcmVhdGVEaXNwbGF5U3RyZWFtKCkgPSAwOwogICAgIHZpcnR1 YWwgYm9vbCBjaGVja0Rpc3BsYXlTdHJlYW0oKSB7IHJldHVybiB0cnVlOyB9CiAKICAgICBDR0Rp c3BsYXlTdHJlYW1SZWYgZGlzcGxheVN0cmVhbSgpIGNvbnN0IHsgcmV0dXJuIG1fZGlzcGxheVN0 cmVhbS5nZXQoKTsgfQogICAgIHZvaWQgaW52YWxpZGF0ZURpc3BsYXlTdHJlYW0oKSB7IG1fZGlz cGxheVN0cmVhbSA9IG51bGxwdHI7IH0KIAorICAgIEZyYW1lQXZhaWxhYmxlQ2FsbGJhY2sgZnJh bWVBdmFpbGFibGVIYW5kbGVyKCk7CisgICAgZGlzcGF0Y2hfcXVldWVfdCBjYXB0dXJlUXVldWUo KTsKKwogICAgIHVpbnQzMl90IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV93aWR0aDsgfQogICAg IHVpbnQzMl90IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1faGVpZ2h0OyB9CiAgICAgZmxvYXQg ZnJhbWVSYXRlKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZVJhdGU7IH0KQEAgLTY3LDcgKzcwLDYg QEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZGlzcGxheVdhc1JlY29uZmlndXJlZChDR0RpcmVjdERp c3BsYXlJRCwgQ0dEaXNwbGF5Q2hhbmdlU3VtbWFyeUZsYWdzKTsKICAgICBib29sIHN0YXJ0RGlz cGxheVN0cmVhbSgpOwotICAgIEZyYW1lQXZhaWxhYmxlQ2FsbGJhY2sgZnJhbWVBdmFpbGFibGVI YW5kbGVyKCk7CiAKICAgICB2b2lkIG5ld0ZyYW1lKENHRGlzcGxheVN0cmVhbUZyYW1lU3RhdHVz LCBSZXRhaW5QdHI8SU9TdXJmYWNlUmVmPiYmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NHRGlzcGxheVN0cmVhbVNjcmVlbkNhcHR1cmVT b3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9DR0Rpc3Bs YXlTdHJlYW1TY3JlZW5DYXB0dXJlU291cmNlLmgKaW5kZXggZWIxYmY3OTNkYTEzYjBmNmU1ZmYw YWIxNWYyMjI2MDM3YzU4NWMwZC4uODFjOWI3N2I1MGQxMDk1NzMzMWEyY2YyZjFmNTUzODdjNmI5 MDA0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NHRGlzcGxheVN0cmVhbVNjcmVlbkNhcHR1cmVTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ0dEaXNwbGF5U3RyZWFtU2NyZWVuQ2FwdHVyZVNv dXJjZS5oCkBAIC02MCw3ICs2MCw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIC8vIENHRGlz cGxheVN0cmVhbUNhcHR1cmVTb3VyY2UKLSAgICBSZXRhaW5QdHI8Q0dEaXNwbGF5U3RyZWFtUmVm PiBjcmVhdGVEaXNwbGF5U3RyZWFtKEZyYW1lQXZhaWxhYmxlQ2FsbGJhY2ssIGRpc3BhdGNoX3F1 ZXVlX3QpIGZpbmFsOworICAgIFJldGFpblB0cjxDR0Rpc3BsYXlTdHJlYW1SZWY+IGNyZWF0ZURp c3BsYXlTdHJlYW0oKSBmaW5hbDsKICAgICBib29sIGNoZWNrRGlzcGxheVN0cmVhbSgpIGZpbmFs OwogCiAgICAgUmV0YWluUHRyPENHRGlzcGxheVN0cmVhbVJlZj4gbV9kaXNwbGF5U3RyZWFtOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NHRGlz cGxheVN0cmVhbVNjcmVlbkNhcHR1cmVTb3VyY2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9tYWMvQ0dEaXNwbGF5U3RyZWFtU2NyZWVuQ2FwdHVyZVNvdXJjZS5tbQpp bmRleCA5YmRhNzI0ZDUzNjk5ZTdiZWU4NDQxN2JlYTk5MTk5MDc5NWI5OTY1Li5iZjg4YjFhYTdj YzhjOWVjMTIyMWQ2YmZjZmQ5NDJjOGM2NmU3NDhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ0dEaXNwbGF5U3RyZWFtU2NyZWVuQ2FwdHVyZVNv dXJjZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ0dE aXNwbGF5U3RyZWFtU2NyZWVuQ2FwdHVyZVNvdXJjZS5tbQpAQCAtMTExLDcgKzExMSw3IEBAIGJv b2wgQ0dEaXNwbGF5U3RyZWFtU2NyZWVuQ2FwdHVyZVNvdXJjZTo6Y2hlY2tEaXNwbGF5U3RyZWFt KCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotUmV0YWluUHRyPENHRGlzcGxheVN0cmVhbVJlZj4g Q0dEaXNwbGF5U3RyZWFtU2NyZWVuQ2FwdHVyZVNvdXJjZTo6Y3JlYXRlRGlzcGxheVN0cmVhbShG cmFtZUF2YWlsYWJsZUNhbGxiYWNrIGZyYW1lQXZhaWxhYmxlSGFuZGxlciwgZGlzcGF0Y2hfcXVl dWVfdCBxdWV1ZSkKK1JldGFpblB0cjxDR0Rpc3BsYXlTdHJlYW1SZWY+IENHRGlzcGxheVN0cmVh bVNjcmVlbkNhcHR1cmVTb3VyY2U6OmNyZWF0ZURpc3BsYXlTdHJlYW0oKQogewogICAgIHN0YXRp YyBjb25zdCBpbnQgc2NyZWVuUXVldWVNYXhpbXVtTGVuZ3RoID0gNjsKIApAQCAtMTM5LDcgKzEz OSw3IEBAIFJldGFpblB0cjxDR0Rpc3BsYXlTdHJlYW1SZWY+IENHRGlzcGxheVN0cmVhbVNjcmVl bkNhcHR1cmVTb3VyY2U6OmNyZWF0ZURpc3BsYXlTCiAgICAgICAgIChfX2JyaWRnZSBOU1N0cmlu ZyAqKWtDR0Rpc3BsYXlTdHJlYW1TaG93Q3Vyc29yIDogQFlFUywKICAgICB9OwogCi0gICAgcmV0 dXJuIGFkb3B0Q0YoQ0dEaXNwbGF5U3RyZWFtQ3JlYXRlV2l0aERpc3BhdGNoUXVldWUobV9kaXNw bGF5SUQsIHdpZHRoLCBoZWlnaHQsIHByZWZlcmVkUGl4ZWxCdWZmZXJGb3JtYXQoKSwgKF9fYnJp ZGdlIENGRGljdGlvbmFyeVJlZilzdHJlYW1PcHRpb25zLCBxdWV1ZSwgZnJhbWVBdmFpbGFibGVI YW5kbGVyKSk7CisgICAgcmV0dXJuIGFkb3B0Q0YoQ0dEaXNwbGF5U3RyZWFtQ3JlYXRlV2l0aERp c3BhdGNoUXVldWUobV9kaXNwbGF5SUQsIHdpZHRoLCBoZWlnaHQsIHByZWZlcmVkUGl4ZWxCdWZm ZXJGb3JtYXQoKSwgKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilzdHJlYW1PcHRpb25zLCBjYXB0 dXJlUXVldWUoKSwgZnJhbWVBdmFpbGFibGVIYW5kbGVyKCkpKTsKIH0KIAogSW50U2l6ZSBDR0Rp c3BsYXlTdHJlYW1TY3JlZW5DYXB0dXJlU291cmNlOjppbnRyaW5zaWNTaXplKCkgY29uc3QK