235952 2022-02-01 08:00:28 -0800 RealtimeIncomingVideoSourceCocoa should not need to create IOSurfaces 2022-02-03 06:08:58 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 235951 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble kkinnunen philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1835966 0 youennf 2022-02-01 08:00:28 -0800 RealtimeIncomingVideoSourceCocoa should not need to create IOSurfaces 1835975 1 450530 youennf 2022-02-01 08:19:08 -0800 Created attachment 450530 Patch 1835983 2 webkit-bug-importer 2022-02-01 08:39:54 -0800 <rdar://problem/88329641> 1836424 3 450530 youennf 2022-02-02 06:45:17 -0800 Comment on attachment 450530 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450530&action=review > Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSourceCocoa.mm:121 > } https://bugs.webkit.org/show_bug.cgi?id=236011 is introducing createInMemoryCVPixelBufferPool we should probably use here. 1836808 4 450747 youennf 2022-02-03 01:36:00 -0800 Created attachment 450747 Patch for landing 1836908 5 ews-feeder 2022-02-03 06:08:55 -0800 Committed r289049 (246756@main): <https://commits.webkit.org/246756@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450747. 450530 2022-02-01 08:19:08 -0800 2022-02-03 01:35:54 -0800 Patch bug-235952-20220201171907.patch text/plain 7971 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4Nzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU3OGU3ZDc4Y2ZhMDk5 MjAxOTBmZGQ5NDYzMGJmNjM3MWNkNmU5Ni4uNmNjYThjZmRjYjIwYTlmNjU1YmQyZTM3NDMwZTA1 NzI1ZTc5ZmEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZWFsdGltZUluY29taW5n VmlkZW9Tb3VyY2VDb2NvYSBzaG91bGQgbm90IG5lZWQgdG8gY3JlYXRlIElPU3VyZmFjZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTk1MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IHdlYnJ0 Yy92cDgtdGhlbi1oMjY0Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21h Yy9SZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYS5tbToKKyAgICAgICAgSW5zdGVhZCBv ZiB1c2luZyBhbiBJT1N1cmZhY2UtYmFzZWQgYnVmZmVyIHBvb2wsIHdlIHVzZSBhIHJlZ3VsYXIg bWVtb3J5IGJ1ZmZlciBwb29sLgorICAgICAgICBBIGZvbGxvdy11cCBzaG91bGQgcHJvYmFibHkg cmVtb3ZlIHRoZSBuZWVkIHRvIGNvbnZlcnQgWVVWNDIwIHdlYnJ0YyB2aWRlbyBmcmFtZXMgdG8g TlYxMiBDVlBpeGVsQnVmZmVycyBpbiBSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYSwK KyAgICAgICAgc28gYXMgdG8gbGVhdmUgdGhhdCB0byB3aGVuIGNvcHlpbmcgdGhlIHdlYnJ0YyB2 aWRlbyBmcmFtZXMgaW50byBzaGFyZWQgbWVtb3J5IGJ1ZmZlcnMgdXNlZCBmb3IgSVBDLgorCiAy MDIyLTAyLTAxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBM aWJXZWJSVENDb2RlY3Mgc2hvdWxkIG5vdCBuZWVkIHRvIGNyZWF0ZSBJT1N1cmZhY2VzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJ bmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0KaW5kZXggOWYw NjcwYzIwYjhhNGI4YjI3NDZhMjgwYzM3MTM0NjgzY2I3ZWUxYi4uMWY0MWE0OTZlNTJlMzE0Mzlh Njc0YjJhZDM4YzNkOWNlYWQ3YTNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29t aW5nVmlkZW9Tb3VyY2VDb2NvYS5tbQpAQCAtOTksMTMgKzk5LDMxIEBAIENWUGl4ZWxCdWZmZXJQ b29sUmVmIFJlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hOjpwaXhlbEJ1ZmZlclBvb2wo c2l6ZV90IHdpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSB3ZWJydGM6OkJ1ZmZl clR5cGU6OkkwMTA6CiAgICAgICAgICAgICBwb29sQnVmZmVyVHlwZSA9IGtDVlBpeGVsRm9ybWF0 VHlwZV80MjBZcENiQ3IxMEJpUGxhbmFyVmlkZW9SYW5nZTsKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIH0K LSAgICAgICAgaWYgKGF1dG8gcG9vbCA9IGNyZWF0ZUlPU3VyZmFjZUNWUGl4ZWxCdWZmZXJQb29s KHdpZHRoLCBoZWlnaHQsIHBvb2xCdWZmZXJUeXBlKSkgewotICAgICAgICAgICAgbV9waXhlbEJ1 ZmZlclBvb2wgPSBXVEZNb3ZlKCpwb29sKTsKLSAgICAgICAgICAgIG1fcGl4ZWxCdWZmZXJQb29s V2lkdGggPSB3aWR0aDsKLSAgICAgICAgICAgIG1fcGl4ZWxCdWZmZXJQb29sSGVpZ2h0ID0gaGVp Z2h0OwotICAgICAgICAgICAgbV9waXhlbEJ1ZmZlclBvb2xCdWZmZXJUeXBlID0gYnVmZmVyVHlw ZTsKKworICAgICAgICBhdXRvIHBpeGVsQXR0cmlidXRlcyA9IEB7CisgICAgICAgICAgICAoX19i cmlkZ2UgTlNTdHJpbmcgKilrQ1ZQaXhlbEJ1ZmZlcldpZHRoS2V5OiBAKHdpZHRoKSwKKyAgICAg ICAgICAgIChfX2JyaWRnZSBOU1N0cmluZyAqKWtDVlBpeGVsQnVmZmVySGVpZ2h0S2V5OiBAKGhl aWdodCksCisgICAgICAgICAgICAoX19icmlkZ2UgTlNTdHJpbmcgKilrQ1ZQaXhlbEJ1ZmZlclBp eGVsRm9ybWF0VHlwZUtleTogQChwb29sQnVmZmVyVHlwZSksCisgICAgICAgICAgICAoX19icmlk Z2UgTlNTdHJpbmcgKilrQ1ZQaXhlbEJ1ZmZlckNHSW1hZ2VDb21wYXRpYmlsaXR5S2V5IDogQE5P LAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgIChfX2JyaWRnZSBOU1N0cmluZyAqKWtD VlBpeGVsQnVmZmVyT3BlbkdMQ29tcGF0aWJpbGl0eUtleSA6IEBZRVMsCisjZW5kaWYKKyAgICAg ICAgfTsKKworICAgICAgICBDVlBpeGVsQnVmZmVyUG9vbFJlZiByYXdQb29sID0gbnVsbHB0cjsK KyAgICAgICAgaWYgKGF1dG8gcmVzdWx0ID0gQ1ZQaXhlbEJ1ZmZlclBvb2xDcmVhdGUoa0NGQWxs b2NhdG9yRGVmYXVsdCwgbnVsbHB0ciwgKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilwaXhlbEF0 dHJpYnV0ZXMsICZyYXdQb29sKTsgcmVzdWx0ICE9IG5vRXJyKSB7CisgICAgICAgICAgICBSRUxF QVNFX0xPR19FUlJPUihXZWJSVEMsICJSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYSBm YWlsZWQgY3JlYXRpbmcgYnVmZmVyIHBvb2wgd2l0aCBlcnJvciAlZCIsIHJlc3VsdCk7CisgICAg ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgfQorCisgICAgICAgIG1fcGl4ZWxCdWZm ZXJQb29sID0gYWRvcHRDRihyYXdQb29sKTsKKyAgICAgICAgbV9waXhlbEJ1ZmZlclBvb2xXaWR0 aCA9IHdpZHRoOworICAgICAgICBtX3BpeGVsQnVmZmVyUG9vbEhlaWdodCA9IGhlaWdodDsKKyAg ICAgICAgbV9waXhlbEJ1ZmZlclBvb2xCdWZmZXJUeXBlID0gYnVmZmVyVHlwZTsKICAgICB9CiAg ICAgcmV0dXJuIG1fcGl4ZWxCdWZmZXJQb29sLmdldCgpOwogfQpAQCAtMTIxLDYgKzEzOSw4IEBA IFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VD b2NvYTo6cGl4ZWxCdWZmZXJGcm9tVmlkCiAgICAgICAgIHJldHVybiBtX2JsYWNrRnJhbWUuZ2V0 KCk7CiAgICAgfQogCisgICAgLy8gSW4gY2FzZSBvZiBpbiBtZW1vcnkgc2FtcGxlcywgd2UgaGF2 ZSBub24gaW50ZXJsZWF2ZWQgWVVWIGRhdGEgd2hpbGUgQ1ZQaXhlbEJ1ZmZlcnMgcHJlZmVyIGlu dGVybGVhdmVkIFlVViBkYXRhLgorICAgIC8vIE1heWJlIHdlIHNob3VsZCBpbnRyb2R1Y2UgYSBN ZWRpYVNhbXBsZSB0aGF0IHdvdWxkIHJlcHJlc2VudCBub24gaW50ZXJsZWF2ZWQgWVVWIGRhdGEg YXMgYW4gb3B0aW1pemF0aW9uLgogICAgIHJldHVybiBhZG9wdENGKHdlYnJ0Yzo6Y3JlYXRlUGl4 ZWxCdWZmZXJGcm9tRnJhbWUoZnJhbWUsIFt0aGlzXShzaXplX3Qgd2lkdGgsIHNpemVfdCBoZWln aHQsIHdlYnJ0Yzo6QnVmZmVyVHlwZSBidWZmZXJUeXBlKSAtPiBDVlBpeGVsQnVmZmVyUmVmIHsK ICAgICAgICAgYXV0byBwaXhlbEJ1ZmZlclBvb2wgPSB0aGlzLT5waXhlbEJ1ZmZlclBvb2wod2lk dGgsIGhlaWdodCwgYnVmZmVyVHlwZSk7CiAgICAgICAgIGlmICghcGl4ZWxCdWZmZXJQb29sKQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDkxMDFkMjg5ZTFmZWYyNTAzM2VjZjJjZTQ2YWIwYWZhZmE2MzRjNTYuLjY2NTBiYTgy YWQ4ODhmM2ZmYmFhZTJkODA1NTYzMTMyZTlmZDMxOGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMi0wMi0wMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAg UmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2Egc2hvdWxkIG5vdCBuZWVkIHRvIGNyZWF0 ZSBJT1N1cmZhY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzU5NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHdlYnJ0Yy92cDgtdGhlbi1oMjY0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogd2VicnRjL3ZwOC10aGVuLWgyNjQuaHRtbDogQWRkZWQuCisKIDIwMjItMDEtMzEgIFlvdWVu biBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2VXb3JrZXJOYXZp Z2F0aW9uUHJlbG9hZGVyIHNob3VsZCBvbmx5IGJlIHVzZWQgb25jZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvd2VicnRjL3ZwOC10aGVuLWgyNjQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv d2VicnRjL3ZwOC10aGVuLWgyNjQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc4NmQxZjZhNDMw Yzc0NzNhYTliMDJkNmE4NzFkNzNhOGMwZmY2OGEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy93ZWJydGMvdnA4LXRoZW4taDI2NC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3IEBACitW aWRlbyBzaG91bGQgYmUgcnVubmluZywgZ28gdG8gYmxhY2sgYW5kIHJ1bm5pbmcuCitGb2xsb3dp bmcsIHNob3VsZCBiZSBhIHNuYXBzaG90IG9mIHRoZSB2aWRlbywgYSBibGFjayBmcmFtZSBhbmQg YSBzbmFwc2hvdCBvZiB0aGUgdmlkZW8uCisKKworUEFTUyBTZXR0aW5nIHZpZGVvIGV4Y2hhbmdl IHdpdGggVlA4CitQQVNTIFNldHRpbmcgZXhjaGFuZ2Ugd2l0aCBIMjY0IHVzaW5nIFZQOCBkZWNv ZGVkIHN0cmVhbSBhcyBpbnB1dAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvdnA4 LXRoZW4taDI2NC5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZwOC10aGVuLWgyNjQuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi41NmZmNTZhZTk4NDg0MzkxYzI0YjY4ODgyNmM1MTQxMDkwODE1OTQ2Ci0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZwOC10aGVuLWgyNjQuaHRtbApAQCAt MCwwICsxLDYyIEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAg ICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CisgICAgICAgIDx0aXRsZT5UZXN0aW5nIG11dGluZyB2 aWRlbzwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5l c3MuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3Ro YXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAg ICAgIDxkaXY+VmlkZW8gc2hvdWxkIGJlIHJ1bm5pbmcsIGdvIHRvIGJsYWNrIGFuZCBydW5uaW5n LjwvZGl2PgorICAgICAgICA8ZGl2PkZvbGxvd2luZywgc2hvdWxkIGJlIGEgc25hcHNob3Qgb2Yg dGhlIHZpZGVvLCBhIGJsYWNrIGZyYW1lIGFuZCBhIHNuYXBzaG90IG9mIHRoZSB2aWRlby48L2Rp dj4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbzEiIGF1dG9wbGF5IHBsYXlzSW5saW5lIHdpZHRo PSIzMjAiIGhlaWdodD0iMjQwIj48L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvMiIg YXV0b3BsYXkgcGxheXNJbmxpbmUgd2lkdGg9IjMyMCIgaGVpZ2h0PSIyNDAiPjwvdmlkZW8+Cisg ICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhczEiIHdpZHRoPSIzMjAiIGhlaWdodD0iMjQwIj48L2Nh bnZhcz4KKyAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzMiIgd2lkdGg9IjMyMCIgaGVpZ2h0PSIy NDAiPjwvY2FudmFzPgorICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXMzIiB3aWR0aD0iMzIwIiBo ZWlnaHQ9IjI0MCI+PC9jYW52YXM+CisgICAgICAgIDxzY3JpcHQgc3JjID0icm91dGluZXMuanMi Pjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0PgordmFyIHRyYWNrOwordmFyIHJlbW90ZVRyYWNr OwordmFyIHJlY2VpdmluZ0Nvbm5lY3Rpb247Citwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKKyAg ICByZXR1cm4gbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoe3ZpZGVvOiB7d2lk dGg6IDMyMCwgaGVpZ2h0OiAyNDAgfX0pLnRoZW4oKGxvY2FsU3RyZWFtKSA9PiB7CisgICAgICAg IHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICB0 cmFjayA9IGxvY2FsU3RyZWFtLmdldFZpZGVvVHJhY2tzKClbMF07CisKKyAgICAgICAgICAgIGNy ZWF0ZUNvbm5lY3Rpb25zKChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgICAgICBm aXJzdENvbm5lY3Rpb24uYWRkVHJhY2sodHJhY2ssIGxvY2FsU3RyZWFtKTsKKyAgICAgICAgICAg ICAgICBmaXJzdENvbm5lY3Rpb24uZ2V0VHJhbnNjZWl2ZXJzKClbMF0uc2V0Q29kZWNQcmVmZXJl bmNlcyhbe21pbWVUeXBlOiAidmlkZW8vVlA4IiwgY2xvY2tSYXRlOiA5MDAwMH1dKTsKKyAgICAg ICAgICAgIH0sIChzZWNvbmRDb25uZWN0aW9uKSA9PiB7CisgICAgICAgICAgICAgICAgcmVjZWl2 aW5nQ29ubmVjdGlvbiA9IHNlY29uZENvbm5lY3Rpb247CisgICAgICAgICAgICAgICAgc2Vjb25k Q29ubmVjdGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICAg ICAgcmVtb3RlVHJhY2sgPSB0cmFja0V2ZW50LnRyYWNrOworICAgICAgICAgICAgICAgICAgICBy ZXNvbHZlKHRyYWNrRXZlbnQuc3RyZWFtc1swXSk7CisgICAgICAgICAgICAgICAgfTsKKyAgICAg ICAgICAgIH0pOworICAgICAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIlRlc3QgdGlt ZWQgb3V0IiksIDUwMDApOworICAgICAgICB9KTsKKyAgICB9KS50aGVuKChyZW1vdGVTdHJlYW0p ID0+IHsKKyAgICAgICAgdmlkZW8xLnNyY09iamVjdCA9IHJlbW90ZVN0cmVhbTsKKyAgICAgICAg cmV0dXJuIHZpZGVvMS5wbGF5KCk7CisgICAgfSk7Cit9LCAiU2V0dGluZyB2aWRlbyBleGNoYW5n ZSB3aXRoIFZQOCIpOworCitwcm9taXNlX3Rlc3QoYXN5bmMgKCkgPT4geworICAgIHZpZGVvMi5z cmNPYmplY3QgPSBhd2FpdCBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAg ICAgIGNyZWF0ZUNvbm5lY3Rpb25zKChmaXJzdENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAg IGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayh2aWRlbzEuc3JjT2JqZWN0LmdldFZpZGVvVHJhY2tz KClbMF0sIHZpZGVvMS5zcmNPYmplY3QpOworICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikg PT4geworICAgICAgICAgICAgcmVjZWl2aW5nQ29ubmVjdGlvbiA9IHNlY29uZENvbm5lY3Rpb247 CisgICAgICAgICAgICBzZWNvbmRDb25uZWN0aW9uLm9udHJhY2sgPSAodHJhY2tFdmVudCkgPT4g eworICAgICAgICAgICAgICAgIHJlbW90ZVRyYWNrID0gdHJhY2tFdmVudC50cmFjazsKKyAgICAg ICAgICAgICAgICByZXNvbHZlKHRyYWNrRXZlbnQuc3RyZWFtc1swXSk7CisgICAgICAgICAgICB9 OworICAgICAgICB9KTsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIlRlc3QgdGlt ZWQgb3V0IiksIDUwMDApOworICAgIH0pOworICAgIGF3YWl0IHZpZGVvMi5wbGF5KCk7Cit9LCAi U2V0dGluZyBleGNoYW5nZSB3aXRoIEgyNjQgdXNpbmcgVlA4IGRlY29kZWQgc3RyZWFtIGFzIGlu cHV0Iik7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4K 450747 2022-02-03 01:36:00 -0800 2022-02-03 06:08:56 -0800 Patch for landing bug-235952-20220203103559.patch text/plain 7445 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDIzYzMwNmQ2NzY4ZTM4 NDhkZTQzMTY1ZjVmM2I5ODI4ZDUxMWQ0NC4uY2ZhMGU0MjY0M2U2Y2ZmOGQxZTVmNWE3YzllOWMx NzM0ODg3ODRiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTAzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZWFsdGltZUluY29taW5n VmlkZW9Tb3VyY2VDb2NvYSBzaG91bGQgbm90IG5lZWQgdG8gY3JlYXRlIElPU3VyZmFjZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTk1MgorCisg ICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBUZXN0OiB3ZWJydGMv dnA4LXRoZW4taDI2NC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMv UmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW06CisgICAgICAgIEluc3RlYWQgb2Yg dXNpbmcgYW4gSU9TdXJmYWNlLWJhc2VkIGJ1ZmZlciBwb29sLCB3ZSB1c2UgYSByZWd1bGFyIG1l bW9yeSBidWZmZXIgcG9vbC4KKyAgICAgICAgQSBmb2xsb3ctdXAgc2hvdWxkIHByb2JhYmx5IHJl bW92ZSB0aGUgbmVlZCB0byBjb252ZXJ0IFlVVjQyMCB3ZWJydGMgdmlkZW8gZnJhbWVzIHRvIE5W MTIgQ1ZQaXhlbEJ1ZmZlcnMgaW4gUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EsCisg ICAgICAgIHNvIGFzIHRvIGxlYXZlIHRoYXQgdG8gd2hlbiBjb3B5aW5nIHRoZSB3ZWJydGMgdmlk ZW8gZnJhbWVzIGludG8gc2hhcmVkIG1lbW9yeSBidWZmZXJzIHVzZWQgZm9yIElQQy4KKwogMjAy Mi0wMi0wMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSyBtYWtlIGRpc3RjaGVjawpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdWaWRl b1NvdXJjZUNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tCmluZGV4IDlmMDY3MGMyMGI4YTRi OGIyNzQ2YTI4MGMzNzEzNDY4M2NiN2VlMWIuLjUzN2VhMGI1MTEzMWNjYzFjODVkMGIwM2VjM2E3 NDJjYjYyNzk0NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL21hYy9SZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYS5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291 cmNlQ29jb2EubW0KQEAgLTk5LDEzICs5OSwyMSBAQCBDVlBpeGVsQnVmZmVyUG9vbFJlZiBSZWFs dGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYTo6cGl4ZWxCdWZmZXJQb29sKHNpemVfdCB3aQog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Ugd2VicnRjOjpCdWZmZXJUeXBlOjpJMDEw OgogICAgICAgICAgICAgcG9vbEJ1ZmZlclR5cGUgPSBrQ1ZQaXhlbEZvcm1hdFR5cGVfNDIwWXBD YkNyMTBCaVBsYW5hclZpZGVvUmFuZ2U7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgZGVm YXVsdDoKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICB9Ci0gICAgICAgIGlm IChhdXRvIHBvb2wgPSBjcmVhdGVJT1N1cmZhY2VDVlBpeGVsQnVmZmVyUG9vbCh3aWR0aCwgaGVp Z2h0LCBwb29sQnVmZmVyVHlwZSkpIHsKLSAgICAgICAgICAgIG1fcGl4ZWxCdWZmZXJQb29sID0g V1RGTW92ZSgqcG9vbCk7Ci0gICAgICAgICAgICBtX3BpeGVsQnVmZmVyUG9vbFdpZHRoID0gd2lk dGg7Ci0gICAgICAgICAgICBtX3BpeGVsQnVmZmVyUG9vbEhlaWdodCA9IGhlaWdodDsKLSAgICAg ICAgICAgIG1fcGl4ZWxCdWZmZXJQb29sQnVmZmVyVHlwZSA9IGJ1ZmZlclR5cGU7CisKKyAgICAg ICAgYXV0byByZXN1bHQgPSBjcmVhdGVJbk1lbW9yeUNWUGl4ZWxCdWZmZXJQb29sKHdpZHRoLCBo ZWlnaHQsIHBvb2xCdWZmZXJUeXBlKTsKKyAgICAgICAgaWYgKCFyZXN1bHQpIHsKKyAgICAgICAg ICAgIFJFTEVBU0VfTE9HX0VSUk9SKFdlYlJUQywgIlJlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJj ZUNvY29hIGZhaWxlZCBjcmVhdGluZyBidWZmZXIgcG9vbCB3aXRoIGVycm9yICVkIiwgcmVzdWx0 LmVycm9yKCkpOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIH0KKworICAg ICAgICBtX3BpeGVsQnVmZmVyUG9vbCA9IFdURk1vdmUoKnJlc3VsdCk7CisgICAgICAgIG1fcGl4 ZWxCdWZmZXJQb29sV2lkdGggPSB3aWR0aDsKKyAgICAgICAgbV9waXhlbEJ1ZmZlclBvb2xIZWln aHQgPSBoZWlnaHQ7CisgICAgICAgIG1fcGl4ZWxCdWZmZXJQb29sQnVmZmVyVHlwZSA9IGJ1ZmZl clR5cGU7CiAgICAgfQogICAgIHJldHVybiBtX3BpeGVsQnVmZmVyUG9vbC5nZXQoKTsKIH0KQEAg LTEyMSw2ICsxMjksOCBAQCBSZXRhaW5QdHI8Q1ZQaXhlbEJ1ZmZlclJlZj4gUmVhbHRpbWVJbmNv bWluZ1ZpZGVvU291cmNlQ29jb2E6OnBpeGVsQnVmZmVyRnJvbVZpZAogICAgICAgICByZXR1cm4g bV9ibGFja0ZyYW1lLmdldCgpOwogICAgIH0KIAorICAgIC8vIEluIGNhc2Ugb2YgaW4gbWVtb3J5 IHNhbXBsZXMsIHdlIGhhdmUgbm9uIGludGVybGVhdmVkIFlVViBkYXRhIHdoaWxlIENWUGl4ZWxC dWZmZXJzIHByZWZlciBpbnRlcmxlYXZlZCBZVVYgZGF0YS4KKyAgICAvLyBNYXliZSB3ZSBzaG91 bGQgaW50cm9kdWNlIGEgTWVkaWFTYW1wbGUgdGhhdCB3b3VsZCByZXByZXNlbnQgbm9uIGludGVy bGVhdmVkIFlVViBkYXRhIGFzIGFuIG9wdGltaXphdGlvbi4KICAgICByZXR1cm4gYWRvcHRDRih3 ZWJydGM6OmNyZWF0ZVBpeGVsQnVmZmVyRnJvbUZyYW1lKGZyYW1lLCBbdGhpc10oc2l6ZV90IHdp ZHRoLCBzaXplX3QgaGVpZ2h0LCB3ZWJydGM6OkJ1ZmZlclR5cGUgYnVmZmVyVHlwZSkgLT4gQ1ZQ aXhlbEJ1ZmZlclJlZiB7CiAgICAgICAgIGF1dG8gcGl4ZWxCdWZmZXJQb29sID0gdGhpcy0+cGl4 ZWxCdWZmZXJQb29sKHdpZHRoLCBoZWlnaHQsIGJ1ZmZlclR5cGUpOwogICAgICAgICBpZiAoIXBp eGVsQnVmZmVyUG9vbCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1ODdiNzM2ZWIxZDRjMWQ1ODUzNTY1Mjg3YmIyZjk1Mjdk MDAwY2E5Li5jYTUyYmQyNjBiZDYyM2Q2ZDU0YzRlNWEyZWJjMjcyNTlmNWJhODc1IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMDMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgorCisgICAgICAgIFJlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hIHNob3VsZCBu b3QgbmVlZCB0byBjcmVhdGUgSU9TdXJmYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1OTUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBD YXJsc29uLgorCisgICAgICAgICogd2VicnRjL3ZwOC10aGVuLWgyNjQtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiB3ZWJydGMvdnA4LXRoZW4taDI2NC5odG1sOiBBZGRlZC4KKwogMjAy Mi0wMi0wMyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVHJhbnNmb3JtIGludGVycG9sYXRpb24gc2hvdWxkIGJsZW5kIGJldHdlZW4gc2hhcmVkIHRy YW5zZm9ybSBmdW5jdGlvbiBwcmltaXRpdmVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJy dGMvdnA4LXRoZW4taDI2NC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy93ZWJydGMvdnA4LXRo ZW4taDI2NC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzg2ZDFmNmE0MzBjNzQ3M2FhOWIwMmQ2 YTg3MWQ3M2E4YzBmZjY4YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92 cDgtdGhlbi1oMjY0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAKK1ZpZGVvIHNob3VsZCBi ZSBydW5uaW5nLCBnbyB0byBibGFjayBhbmQgcnVubmluZy4KK0ZvbGxvd2luZywgc2hvdWxkIGJl IGEgc25hcHNob3Qgb2YgdGhlIHZpZGVvLCBhIGJsYWNrIGZyYW1lIGFuZCBhIHNuYXBzaG90IG9m IHRoZSB2aWRlby4KKworCitQQVNTIFNldHRpbmcgdmlkZW8gZXhjaGFuZ2Ugd2l0aCBWUDgKK1BB U1MgU2V0dGluZyBleGNoYW5nZSB3aXRoIEgyNjQgdXNpbmcgVlA4IGRlY29kZWQgc3RyZWFtIGFz IGlucHV0CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92cDgtdGhlbi1oMjY0Lmh0 bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvdnA4LXRoZW4taDI2NC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU2 ZmY1NmFlOTg0ODQzOTFjMjRiNjg4ODI2YzUxNDEwOTA4MTU5NDYKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy93ZWJydGMvdnA4LXRoZW4taDI2NC5odG1sCkBAIC0wLDAgKzEsNjIgQEAK KzwhZG9jdHlwZSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxtZXRhIGNoYXJz ZXQ9InV0Zi04Ij4KKyAgICAgICAgPHRpdGxlPlRlc3RpbmcgbXV0aW5nIHZpZGVvPC90aXRsZT4K KyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3Jp cHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQu anMiPjwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGRpdj5WaWRl byBzaG91bGQgYmUgcnVubmluZywgZ28gdG8gYmxhY2sgYW5kIHJ1bm5pbmcuPC9kaXY+CisgICAg ICAgIDxkaXY+Rm9sbG93aW5nLCBzaG91bGQgYmUgYSBzbmFwc2hvdCBvZiB0aGUgdmlkZW8sIGEg YmxhY2sgZnJhbWUgYW5kIGEgc25hcHNob3Qgb2YgdGhlIHZpZGVvLjwvZGl2PgorICAgICAgICA8 dmlkZW8gaWQ9InZpZGVvMSIgYXV0b3BsYXkgcGxheXNJbmxpbmUgd2lkdGg9IjMyMCIgaGVpZ2h0 PSIyNDAiPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8yIiBhdXRvcGxheSBwbGF5 c0lubGluZSB3aWR0aD0iMzIwIiBoZWlnaHQ9IjI0MCI+PC92aWRlbz4KKyAgICAgICAgPGNhbnZh cyBpZD0iY2FudmFzMSIgd2lkdGg9IjMyMCIgaGVpZ2h0PSIyNDAiPjwvY2FudmFzPgorICAgICAg ICA8Y2FudmFzIGlkPSJjYW52YXMyIiB3aWR0aD0iMzIwIiBoZWlnaHQ9IjI0MCI+PC9jYW52YXM+ CisgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhczMiIHdpZHRoPSIzMjAiIGhlaWdodD0iMjQwIj48 L2NhbnZhcz4KKyAgICAgICAgPHNjcmlwdCBzcmMgPSJyb3V0aW5lcy5qcyI+PC9zY3JpcHQ+Cisg ICAgICAgIDxzY3JpcHQ+Cit2YXIgdHJhY2s7Cit2YXIgcmVtb3RlVHJhY2s7Cit2YXIgcmVjZWl2 aW5nQ29ubmVjdGlvbjsKK3Byb21pc2VfdGVzdCgodGVzdCkgPT4geworICAgIHJldHVybiBuYXZp Z2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7dmlkZW86IHt3aWR0aDogMzIwLCBoZWln aHQ6IDI0MCB9fSkudGhlbigobG9jYWxTdHJlYW0pID0+IHsKKyAgICAgICAgcmV0dXJuIG5ldyBQ cm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgICAgIHRyYWNrID0gbG9jYWxT dHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXTsKKworICAgICAgICAgICAgY3JlYXRlQ29ubmVjdGlv bnMoKGZpcnN0Q29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlv bi5hZGRUcmFjayh0cmFjaywgbG9jYWxTdHJlYW0pOworICAgICAgICAgICAgICAgIGZpcnN0Q29u bmVjdGlvbi5nZXRUcmFuc2NlaXZlcnMoKVswXS5zZXRDb2RlY1ByZWZlcmVuY2VzKFt7bWltZVR5 cGU6ICJ2aWRlby9WUDgiLCBjbG9ja1JhdGU6IDkwMDAwfV0pOworICAgICAgICAgICAgfSwgKHNl Y29uZENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgICAgICByZWNlaXZpbmdDb25uZWN0aW9u ID0gc2Vjb25kQ29ubmVjdGlvbjsKKyAgICAgICAgICAgICAgICBzZWNvbmRDb25uZWN0aW9uLm9u dHJhY2sgPSAodHJhY2tFdmVudCkgPT4geworICAgICAgICAgICAgICAgICAgICByZW1vdGVUcmFj ayA9IHRyYWNrRXZlbnQudHJhY2s7CisgICAgICAgICAgICAgICAgICAgIHJlc29sdmUodHJhY2tF dmVudC5zdHJlYW1zWzBdKTsKKyAgICAgICAgICAgICAgICB9OworICAgICAgICAgICAgfSk7Cisg ICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAw MCk7CisgICAgICAgIH0pOworICAgIH0pLnRoZW4oKHJlbW90ZVN0cmVhbSkgPT4geworICAgICAg ICB2aWRlbzEuc3JjT2JqZWN0ID0gcmVtb3RlU3RyZWFtOworICAgICAgICByZXR1cm4gdmlkZW8x LnBsYXkoKTsKKyAgICB9KTsKK30sICJTZXR0aW5nIHZpZGVvIGV4Y2hhbmdlIHdpdGggVlA4Iik7 CisKK3Byb21pc2VfdGVzdChhc3luYyAoKSA9PiB7CisgICAgdmlkZW8yLnNyY09iamVjdCA9IGF3 YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgY3JlYXRlQ29u bmVjdGlvbnMoKGZpcnN0Q29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgZmlyc3RDb25uZWN0 aW9uLmFkZFRyYWNrKHZpZGVvMS5zcmNPYmplY3QuZ2V0VmlkZW9UcmFja3MoKVswXSwgdmlkZW8x LnNyY09iamVjdCk7CisgICAgICAgIH0sIChzZWNvbmRDb25uZWN0aW9uKSA9PiB7CisgICAgICAg ICAgICByZWNlaXZpbmdDb25uZWN0aW9uID0gc2Vjb25kQ29ubmVjdGlvbjsKKyAgICAgICAgICAg IHNlY29uZENvbm5lY3Rpb24ub250cmFjayA9ICh0cmFja0V2ZW50KSA9PiB7CisgICAgICAgICAg ICAgICAgcmVtb3RlVHJhY2sgPSB0cmFja0V2ZW50LnRyYWNrOworICAgICAgICAgICAgICAgIHJl c29sdmUodHJhY2tFdmVudC5zdHJlYW1zWzBdKTsKKyAgICAgICAgICAgIH07CisgICAgICAgIH0p OworICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAw MCk7CisgICAgfSk7CisgICAgYXdhaXQgdmlkZW8yLnBsYXkoKTsKK30sICJTZXR0aW5nIGV4Y2hh bmdlIHdpdGggSDI2NCB1c2luZyBWUDggZGVjb2RlZCBzdHJlYW0gYXMgaW5wdXQiKTsKKyAgICAg ICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1sPgo=