237042 2022-02-22 09:22:56 -0800 fast/mediastream/getUserMedia-to-canvas-1.html and fast/mediastream/getUserMedia-to-canvas-2.html are failing on MacOS when remote video frame flag is enabled 2022-03-03 23:56:32 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=237392 InRadar P2 Normal --- 237201 1 youennf youennf ap eric.carlson ews-watchlist glenn hta jenner jer.noble kkinnunen philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1844744 0 youennf 2022-02-22 09:22:56 -0800 See https://ews-build.webkit.org/#/builders/60/builds/24471. On the bots, this is happening on MacOS with webrtc remote frame turned on and WebGL GPUProcess turned off. 1844746 1 webkit-bug-importer 2022-02-22 09:24:08 -0800 <rdar://problem/89298601> 1846969 2 453481 youennf 2022-03-01 02:44:47 -0800 Created attachment 453481 Patch 1847052 3 453481 eric.carlson 2022-03-01 09:21:13 -0800 Comment on attachment 453481 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453481&action=review > LayoutTests/ChangeLog:3 > + fast/mediastream/getUserMedia-to-canvas-1.html and fast/mediastream/getUserMedia-to-canvas-2.html are failing on MacOS when remote video frame flag is enabled Nit: It would be nice to wrap the very long lines in this ChangeLog so they are easier to read on a small screen > LayoutTests/ChangeLog:9 > + Video element videoWidth/videoHeight are updated when track settings are changed, and not according video frames being received. s/not according video frames being/not when video frames are/ 1847064 4 453506 youennf 2022-03-01 09:36:29 -0800 Created attachment 453506 Patch for landing 1847094 5 ews-feeder 2022-03-01 10:36:21 -0800 Committed r290658 (247930@main): <https://commits.webkit.org/247930@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453506. 1847715 6 jenner 2022-03-02 18:44:57 -0800 Reverted r290658 for reason: r290658 broke two tests for iOS, slowing down EWS. Committed r290763 (248007@trunk): <https://commits.webkit.org/248007@trunk> 1847781 7 453707 youennf 2022-03-03 00:59:23 -0800 Created attachment 453707 Patch 1848191 8 ews-feeder 2022-03-03 23:56:28 -0800 Committed r290819 (248055@main): <https://commits.webkit.org/248055@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453707. 453481 2022-03-01 02:44:47 -0800 2022-03-01 09:36:24 -0800 Patch bug-237042-20220301114445.patch text/plain 4977 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNjM3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjdhOTYxNDhhNGFkNzg4MWRlYmZk NDJkZGVlNjEyOTcxZTZiNmJkYi4uNThiMjA4MDU4MjZkMWE0ZTQ4NTI1YTQ2YmI1N2I4YzZkYjRk NjFjOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIyLTAzLTAxICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBmYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRp YS10by1jYW52YXMtMS5odG1sIGFuZCBmYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRpYS10by1j YW52YXMtMi5odG1sIGFyZSBmYWlsaW5nIG9uIE1hY09TIHdoZW4gcmVtb3RlIHZpZGVvIGZyYW1l IGZsYWcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM3MDQyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTI5ODYwMT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBWaWRlbyBlbGVtZW50 IHZpZGVvV2lkdGgvdmlkZW9IZWlnaHQgYXJlIHVwZGF0ZWQgd2hlbiB0cmFjayBzZXR0aW5ncyBh cmUgY2hhbmdlZCwgYW5kIG5vdCBhY2NvcmRpbmcgdmlkZW8gZnJhbWVzIGJlaW5nIHJlY2VpdmVk LgorICAgICAgICBUaGlzIGRvZXMgbm90IGd1YXJhbnRlZSB0aGF0IHZpZGVvV2lkdGgvdmlkZW9I ZWlnaHQgKG1haW4gdGhyZWFkKSBhcmUgZnVsbHkgaW4gc3luYyB3aXRoIHRoZSBhY3R1YWwgdmlk ZW8gZnJhbWVzIChiYWNrZ3JvdW5kIHRocmVhZCkgd2hlbiB0aGVyZSBpcyBhIGNoYW5nZSBvZiBz aXplLgorICAgICAgICBXZSBtaWdodCBiZSBhYmxlIHRvIHRpZ2h0ZW4gdGhpcyBpbiBNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMgYnkgb25seSByZXNvcnRpbmcgb24gdmlkZW8g ZnJhbWVzLgorICAgICAgICBJbiB0aGUgbWVhbnRpbWUsIHdlIHVwZGF0ZSB0aGUgdGVzdCB0byBz ZXQgdGhlIG9yaWVudGF0aW9uIGJlZm9yZSBjcmVhdGluZyB0aGUgc291cmNlLgorICAgICAgICBU aGlzIG1ha2VzIHN1cmUgdGhlIHZpZGVvIGZyYW1lcyBoYXZlIHRoZSBleHBlY3RlZCBzaXplIGFu ZCByb3RhdGlvbi4KKworICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vZ2V0VXNlck1lZGlhLXRv LWNhbnZhcy0xLmh0bWw6CisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9nZXRVc2VyTWVkaWEt dG8tY2FudmFzLTIuaHRtbDoKKyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL3Jlc291cmNlcy9n ZXRVc2VyTWVkaWEtdG8tY2FudmFzLmpzOgorCiAyMDIyLTAzLTAxICBNYXR0IFdvb2Ryb3cgIDxt YXR0d29vZHJvd0BhcHBsZS5jb20+CiAKICAgICAgICAgSGFuZGxlIHBlcnBlbmRpY3VsYXIgY29u dGFpbmluZyBibG9ja3Mgd2hlbiBjb21wdXRpbmcgYXZhaWxhYmxlIGxvZ2ljYWwgaGVpZ2h0Lgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXRVc2VyTWVkaWEtdG8t Y2FudmFzLTEuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0VXNlck1lZGlh LXRvLWNhbnZhcy0xLmh0bWwKaW5kZXggMWYzNjgwNTcxYjM5NjEyZGFjMmI2ZjJlM2U3NTAzMDJj MTNkNjQzOC4uNDY3NDM0MTliMDFkNGM3MTdkYTIwZGI4ODlhN2UxYjc3YWZjMmNkZCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXRVc2VyTWVkaWEtdG8tY2FudmFz LTEuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRpYS10 by1jYW52YXMtMS5odG1sCkBAIC0xLDQgKzEsNCBAQAotPCFkb2N0eXBlIGh0bWw+PCEtLSB3ZWJr aXQtdGVzdC1ydW5uZXIgWyBXZWJSVENSZW1vdGVWaWRlb0ZyYW1lRW5hYmxlZD1mYWxzZSBdIC0t PgorPCFkb2N0eXBlIGh0bWw+CiA8aHRtbD4KIDxoZWFkPgogICAgIDxtZXRhIG5hbWU9InRpbWVv dXQiIGNvbnRlbnQ9ImxvbmciPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0 cmVhbS9nZXRVc2VyTWVkaWEtdG8tY2FudmFzLTIuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbWVk aWFzdHJlYW0vZ2V0VXNlck1lZGlhLXRvLWNhbnZhcy0yLmh0bWwKaW5kZXggZGYyOGVjZjdlM2Vk NGQ4OTU2ODk5NjgwNjk3YzFkMDRiOGY5YmQ0My4uZDcwZDQ4N2E3ZjU2MmI2ZmM5MmVlMTBhNzYw MjJiYzY2Y2M4NjRjNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9n ZXRVc2VyTWVkaWEtdG8tY2FudmFzLTIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlh c3RyZWFtL2dldFVzZXJNZWRpYS10by1jYW52YXMtMi5odG1sCkBAIC0xLDQgKzEsNCBAQAotPCFk b2N0eXBlIGh0bWw+PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBXZWJSVENSZW1vdGVWaWRlb0Zy YW1lRW5hYmxlZD1mYWxzZSBdIC0tPgorPCFkb2N0eXBlIGh0bWw+CiA8aHRtbD4KIDxoZWFkPgog ICAgIDxtZXRhIG5hbWU9InRpbWVvdXQiIGNvbnRlbnQ9ImxvbmciPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNvdXJjZXMvZ2V0VXNlck1lZGlhLXRvLWNhbnZh cy5qcyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vcmVzb3VyY2VzL2dldFVzZXJNZWRp YS10by1jYW52YXMuanMKaW5kZXggNzBiYzIzMGQ3M2JiYWMzMmM2NDVkODdlNzcyOTQwYjRiNzdm NTg5ZS4uOTYyMzYwMmFhMmFlMmNkZTdhN2JlYmI2ZGQ0M2MwNjc1MWYyYWM5NCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNvdXJjZXMvZ2V0VXNlck1lZGlhLXRv LWNhbnZhcy5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL3Jlc291cmNlcy9n ZXRVc2VyTWVkaWEtdG8tY2FudmFzLmpzCkBAIC0xMCw3ICsxMCw3IEBAIGFzeW5jIGZ1bmN0aW9u IGNyZWF0ZVNvdXJjZVZpZGVvKCkgewogICAgIGNvbnN0IHZpZGVvID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgidmlkZW8iKTsKICAgICB2aWRlby5zcmNPYmplY3QgPSBhd2FpdCBuYXZpZ2F0b3Iu bWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvOiB7IHdpZHRoOiB7IGV4YWN0OiB3aWR0 aCB9IH0gfSk7CiAgICAgYXdhaXQgdmlkZW8ucGxheSgpOwotICAgIGFzc2VydF9lcXVhbHModmlk ZW8udmlkZW9XaWR0aCwgd2lkdGgpOworICAgIGFzc2VydF90cnVlKHZpZGVvLnZpZGVvV2lkdGgg PT09IHdpZHRoIHx8IHZpZGVvLnZpZGVvSGVpZ2h0ID09PSB3aWR0aCk7CiAgICAgcmV0dXJuIHZp ZGVvOwogfQogCkBAIC0xMjcsMzAgKzEyNywxNiBAQCBmdW5jdGlvbiB0ZXN0RGVzY3JpcHRpb24o c3ViY2FzZSkgewogCiBhc3luYyBmdW5jdGlvbiB0ZXN0VXNlck1lZGlhVG9DYW52YXModCwgc3Vi Y2FzZSkgewogICAgIGNvbnN0IGRlc2MgPSB0ZXN0RGVzY3JpcHRpb24oc3ViY2FzZSk7CisgICAg Y29uc3QgW2FuZ2xlXSA9IHNldE1vY2tDYW1lcmFJbWFnZU9yaWVudGF0aW9uKHN1YmNhc2UuYW5n bGUpOwogICAgIGNvbnN0IHZpZGVvID0gYXdhaXQgY3JlYXRlU291cmNlVmlkZW8oKTsKICAgICBj b25zdCBkZWJ1Z2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZGVidWdlIik7CiAgICAgZGVi dWdlLmFwcGVuZCh2aWRlbyk7Ci0gICAgY29uc3QgcmVhbFZpZGVvU2l6ZSA9IFt2aWRlby52aWRl b1dpZHRoLCB2aWRlby52aWRlb0hlaWdodF07CisgICAgY29uc3QgdmlkZW9TaXplID0gW3ZpZGVv LnZpZGVvV2lkdGgsIHZpZGVvLnZpZGVvSGVpZ2h0XTsKICAgICB0LmFkZF9jbGVhbnVwKGFzeW5j ICgpID0+IHsKLSAgICAgICAgLy8gUmVzZXQgb3JpZW50YXRpb24gZm9yIHRoZSBuZXh0IHRlc3Qg YnkgZ29pbmcgdG8gMC4KLSAgICAgICAgaWYgKHN1YmNhc2UuYW5nbGUgPT0gMTgwKSB7Ci0gICAg ICAgICAgICAvLyAxODAgLT4gMCBjYW5ub3QgZGV0ZWN0IHJvdGF0aW9uIHZpYSB2aWRlbyBzaXpl IGNoYW5nZS4gR28gdmlhIDkwLgotICAgICAgICAgICAgY29uc3QgW2FuZ2xlLCB2aWRlb1NpemVd ID0gc2V0TW9ja0NhbWVyYUltYWdlT3JpZW50YXRpb24oOTAsIHJlYWxWaWRlb1NpemUpOwotICAg ICAgICAgICAgYXdhaXQgd2FpdEZvclZpZGVvU2l6ZSh2aWRlbywgdmlkZW9TaXplWzBdLCB2aWRl b1NpemVbMV0pOwotICAgICAgICB9CiAgICAgICAgIHNldE1vY2tDYW1lcmFJbWFnZU9yaWVudGF0 aW9uKDApOwotICAgICAgICBhd2FpdCB3YWl0Rm9yVmlkZW9TaXplKHZpZGVvLCByZWFsVmlkZW9T aXplWzBdLCByZWFsVmlkZW9TaXplWzFdKTsKICAgICAgICAgZGVidWdlLnJlbW92ZUNoaWxkKHZp ZGVvKTsKICAgICB9KTsKIAotICAgIGlmIChzdWJjYXNlLmFuZ2xlID09IDE4MCkgewotICAgICAg ICAvLyAwIC0+IDE4MCBjYW5ub3QgZGV0ZWN0IHJvdGF0aW9uIHZpYSB2aWRlbyBzaXplIGNoYW5n ZS4gR28gdmlhIDkwLgotICAgICAgICBjb25zdCBbYW5nbGUsIHZpZGVvU2l6ZV0gPSBzZXRNb2Nr Q2FtZXJhSW1hZ2VPcmllbnRhdGlvbig5MCwgcmVhbFZpZGVvU2l6ZSk7Ci0gICAgICAgIGF3YWl0 IHdhaXRGb3JWaWRlb1NpemUodmlkZW8sIHZpZGVvU2l6ZVswXSwgdmlkZW9TaXplWzFdKTsKLSAg ICB9Ci0gICAgY29uc3QgW2FuZ2xlLCB2aWRlb1NpemVdID0gc2V0TW9ja0NhbWVyYUltYWdlT3Jp ZW50YXRpb24oc3ViY2FzZS5hbmdsZSwgcmVhbFZpZGVvU2l6ZSk7Ci0gICAgYXdhaXQgd2FpdEZv clZpZGVvU2l6ZSh2aWRlbywgdmlkZW9TaXplWzBdLCB2aWRlb1NpemVbMV0pOwotCiAgICAgY29u c3QgY2FudmFzID0gY3JlYXRlVmVyaWZ5Q2FudmFzKHZpZGVvKTsKICAgICBkZWJ1Z2UuYXBwZW5k Q2hpbGQoY2FudmFzKTsKICAgICB0LmFkZF9jbGVhbnVwKGFzeW5jICgpID0+IGRlYnVnZS5yZW1v dmVDaGlsZChjYW52YXMpKTsK 453506 2022-03-01 09:36:29 -0800 2022-03-03 00:59:18 -0800 Patch for landing bug-237042-20220301183627.patch text/plain 4992 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNjM3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjdhOTYxNDhhNGFkNzg4MWRlYmZk NDJkZGVlNjEyOTcxZTZiNmJkYi4uZTI3ZDZiODM2MjBiNGMzNDI3Yjk5NTdmOWFiZDFmYzcxNGNh MDE3YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAzLTAxICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBmYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRp YS10by1jYW52YXMtMS5odG1sIGFuZCBmYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRpYS10by1j YW52YXMtMi5odG1sIGFyZSBmYWlsaW5nIG9uIE1hY09TIHdoZW4gcmVtb3RlIHZpZGVvIGZyYW1l IGZsYWcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM3MDQyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTI5ODYwMT4KKworICAg ICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgVmlkZW8gZWxlbWVudCB2 aWRlb1dpZHRoL3ZpZGVvSGVpZ2h0IGFyZSB1cGRhdGVkIHdoZW4gdHJhY2sgc2V0dGluZ3MgYXJl IGNoYW5nZWQsCisgICAgICAgIGFuZCBub3Qgd2hlbiB2aWRlbyBmcmFtZXMgYmVpbmcgcmVjZWl2 ZWQuCisKKyAgICAgICAgVGhpcyBkb2VzIG5vdCBndWFyYW50ZWUgdGhhdCB2aWRlb1dpZHRoL3Zp ZGVvSGVpZ2h0IChtYWluIHRocmVhZCkgYXJlIGZ1bGx5IGluIHN5bmMKKyAgICAgICAgd2l0aCB0 aGUgYWN0dWFsIHZpZGVvIGZyYW1lcyAoYmFja2dyb3VuZCB0aHJlYWQpIHdoZW4gdGhlcmUgaXMg YSBjaGFuZ2Ugb2Ygc2l6ZS4KKworICAgICAgICBXZSBtaWdodCBiZSBhYmxlIHRvIHRpZ2h0ZW4g dGhpcyBpbiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMgYnkgb25seSByZXNv cnRpbmcgb24gdmlkZW8gZnJhbWVzLgorICAgICAgICBJbiB0aGUgbWVhbnRpbWUsIHdlIHVwZGF0 ZSB0aGUgdGVzdCB0byBzZXQgdGhlIG9yaWVudGF0aW9uIGJlZm9yZSBjcmVhdGluZyB0aGUgc291 cmNlLgorICAgICAgICBUaGlzIG1ha2VzIHN1cmUgdGhlIHZpZGVvIGZyYW1lcyBoYXZlIHRoZSBl eHBlY3RlZCBzaXplIGFuZCByb3RhdGlvbi4KKworICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0v Z2V0VXNlck1lZGlhLXRvLWNhbnZhcy0xLmh0bWw6CisgICAgICAgICogZmFzdC9tZWRpYXN0cmVh bS9nZXRVc2VyTWVkaWEtdG8tY2FudmFzLTIuaHRtbDoKKyAgICAgICAgKiBmYXN0L21lZGlhc3Ry ZWFtL3Jlc291cmNlcy9nZXRVc2VyTWVkaWEtdG8tY2FudmFzLmpzOgorCiAyMDIyLTAzLTAxICBN YXR0IFdvb2Ryb3cgIDxtYXR0d29vZHJvd0BhcHBsZS5jb20+CiAKICAgICAgICAgSGFuZGxlIHBl cnBlbmRpY3VsYXIgY29udGFpbmluZyBibG9ja3Mgd2hlbiBjb21wdXRpbmcgYXZhaWxhYmxlIGxv Z2ljYWwgaGVpZ2h0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9n ZXRVc2VyTWVkaWEtdG8tY2FudmFzLTEuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJl YW0vZ2V0VXNlck1lZGlhLXRvLWNhbnZhcy0xLmh0bWwKaW5kZXggMWYzNjgwNTcxYjM5NjEyZGFj MmI2ZjJlM2U3NTAzMDJjMTNkNjQzOC4uNDY3NDM0MTliMDFkNGM3MTdkYTIwZGI4ODlhN2UxYjc3 YWZjMmNkZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXRVc2Vy TWVkaWEtdG8tY2FudmFzLTEuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFt L2dldFVzZXJNZWRpYS10by1jYW52YXMtMS5odG1sCkBAIC0xLDQgKzEsNCBAQAotPCFkb2N0eXBl IGh0bWw+PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBXZWJSVENSZW1vdGVWaWRlb0ZyYW1lRW5h YmxlZD1mYWxzZSBdIC0tPgorPCFkb2N0eXBlIGh0bWw+CiA8aHRtbD4KIDxoZWFkPgogICAgIDxt ZXRhIG5hbWU9InRpbWVvdXQiIGNvbnRlbnQ9ImxvbmciPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9tZWRpYXN0cmVhbS9nZXRVc2VyTWVkaWEtdG8tY2FudmFzLTIuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0VXNlck1lZGlhLXRvLWNhbnZhcy0yLmh0bWwKaW5k ZXggZGYyOGVjZjdlM2VkNGQ4OTU2ODk5NjgwNjk3YzFkMDRiOGY5YmQ0My4uZDcwZDQ4N2E3ZjU2 MmI2ZmM5MmVlMTBhNzYwMjJiYzY2Y2M4NjRjNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFz dC9tZWRpYXN0cmVhbS9nZXRVc2VyTWVkaWEtdG8tY2FudmFzLTIuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRpYS10by1jYW52YXMtMi5odG1sCkBAIC0x LDQgKzEsNCBAQAotPCFkb2N0eXBlIGh0bWw+PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBXZWJS VENSZW1vdGVWaWRlb0ZyYW1lRW5hYmxlZD1mYWxzZSBdIC0tPgorPCFkb2N0eXBlIGh0bWw+CiA8 aHRtbD4KIDxoZWFkPgogICAgIDxtZXRhIG5hbWU9InRpbWVvdXQiIGNvbnRlbnQ9ImxvbmciPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNvdXJjZXMvZ2V0VXNl ck1lZGlhLXRvLWNhbnZhcy5qcyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vcmVzb3Vy Y2VzL2dldFVzZXJNZWRpYS10by1jYW52YXMuanMKaW5kZXggNzBiYzIzMGQ3M2JiYWMzMmM2NDVk ODdlNzcyOTQwYjRiNzdmNTg5ZS4uOTYyMzYwMmFhMmFlMmNkZTdhN2JlYmI2ZGQ0M2MwNjc1MWYy YWM5NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9yZXNvdXJjZXMv Z2V0VXNlck1lZGlhLXRvLWNhbnZhcy5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3Ry ZWFtL3Jlc291cmNlcy9nZXRVc2VyTWVkaWEtdG8tY2FudmFzLmpzCkBAIC0xMCw3ICsxMCw3IEBA IGFzeW5jIGZ1bmN0aW9uIGNyZWF0ZVNvdXJjZVZpZGVvKCkgewogICAgIGNvbnN0IHZpZGVvID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidmlkZW8iKTsKICAgICB2aWRlby5zcmNPYmplY3QgPSBh d2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvOiB7IHdpZHRo OiB7IGV4YWN0OiB3aWR0aCB9IH0gfSk7CiAgICAgYXdhaXQgdmlkZW8ucGxheSgpOwotICAgIGFz c2VydF9lcXVhbHModmlkZW8udmlkZW9XaWR0aCwgd2lkdGgpOworICAgIGFzc2VydF90cnVlKHZp ZGVvLnZpZGVvV2lkdGggPT09IHdpZHRoIHx8IHZpZGVvLnZpZGVvSGVpZ2h0ID09PSB3aWR0aCk7 CiAgICAgcmV0dXJuIHZpZGVvOwogfQogCkBAIC0xMjcsMzAgKzEyNywxNiBAQCBmdW5jdGlvbiB0 ZXN0RGVzY3JpcHRpb24oc3ViY2FzZSkgewogCiBhc3luYyBmdW5jdGlvbiB0ZXN0VXNlck1lZGlh VG9DYW52YXModCwgc3ViY2FzZSkgewogICAgIGNvbnN0IGRlc2MgPSB0ZXN0RGVzY3JpcHRpb24o c3ViY2FzZSk7CisgICAgY29uc3QgW2FuZ2xlXSA9IHNldE1vY2tDYW1lcmFJbWFnZU9yaWVudGF0 aW9uKHN1YmNhc2UuYW5nbGUpOwogICAgIGNvbnN0IHZpZGVvID0gYXdhaXQgY3JlYXRlU291cmNl VmlkZW8oKTsKICAgICBjb25zdCBkZWJ1Z2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZGVi dWdlIik7CiAgICAgZGVidWdlLmFwcGVuZCh2aWRlbyk7Ci0gICAgY29uc3QgcmVhbFZpZGVvU2l6 ZSA9IFt2aWRlby52aWRlb1dpZHRoLCB2aWRlby52aWRlb0hlaWdodF07CisgICAgY29uc3Qgdmlk ZW9TaXplID0gW3ZpZGVvLnZpZGVvV2lkdGgsIHZpZGVvLnZpZGVvSGVpZ2h0XTsKICAgICB0LmFk ZF9jbGVhbnVwKGFzeW5jICgpID0+IHsKLSAgICAgICAgLy8gUmVzZXQgb3JpZW50YXRpb24gZm9y IHRoZSBuZXh0IHRlc3QgYnkgZ29pbmcgdG8gMC4KLSAgICAgICAgaWYgKHN1YmNhc2UuYW5nbGUg PT0gMTgwKSB7Ci0gICAgICAgICAgICAvLyAxODAgLT4gMCBjYW5ub3QgZGV0ZWN0IHJvdGF0aW9u IHZpYSB2aWRlbyBzaXplIGNoYW5nZS4gR28gdmlhIDkwLgotICAgICAgICAgICAgY29uc3QgW2Fu Z2xlLCB2aWRlb1NpemVdID0gc2V0TW9ja0NhbWVyYUltYWdlT3JpZW50YXRpb24oOTAsIHJlYWxW aWRlb1NpemUpOwotICAgICAgICAgICAgYXdhaXQgd2FpdEZvclZpZGVvU2l6ZSh2aWRlbywgdmlk ZW9TaXplWzBdLCB2aWRlb1NpemVbMV0pOwotICAgICAgICB9CiAgICAgICAgIHNldE1vY2tDYW1l cmFJbWFnZU9yaWVudGF0aW9uKDApOwotICAgICAgICBhd2FpdCB3YWl0Rm9yVmlkZW9TaXplKHZp ZGVvLCByZWFsVmlkZW9TaXplWzBdLCByZWFsVmlkZW9TaXplWzFdKTsKICAgICAgICAgZGVidWdl LnJlbW92ZUNoaWxkKHZpZGVvKTsKICAgICB9KTsKIAotICAgIGlmIChzdWJjYXNlLmFuZ2xlID09 IDE4MCkgewotICAgICAgICAvLyAwIC0+IDE4MCBjYW5ub3QgZGV0ZWN0IHJvdGF0aW9uIHZpYSB2 aWRlbyBzaXplIGNoYW5nZS4gR28gdmlhIDkwLgotICAgICAgICBjb25zdCBbYW5nbGUsIHZpZGVv U2l6ZV0gPSBzZXRNb2NrQ2FtZXJhSW1hZ2VPcmllbnRhdGlvbig5MCwgcmVhbFZpZGVvU2l6ZSk7 Ci0gICAgICAgIGF3YWl0IHdhaXRGb3JWaWRlb1NpemUodmlkZW8sIHZpZGVvU2l6ZVswXSwgdmlk ZW9TaXplWzFdKTsKLSAgICB9Ci0gICAgY29uc3QgW2FuZ2xlLCB2aWRlb1NpemVdID0gc2V0TW9j a0NhbWVyYUltYWdlT3JpZW50YXRpb24oc3ViY2FzZS5hbmdsZSwgcmVhbFZpZGVvU2l6ZSk7Ci0g ICAgYXdhaXQgd2FpdEZvclZpZGVvU2l6ZSh2aWRlbywgdmlkZW9TaXplWzBdLCB2aWRlb1NpemVb MV0pOwotCiAgICAgY29uc3QgY2FudmFzID0gY3JlYXRlVmVyaWZ5Q2FudmFzKHZpZGVvKTsKICAg ICBkZWJ1Z2UuYXBwZW5kQ2hpbGQoY2FudmFzKTsKICAgICB0LmFkZF9jbGVhbnVwKGFzeW5jICgp ID0+IGRlYnVnZS5yZW1vdmVDaGlsZChjYW52YXMpKTsK 453707 2022-03-03 00:59:23 -0800 2022-03-03 23:56:30 -0800 Patch bug-237042-20220303095921.patch text/plain 4078 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzY5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzg0ZTI3OWY2NmE2MjhjNWQ4MWE2 MzBkOGVmZDAyM2E5NWMzZDQwZC4uYWI2ODFjMjFlMDI2Y2RmMWFhMzdjMTYyYTZhYWUwMGM0ODAz MDAxMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAzLTAyICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBmYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRp YS10by1jYW52YXMtMS5odG1sIGFuZCBmYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRpYS10by1j YW52YXMtMi5odG1sIGFyZSBmYWlsaW5nIG9uIE1hY09TIHdoZW4gcmVtb3RlIHZpZGVvIGZyYW1l IGZsYWcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM3MDQyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84OTI5ODYwMT4KKworICAg ICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgVmlkZW8gZWxlbWVudCB2 aWRlb1dpZHRoL3ZpZGVvSGVpZ2h0IGFyZSB1cGRhdGVkIHdoZW4gdHJhY2sgc2V0dGluZ3MgYXJl IGNoYW5nZWQsCisgICAgICAgIGFuZCBub3Qgd2hlbiB2aWRlbyBmcmFtZXMgYmVpbmcgcmVjZWl2 ZWQuCisKKyAgICAgICAgVGhpcyBkb2VzIG5vdCBndWFyYW50ZWUgdGhhdCB2aWRlb1dpZHRoL3Zp ZGVvSGVpZ2h0IChtYWluIHRocmVhZCkgYXJlIGZ1bGx5IGluIHN5bmMKKyAgICAgICAgd2l0aCB0 aGUgYWN0dWFsIHZpZGVvIGZyYW1lcyAoYmFja2dyb3VuZCB0aHJlYWQpIHdoZW4gdGhlcmUgaXMg YSBjaGFuZ2Ugb2Ygc2l6ZS4KKworICAgICAgICBXZSBtaWdodCBiZSBhYmxlIHRvIHRpZ2h0ZW4g dGhpcyBpbiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMgYnkgb25seSByZXNv cnRpbmcgb24gdmlkZW8gZnJhbWVzLgorICAgICAgICBJbiB0aGUgbWVhbnRpbWUsIHdlIHVwZGF0 ZSB0aGUgdGVzdCB0byB1c2UgcmVxdWVzdFZpZGVvRnJhbWVDYWxsYmFjayB3aGljaCBwcm92aWRl cyBhY2N1cmF0ZSBwZXIgZnJhbWUgbWV0YWRhdGEuCisKKyAgICAgICAgKiBmYXN0L21lZGlhc3Ry ZWFtL2dldFVzZXJNZWRpYS10by1jYW52YXMtMS5odG1sOgorICAgICAgICAqIGZhc3QvbWVkaWFz dHJlYW0vZ2V0VXNlck1lZGlhLXRvLWNhbnZhcy0yLmh0bWw6CisgICAgICAgICogd2VicnRjL3Jv dXRpbmVzLmpzOgorCiAyMDIyLTAzLTAyICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29t PgogCiAgICAgICAgIFRocm93IHByb3BlciBleGNlcHRpb24gb24gZmFpbGVkIHJlbW92ZUVudHJ5 KCkgY2FsbHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0VXNl ck1lZGlhLXRvLWNhbnZhcy0xLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL2dl dFVzZXJNZWRpYS10by1jYW52YXMtMS5odG1sCmluZGV4IDFmMzY4MDU3MWIzOTYxMmRhYzJiNmYy ZTNlNzUwMzAyYzEzZDY0MzguLjQ2NzQzNDE5YjAxZDRjNzE3ZGEyMGRiODg5YTdlMWI3N2FmYzJj ZGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0VXNlck1lZGlh LXRvLWNhbnZhcy0xLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXRV c2VyTWVkaWEtdG8tY2FudmFzLTEuaHRtbApAQCAtMSw0ICsxLDQgQEAKLTwhZG9jdHlwZSBodG1s PjwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgV2ViUlRDUmVtb3RlVmlkZW9GcmFtZUVuYWJsZWQ9 ZmFsc2UgXSAtLT4KKzwhZG9jdHlwZSBodG1sPgogPGh0bWw+CiA8aGVhZD4KICAgICA8bWV0YSBu YW1lPSJ0aW1lb3V0IiBjb250ZW50PSJsb25nIj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvbWVkaWFzdHJlYW0vZ2V0VXNlck1lZGlhLXRvLWNhbnZhcy0yLmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L21lZGlhc3RyZWFtL2dldFVzZXJNZWRpYS10by1jYW52YXMtMi5odG1sCmluZGV4IGRm MjhlY2Y3ZTNlZDRkODk1Njg5OTY4MDY5N2MxZDA0YjhmOWJkNDMuLmQ3MGQ0ODdhN2Y1NjJiNmZj OTJlZTEwYTc2MDIyYmM2NmNjODY0YzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVk aWFzdHJlYW0vZ2V0VXNlck1lZGlhLXRvLWNhbnZhcy0yLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9tZWRpYXN0cmVhbS9nZXRVc2VyTWVkaWEtdG8tY2FudmFzLTIuaHRtbApAQCAtMSw0ICsx LDQgQEAKLTwhZG9jdHlwZSBodG1sPjwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgV2ViUlRDUmVt b3RlVmlkZW9GcmFtZUVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzwhZG9jdHlwZSBodG1sPgogPGh0bWw+ CiA8aGVhZD4KICAgICA8bWV0YSBuYW1lPSJ0aW1lb3V0IiBjb250ZW50PSJsb25nIj4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy9yb3V0aW5lcy5qcyBiL0xheW91dFRlc3RzL3dlYnJ0 Yy9yb3V0aW5lcy5qcwppbmRleCBmMGI0Y2EwYzRhYjliMjU1OTM5ODMxNzU5NDkzYzRiYmYxMGU0 YTBhLi45NGYzOTVjM2NlOTc4M2M2NDg4ODllZDQwYzQzNzY5ZWEwNmVjYTQwIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy93ZWJydGMvcm91dGluZXMuanMKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRj L3JvdXRpbmVzLmpzCkBAIC0xNTAsOSArMTUwLDE2IEBAIGZ1bmN0aW9uIHdhaXRGb3IoZHVyYXRp b24pCiAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PiBzZXRUaW1lb3V0KHJlc29s dmUsIGR1cmF0aW9uKSk7CiB9CiAKLWZ1bmN0aW9uIHdhaXRGb3JWaWRlb1NpemUodmlkZW8sIHdp ZHRoLCBoZWlnaHQsIGNvdW50KQorYXN5bmMgZnVuY3Rpb24gd2FpdEZvclZpZGVvU2l6ZSh2aWRl bywgd2lkdGgsIGhlaWdodCwgY291bnQpCiB7Ci0gICAgaWYgKHZpZGVvLnZpZGVvV2lkdGggPT09 IHdpZHRoICYmIHZpZGVvLnZpZGVvSGVpZ2h0ID09PSBoZWlnaHQpCisgICAgaWYgKHZpZGVvLnJl cXVlc3RWaWRlb0ZyYW1lQ2FsbGJhY2spIHsKKyAgICAgICAgY29uc3QgZnJhbWVNZXRhZGF0YSA9 IGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gdmlkZW8ucmVxdWVzdFZpZGVvRnJhbWVDYWxs YmFjaygobm93LCBtZXRhZGF0YSkgPT4geworICAgICAgICAgICAgcmVzb2x2ZShtZXRhZGF0YSk7 CisgICAgICAgIH0pKTsKKworICAgICAgICBpZiAoZnJhbWVNZXRhZGF0YS53aWR0aCA9PT0gd2lk dGggJiYgZnJhbWVNZXRhZGF0YS5oZWlnaHQgPT09IGhlaWdodCkKKyAgICAgICAgICAgIHJldHVy biBQcm9taXNlLnJlc29sdmUoInZpZGVvIGhhcyBleHBlY3RlZCBzaXplIik7CisgICAgfSBlbHNl IGlmICh2aWRlby52aWRlb1dpZHRoID09PSB3aWR0aCAmJiB2aWRlby52aWRlb0hlaWdodCA9PT0g aGVpZ2h0KQogICAgICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCJ2aWRlbyBoYXMgZXhwZWN0 ZWQgc2l6ZSIpOwogCiAgICAgaWYgKGNvdW50ID09PSB1bmRlZmluZWQpCkBAIC0xNjAsOSArMTY3 LDggQEAgZnVuY3Rpb24gd2FpdEZvclZpZGVvU2l6ZSh2aWRlbywgd2lkdGgsIGhlaWdodCwgY291 bnQpCiAgICAgaWYgKCsrY291bnQgPiAyMCkKICAgICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0 KCJ3YWl0Rm9yVmlkZW9TaXplIHRpbWVkIG91dCwgZXhwZWN0ZWQgIiArIHdpZHRoICsgIngiKyBo ZWlnaHQgKyAiIGJ1dCBnb3QgIiArIHZpZGVvLnZpZGVvV2lkdGggKyAieCIgKyB2aWRlby52aWRl b0hlaWdodCk7CiAKLSAgICByZXR1cm4gd2FpdEZvcigxMDApLnRoZW4oKCkgPT4gewotICAgICAg ICByZXR1cm4gd2FpdEZvclZpZGVvU2l6ZSh2aWRlbywgd2lkdGgsIGhlaWdodCwgY291bnQpOwot ICAgIH0pOworICAgIGF3YWl0IHdhaXRGb3IoMTAwKTsKKyAgICByZXR1cm4gd2FpdEZvclZpZGVv U2l6ZSh2aWRlbywgd2lkdGgsIGhlaWdodCwgY291bnQpOwogfQogCiBhc3luYyBmdW5jdGlvbiBk b0h1bUFuYWx5c2lzKHN0cmVhbSwgZXhwZWN0ZWQpCg==