199581 2019-07-08 11:24:19 -0700 Hop explicitly to the main thread after generating a frame in ScreenDisplayCaptureSourceMac 2019-07-08 16:51:51 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1550892 0 youennf 2019-07-08 11:24:19 -0700 Hop explicitly to the main thread after generating a frame in ScreenDisplayCaptureSourceMac 1550897 1 373648 youennf 2019-07-08 11:27:59 -0700 Created attachment 373648 Patch 1550961 2 373648 eric.carlson 2019-07-08 14:15:47 -0700 Comment on attachment 373648 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373648&action=review > Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:169 > + weakThis->newFrame(status, WTFMove(frame)); There isn't a lot of code in newFrame now, it might make sense to move it here. 1551024 3 373648 youennf 2019-07-08 16:17:01 -0700 Comment on attachment 373648 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373648&action=review >> Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:169 >> + weakThis->newFrame(status, WTFMove(frame)); > > There isn't a lot of code in newFrame now, it might make sense to move it here. It makes a nice separation between main-thread/non main thread. And we might want to beef-up newFrame so that it becomes something like generateNewFrame if we get rid of the timer. 1551026 4 webkit-bug-importer 2019-07-08 16:17:21 -0700 <rdar://problem/52803327> 1551042 5 373648 commit-queue 2019-07-08 16:51:49 -0700 Comment on attachment 373648 Patch Clearing flags on attachment: 373648 Committed r247238: <https://trac.webkit.org/changeset/247238> 1551043 6 commit-queue 2019-07-08 16:51:51 -0700 All reviewed patches have been landed. Closing bug. 373648 2019-07-08 11:27:59 -0700 2019-07-08 16:51:49 -0700 Patch bug-199581-20190708112758.patch text/plain 6285 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVjNzE4Yzc3Mzg5ZmMy M2E3MGI2MzQzMGE5ZWViZWViMTk0MDA4Yi4uMWI3Yjc5NjMyZTZiNWM4NmY3OTJlNzk3OTlkMDc0 YjJkNjhiODc4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA3LTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBIb3AgZXhwbGljaXRseSB0 byB0aGUgbWFpbiB0aHJlYWQgYWZ0ZXIgZ2VuZXJhdGluZyBhIGZyYW1lIGluIFNjcmVlbkRpc3Bs YXlDYXB0dXJlU291cmNlTWFjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTk1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbnN0ZWFkIG9mIGxvY2tpbmcgYW5kIHNldHRpbmcgdGhlIGN1cnJlbnQgZnJh bWUgZnJvbSBhIGJhY2tncm91bmQgdGhyZWFkLCBob3AgdG8gdGhlIG1haW4gdGhyZWFkLgorICAg ICAgICBUaGlzIGFsc28gbWFrZXMgc3VyZSB0aGUgd2Vha1RoaXMgY2hlY2sgaXMgZG9uZSBpbiB0 aGUgbWFpbiB0aHJlYWQuCisgICAgICAgIE1hbnVhbGx5IHRlc3RlZC4KKworICAgICAgICAqIHBs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9TY3JlZW5EaXNwbGF5Q2FwdHVyZVNvdXJjZU1hYy5oOgor ICAgICAgICAoV2ViQ29yZTo6U2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VNYWM6OkRpc3BsYXlT dXJmYWNlOjpEaXNwbGF5U3VyZmFjZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0v bWFjL1NjcmVlbkRpc3BsYXlDYXB0dXJlU291cmNlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 U2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VNYWM6OmNyZWF0ZURpc3BsYXlTdHJlYW0pOgorICAg ICAgICAoV2ViQ29yZTo6U2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VNYWM6OmdlbmVyYXRlRnJh bWUpOgorICAgICAgICAoV2ViQ29yZTo6U2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VNYWM6Om5l d0ZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcmVlbkRpc3BsYXlDYXB0dXJlU291cmNlTWFj OjpmcmFtZUF2YWlsYWJsZSk6IERlbGV0ZWQuCisKIDIwMTktMDctMDcgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ2lzdGVyIGEgTWVkaWFTdHJlYW1UcmFj ayBhcyBtZWRpYSBwcm9kdWNlciBvbmx5IGlmIGl0IGlzIGEgY2FwdHVyZSB0cmFjawpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1NjcmVlbkRpc3Bs YXlDYXB0dXJlU291cmNlTWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9tYWMvU2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VNYWMuaAppbmRleCBiODJmZWFmYWQxZTE3 NGI4N2U5OTE3MDA2ZTQwZGNkNjViN2JjY2Q5Li41Nzc5MDIwMzBkNzY2ZGY2MjI0ZmI3YzcwNjVj YTA5MDVmZWE2NGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvU2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VNYWMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvU2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VN YWMuaApAQCAtNTQsOCArNTQsNiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaXNwbGF5V2FzUmVj b25maWd1cmVkKENHRGlyZWN0RGlzcGxheUlELCBDR0Rpc3BsYXlDaGFuZ2VTdW1tYXJ5RmxhZ3Mp OwogCi0gICAgdm9pZCBmcmFtZUF2YWlsYWJsZShDR0Rpc3BsYXlTdHJlYW1GcmFtZVN0YXR1cywg dWludDY0X3QsIElPU3VyZmFjZVJlZiwgQ0dEaXNwbGF5U3RyZWFtVXBkYXRlUmVmKTsKLQogICAg IERpc3BsYXlDYXB0dXJlU291cmNlQ29jb2E6OkRpc3BsYXlGcmFtZVR5cGUgZ2VuZXJhdGVGcmFt ZSgpIGZpbmFsOwogICAgIFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6RGlzcGxheVN1cmZh Y2VUeXBlIHN1cmZhY2VUeXBlKCkgY29uc3QgZmluYWwgeyByZXR1cm4gUmVhbHRpbWVNZWRpYVNv dXJjZVNldHRpbmdzOjpEaXNwbGF5U3VyZmFjZVR5cGU6Ok1vbml0b3I7IH0KIApAQCAtNzQsNiAr NzIsMTMgQEAgcHJpdmF0ZToKICAgICBjbGFzcyBEaXNwbGF5U3VyZmFjZSB7CiAgICAgcHVibGlj OgogICAgICAgICBEaXNwbGF5U3VyZmFjZSgpID0gZGVmYXVsdDsKKyAgICAgICAgZXhwbGljaXQg RGlzcGxheVN1cmZhY2UoSU9TdXJmYWNlUmVmIHN1cmZhY2UpCisgICAgICAgICAgICA6IG1fc3Vy ZmFjZShzdXJmYWNlKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAobV9zdXJmYWNlKQorICAg ICAgICAgICAgICAgIElPU3VyZmFjZUluY3JlbWVudFVzZUNvdW50KG1fc3VyZmFjZS5nZXQoKSk7 CisgICAgICAgIH0KKwogICAgICAgICB+RGlzcGxheVN1cmZhY2UoKQogICAgICAgICB7CiAgICAg ICAgICAgICBpZiAobV9zdXJmYWNlKQpAQCAtOTYsNyArMTAxLDggQEAgcHJpdmF0ZToKICAgICAg ICAgUmV0YWluUHRyPElPU3VyZmFjZVJlZj4gbV9zdXJmYWNlOwogICAgIH07CiAKLSAgICBtdXRh YmxlIExvY2sgbV9jdXJyZW50RnJhbWVNdXRleDsKKyAgICB2b2lkIG5ld0ZyYW1lKENHRGlzcGxh eVN0cmVhbUZyYW1lU3RhdHVzLCBEaXNwbGF5U3VyZmFjZSYmKTsKKwogICAgIERpc3BsYXlTdXJm YWNlIG1fY3VycmVudEZyYW1lOwogICAgIFJldGFpblB0cjxDR0Rpc3BsYXlTdHJlYW1SZWY+IG1f ZGlzcGxheVN0cmVhbTsKICAgICBPU09iamVjdFB0cjxkaXNwYXRjaF9xdWV1ZV90PiBtX2NhcHR1 cmVRdWV1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9TY3JlZW5EaXNwbGF5Q2FwdHVyZVNvdXJjZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9TY3JlZW5EaXNwbGF5Q2FwdHVyZVNvdXJjZU1hYy5tbQpp bmRleCAwODdhZDBhODI5ZTBmOTNkNTk4NjQ5M2Y0YWFkN2M0MjQyMDNkYTk2Li4yY2JmOGFlOGU2 OGJmMTMwNWQ3MjdkZGJmNzgxYjc2MGUyOGE2MmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvU2NyZWVuRGlzcGxheUNhcHR1cmVTb3VyY2VNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1NjcmVlbkRp c3BsYXlDYXB0dXJlU291cmNlTWFjLm1tCkBAIC0xNTQsMTAgKzE1NCwyMCBAQCBib29sIFNjcmVl bkRpc3BsYXlDYXB0dXJlU291cmNlTWFjOjpjcmVhdGVEaXNwbGF5U3RyZWFtKCkKIAogICAgICAg ICBhdXRvIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpOwogICAgICAgICBhdXRvIGZyYW1l QXZhaWxhYmxlQmxvY2sgPSBeKENHRGlzcGxheVN0cmVhbUZyYW1lU3RhdHVzIHN0YXR1cywgdWlu dDY0X3QgZGlzcGxheVRpbWUsIElPU3VyZmFjZVJlZiBmcmFtZVN1cmZhY2UsIENHRGlzcGxheVN0 cmVhbVVwZGF0ZVJlZiB1cGRhdGVSZWYpIHsKLSAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCisK KyAgICAgICAgICAgIGlmICghZnJhbWVTdXJmYWNlIHx8ICFkaXNwbGF5VGltZSkKKyAgICAgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIHNpemVfdCBjb3VudDsKKyAgICAgICAgICAg IGF1dG8qIHJlY3RzID0gQ0dEaXNwbGF5U3RyZWFtVXBkYXRlR2V0UmVjdHModXBkYXRlUmVmLCBr Q0dEaXNwbGF5U3RyZWFtVXBkYXRlRGlydHlSZWN0cywgJmNvdW50KTsKKyAgICAgICAgICAgIGlm ICghcmVjdHMgfHwgIWNvdW50KQogICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICAg ICAgd2Vha1RoaXMtPmZyYW1lQXZhaWxhYmxlKHN0YXR1cywgZGlzcGxheVRpbWUsIGZyYW1lU3Vy ZmFjZSwgdXBkYXRlUmVmKTsKKyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChb d2Vha1RoaXMsIHN0YXR1cywgZnJhbWUgPSBEaXNwbGF5U3VyZmFjZSB7IGZyYW1lU3VyZmFjZSB9 XSgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB3ZWFrVGhpcy0+bmV3RnJhbWUoc3Rh dHVzLCBXVEZNb3ZlKGZyYW1lKSk7CisgICAgICAgICAgICB9KTsKICAgICAgICAgfTsKIAogICAg ICAgICBtX2Rpc3BsYXlTdHJlYW0gPSBhZG9wdENGKENHRGlzcGxheVN0cmVhbUNyZWF0ZVdpdGhE aXNwYXRjaFF1ZXVlKG1fZGlzcGxheUlELCBzY3JlZW5XaWR0aCwgc2NyZWVuSGVpZ2h0LCBwcmVm ZXJlZFBpeGVsQnVmZmVyRm9ybWF0KCksIChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpc3RyZWFt T3B0aW9ucywgbV9jYXB0dXJlUXVldWUuZ2V0KCksIGZyYW1lQXZhaWxhYmxlQmxvY2spKTsKQEAg LTIwMywxMyArMjEzLDcgQEAgdm9pZCBTY3JlZW5EaXNwbGF5Q2FwdHVyZVNvdXJjZU1hYzo6c3Rv cFByb2R1Y2luZ0RhdGEoKQogCiBEaXNwbGF5Q2FwdHVyZVNvdXJjZUNvY29hOjpEaXNwbGF5RnJh bWVUeXBlIFNjcmVlbkRpc3BsYXlDYXB0dXJlU291cmNlTWFjOjpnZW5lcmF0ZUZyYW1lKCkKIHsK LSAgICBEaXNwbGF5U3VyZmFjZSBjdXJyZW50RnJhbWU7Ci0gICAgewotICAgICAgICBMb2NrSG9s ZGVyIGxvY2sobV9jdXJyZW50RnJhbWVNdXRleCk7Ci0gICAgICAgIGN1cnJlbnRGcmFtZSA9IG1f Y3VycmVudEZyYW1lLmlvU3VyZmFjZSgpOwotICAgIH0KLQotICAgIHJldHVybiBEaXNwbGF5Q2Fw dHVyZVNvdXJjZUNvY29hOjpEaXNwbGF5RnJhbWVUeXBlIHsgUmV0YWluUHRyPElPU3VyZmFjZVJl Zj4geyBjdXJyZW50RnJhbWUuaW9TdXJmYWNlKCkgfSB9OworICAgIHJldHVybiBEaXNwbGF5Q2Fw dHVyZVNvdXJjZUNvY29hOjpEaXNwbGF5RnJhbWVUeXBlIHsgUmV0YWluUHRyPElPU3VyZmFjZVJl Zj4geyBtX2N1cnJlbnRGcmFtZS5pb1N1cmZhY2UoKSB9IH07CiB9CiAKIHZvaWQgU2NyZWVuRGlz cGxheUNhcHR1cmVTb3VyY2VNYWM6OnN0YXJ0RGlzcGxheVN0cmVhbSgpCkBAIC0yNTMsNyArMjU3 LDcgQEAgdm9pZCBTY3JlZW5EaXNwbGF5Q2FwdHVyZVNvdXJjZU1hYzo6ZGlzcGxheVJlY29uZmln dXJhdGlvbkNhbGxCYWNrKENHRGlyZWN0RGlzcGwKICAgICAgICAgcmVpbnRlcnByZXRfY2FzdDxT Y3JlZW5EaXNwbGF5Q2FwdHVyZVNvdXJjZU1hYyAqPih1c2VySW5mbyktPmRpc3BsYXlXYXNSZWNv bmZpZ3VyZWQoZGlzcGxheSwgZmxhZ3MpOwogfQogCi12b2lkIFNjcmVlbkRpc3BsYXlDYXB0dXJl U291cmNlTWFjOjpmcmFtZUF2YWlsYWJsZShDR0Rpc3BsYXlTdHJlYW1GcmFtZVN0YXR1cyBzdGF0 dXMsIHVpbnQ2NF90IGRpc3BsYXlUaW1lLCBJT1N1cmZhY2VSZWYgZnJhbWVTdXJmYWNlLCBDR0Rp c3BsYXlTdHJlYW1VcGRhdGVSZWYgdXBkYXRlUmVmKQordm9pZCBTY3JlZW5EaXNwbGF5Q2FwdHVy ZVNvdXJjZU1hYzo6bmV3RnJhbWUoQ0dEaXNwbGF5U3RyZWFtRnJhbWVTdGF0dXMgc3RhdHVzLCBE aXNwbGF5U3VyZmFjZSYmIG5ld0ZyYW1lKQogewogICAgIHN3aXRjaCAoc3RhdHVzKSB7CiAgICAg Y2FzZSBrQ0dEaXNwbGF5U3RyZWFtRnJhbWVTdGF0dXNGcmFtZUNvbXBsZXRlOgpAQCAtMjcxLDE2 ICsyNzUsNyBAQCB2b2lkIFNjcmVlbkRpc3BsYXlDYXB0dXJlU291cmNlTWFjOjpmcmFtZUF2YWls YWJsZShDR0Rpc3BsYXlTdHJlYW1GcmFtZVN0YXR1cyBzdAogICAgICAgICBicmVhazsKICAgICB9 CiAKLSAgICBpZiAoIWZyYW1lU3VyZmFjZSB8fCAhZGlzcGxheVRpbWUpCi0gICAgICAgIHJldHVy bjsKLQotICAgIHNpemVfdCBjb3VudDsKLSAgICBhdXRvKiByZWN0cyA9IENHRGlzcGxheVN0cmVh bVVwZGF0ZUdldFJlY3RzKHVwZGF0ZVJlZiwga0NHRGlzcGxheVN0cmVhbVVwZGF0ZURpcnR5UmVj dHMsICZjb3VudCk7Ci0gICAgaWYgKCFyZWN0cyB8fCAhY291bnQpCi0gICAgICAgIHJldHVybjsK LQotICAgIExvY2tIb2xkZXIgbG9jayhtX2N1cnJlbnRGcmFtZU11dGV4KTsKLSAgICBtX2N1cnJl bnRGcmFtZSA9IGZyYW1lU3VyZmFjZTsKKyAgICBtX2N1cnJlbnRGcmFtZSA9IFdURk1vdmUobmV3 RnJhbWUpOwogfQogCiBPcHRpb25hbDxDYXB0dXJlRGV2aWNlPiBTY3JlZW5EaXNwbGF5Q2FwdHVy ZVNvdXJjZU1hYzo6c2NyZWVuQ2FwdHVyZURldmljZVdpdGhQZXJzaXN0ZW50SUQoY29uc3QgU3Ry aW5nJiBkZXZpY2VJRCkK