226349 2021-05-27 12:48:14 -0700 [Cocoa] HDR variants in HLS playlists not selected when screen is HDR 2021-05-28 15:31:27 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble basuke don.olmstead eric.carlson ews-watchlist glenn jean-yves.avenard peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1764456 0 jer.noble 2021-05-27 12:48:14 -0700 [Cocoa] HDR variants in HLS playlists not selected when screen is HDR 1764457 1 jer.noble 2021-05-27 12:48:40 -0700 <rdar://76963977> 1764458 2 429913 jer.noble 2021-05-27 12:50:51 -0700 Created attachment 429913 Patch 1764803 3 ews-feeder 2021-05-28 09:44:41 -0700 Committed r278204 (238247@main): <https://commits.webkit.org/238247@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429913. 1764912 4 don.olmstead 2021-05-28 13:43:08 -0700 Reopening for build fix for non Cocoa platforms The WinCairo EWS caught this build failure for Windows but not GTK, since its not turning on GPU process, and not PlayStation since it has no EWS. 1764913 5 430048 don.olmstead 2021-05-28 13:43:29 -0700 Created attachment 430048 Build fix 1764950 6 ews-feeder 2021-05-28 14:53:51 -0700 Committed r278227 (238265@main): <https://commits.webkit.org/238265@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430048. 1764967 7 basuke 2021-05-28 15:31:27 -0700 *** Bug 226400 has been marked as a duplicate of this bug. *** 429913 2021-05-27 12:50:51 -0700 2021-05-28 09:44:41 -0700 Patch bug-226349-20210527125050.patch text/plain 10506 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhiOWIwYTBiODM0MDQyYjk4 MDlmNjEzZDY1ZWRiZjBhNDY1NGQzMDUuLjMwMzI2M2I2MmMwYjAzYmJjMjM0ZjdmZmZmYjc1YzMy MzhkOGRiODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDUtMjcgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBIRFIgdmFyaWFudHMg aW4gSExTIHBsYXlsaXN0cyBub3Qgc2VsZWN0ZWQgd2hlbiBzY3JlZW4gaXMgSERSCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYzNDkKKyAgICAgICAg PHJkYXI6Ly83Njk2Mzk3Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBbiBleGlzdGluZyB0ZXN0LCBodHRwL3Rlc3RzL21lZGlhL2hscy9obHMtaGRy LXN3aXRjaC5odG1sLCBzaG91bGQgaGF2ZSBjYXVnaHQgdGhpcyByZWdyZXNzaW9uLAorICAgICAg ICBidXQgaXMgbm90IGN1cnJlbnRseSBmdW5jdGlvbmFsIGFzIGl0IGRlcGVuZHMgb24gUEhQLCB3 aGljaCBoYXMgYmVlbiByZW1vdmVkLgorCisgICAgICAgIFRoZSBwcmVmZXJyZWREeW5hbWljUmFu Z2VNb2RlIG5lZWRzIHRvIGJlIHBpcGVkIG92ZXIgZnJvbSBXZWJDb250ZW50IC0+IEdQVSBwcm9j ZXNzLgorCisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6c2V0UHJlZmVy cmVkRHluYW1pY1JhbmdlTW9kZSk6CisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVN ZWRpYVBsYXllclByb3h5Lmg6CisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRp YVBsYXllclByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIEdQVVByb2Nlc3MvbWVkaWEvY29j b2EvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUGxheWJhY2spOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0L21lc3NhZ2VzLnB5OgorICAgICAgICAoaGVhZGVyc19mb3JfdHlwZSk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpwcmVwYXJlRm9yUGxh eWJhY2spOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFBy ZWZlcnJlZER5bmFtaWNSYW5nZU1vZGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlh L01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oOgorCiAyMDIxLTA1LTIxICBKZXIgTm9ibGUgIDxq ZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gSGFuZyBpbiBXZWJNIGZvcm1h dCByZWFkZXIgd2hlbiBsb2FkaW5nIGNvbnRlbnQgZnJvbSBodHRwczovL3Bvd2VycmFuZ2Vycy5m YW5kb20uY29tLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1Jl bW90ZU1lZGlhUGxheWVyUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlh L1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwCmluZGV4IGY4ZTE5MmIyY2M2NTlkYWY0OGQ4MDE5 YWI5NjEzOWMyZGU4MTY0ZDguLjQ3MGY4NDEyYzhjYzAwODZjZDZmMjY5MGU0MDMyNzc2YzQ4M2Rk YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRp YVBsYXllclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVt b3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKQEAgLTEwMzYsNiArMTAzNiwxMiBAQCB2b2lkIFJlbW90 ZU1lZGlhUGxheWVyUHJveHk6OnVwZGF0ZUNhY2hlZFZpZGVvTWV0cmljcygpCiAgICAgbV9jYWNo ZWRTdGF0ZS52aWRlb01ldHJpY3MgPSBtX3BsYXllci0+dmlkZW9QbGF5YmFja1F1YWxpdHlNZXRy aWNzKCk7CiB9CiAKK3ZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6c2V0UHJlZmVycmVkRHlu YW1pY1JhbmdlTW9kZShEeW5hbWljUmFuZ2VNb2RlIG1vZGUpCit7CisgICAgaWYgKG1fcGxheWVy KQorICAgICAgICBtX3BsYXllci0+c2V0UHJlZmVycmVkRHluYW1pY1JhbmdlTW9kZShtb2RlKTsK K30KKwogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpjcmVhdGVBdWRpb1NvdXJjZVByb3Zp ZGVyKCkKIHsKICNpZiBFTkFCTEUoV0VCX0FVRElPKSAmJiBQTEFURk9STShDT0NPQSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclBy b3h5LmggYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQ cm94eS5oCmluZGV4IDA5MTFmMWM3MzJmMDBkMzk5YWE2MTdlZjhjMWMwZTM1YWUzNDQwYzYuLmZi MGViYjMwOTFkZDA1NGYwZjUwMDNlZDkwZDkxM2QxM2E0NjE4NzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmgKKysrIGIv U291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuaApA QCAtMTEwLDcgKzExMCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZ2V0Q29uZmlndXJhdGlvbihS ZW1vdGVNZWRpYVBsYXllckNvbmZpZ3VyYXRpb24mKTsKIAotICAgIHZvaWQgcHJlcGFyZUZvclBs YXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6OlByZWxv YWQsIGJvb2wgcHJlc2VydmVzUGl0Y2gsIGJvb2wgcHJlcGFyZUZvclJlbmRlcmluZywgZmxvYXQg dmlkZW9Db250ZW50U2NhbGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoT3B0aW9uYWw8TGF5ZXJI b3N0aW5nQ29udGV4dElEPiYmIGlubGluZUxheWVySG9zdGluZ0NvbnRleHRJZCk+JiYpOworICAg IHZvaWQgcHJlcGFyZUZvclBsYXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIFdlYkNvcmU6Ok1lZGlh UGxheWVyRW51bXM6OlByZWxvYWQsIGJvb2wgcHJlc2VydmVzUGl0Y2gsIGJvb2wgcHJlcGFyZUZv clJlbmRlcmluZywgZmxvYXQgdmlkZW9Db250ZW50U2NhbGUsIFdlYkNvcmU6OkR5bmFtaWNSYW5n ZU1vZGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoT3B0aW9uYWw8TGF5ZXJIb3N0aW5nQ29udGV4 dElEPiYmIGlubGluZUxheWVySG9zdGluZ0NvbnRleHRJZCk+JiYpOwogICAgIHZvaWQgcHJlcGFy ZUZvclJlbmRlcmluZygpOwogCiAgICAgdm9pZCBsb2FkKFVSTCYmLCBPcHRpb25hbDxTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGU+JiYsIGNvbnN0IFdlYkNvcmU6OkNvbnRlbnRUeXBlJiwgY29uc3Qg U3RyaW5nJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZW1vdGVNZWRpYVBsYXllckNvbmZpZ3Vy YXRpb24mJik+JiYpOwpAQCAtMTkyLDYgKzE5Miw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0 VmlkZW9QbGF5YmFja01ldHJpY3NVcGRhdGVJbnRlcnZhbChkb3VibGUpOwogCisgICAgdm9pZCBz ZXRQcmVmZXJyZWREeW5hbWljUmFuZ2VNb2RlKFdlYkNvcmU6OkR5bmFtaWNSYW5nZU1vZGUpOwor CiAgICAgUmVmUHRyPFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFSZXNvdXJjZT4gcmVxdWVzdFJlc291 cmNlKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhUmVz b3VyY2VMb2FkZXI6OkxvYWRPcHRpb25zKTsKICAgICB2b2lkIHNlbmRIMlBpbmcoY29uc3QgVVJM JiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChFeHBlY3RlZDxXVEY6OlNlY29uZHMsIFdlYkNvcmU6 OlJlc291cmNlRXJyb3I+JiYpPiYmKTsKICAgICB2b2lkIHJlbW92ZVJlc291cmNlKFJlbW90ZU1l ZGlhUmVzb3VyY2VJZGVudGlmaWVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkubWVzc2FnZXMuaW4K aW5kZXggOGE5MjRiNTlhNjg2M2FjOWVhNzhmMzNmYWQ5NTY3N2ZkYzFhOTc0MS4uNWNkMTE2OTkw ZjdjNzJhODVmNzU2ZTkzNDdiOTAwNDg3MzA4YmZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkubWVzc2FnZXMuaW4KKysr IGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHku bWVzc2FnZXMuaW4KQEAgLTI0LDcgKzI0LDcgQEAKICNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCiAK IG1lc3NhZ2VzIC0+IFJlbW90ZU1lZGlhUGxheWVyUHJveHkgTm90UmVmQ291bnRlZCB7Ci0gICAg UHJlcGFyZUZvclBsYXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIGVudW06dWludDhfdCBXZWJDb3Jl OjpNZWRpYVBsYXllckVudW1zOjpQcmVsb2FkIHByZWxvYWQsIGJvb2wgcHJlc2VydmVzUGl0Y2gs IGJvb2wgcHJlcGFyZUZvclJlbmRlcmluZywgZmxvYXQgdmlkZW9Db250ZW50U2NhbGUpIC0+IChP cHRpb25hbDxXZWJLaXQ6OkxheWVySG9zdGluZ0NvbnRleHRJRD4gaW5saW5lTGF5ZXJIb3N0aW5n Q29udGV4dElkKSBBc3luYworICAgIFByZXBhcmVGb3JQbGF5YmFjayhib29sIHByaXZhdGVNb2Rl LCBlbnVtOnVpbnQ4X3QgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6UHJlbG9hZCBwcmVsb2Fk LCBib29sIHByZXNlcnZlc1BpdGNoLCBib29sIHByZXBhcmVGb3JSZW5kZXJpbmcsIGZsb2F0IHZp ZGVvQ29udGVudFNjYWxlLCBlbnVtOnVpbnQ4X3QgV2ViQ29yZTo6RHluYW1pY1JhbmdlTW9kZSBt b2RlKSAtPiAoT3B0aW9uYWw8V2ViS2l0OjpMYXllckhvc3RpbmdDb250ZXh0SUQ+IGlubGluZUxh eWVySG9zdGluZ0NvbnRleHRJZCkgQXN5bmMKIAogICAgIExvYWQoVVJMIHVybCwgT3B0aW9uYWw8 V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IHNhbmRib3hFeHRlbnNpb24sIFdlYkNv cmU6OkNvbnRlbnRUeXBlIGNvbnRlbnRUeXBlLCBTdHJpbmcga2V5U3lzdGVtKSAtPiAoc3RydWN0 IFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJDb25maWd1cmF0aW9uIHBsYXllckNvbmZpZ3VyYXRp b24pIEFzeW5jCiAjaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKQEAgLTExMCw2ICsxMTAsOCBAQCBt ZXNzYWdlcyAtPiBSZW1vdGVNZWRpYVBsYXllclByb3h5IE5vdFJlZkNvdW50ZWQgewogCiAgICAg U2V0VmlkZW9QbGF5YmFja01ldHJpY3NVcGRhdGVJbnRlcnZhbChkb3VibGUgaW50ZXJ2YWwpCiAK KyAgICBTZXRQcmVmZXJyZWREeW5hbWljUmFuZ2VNb2RlKGVudW06dWludDhfdCBXZWJDb3JlOjpE eW5hbWljUmFuZ2VNb2RlIG1vZGUpCisKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIEVy cm9yTG9nKCkgLT4gKFN0cmluZyBlcnJvckxvZykgU3luY2hyb25vdXMKICAgICBBY2Nlc3NMb2co KSAtPiAoU3RyaW5nIGFjY2Vzc0xvZykgU3luY2hyb25vdXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9jb2NvYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29jb2Eu bW0gYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvY29jb2EvUmVtb3RlTWVkaWFQbGF5 ZXJQcm94eUNvY29hLm1tCmluZGV4IDBlMGNkMmNkYzZhNDkwNTM0NDZjNmQxMWNmNzZmYWRlZDYz OWRlNmQuLmYyZWJlNmViOWQ1NDg1ZjliZjdjNTFhYzhmNjQxNGMxZTE0MDlmMzkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9jb2NvYS9SZW1vdGVNZWRpYVBsYXll clByb3h5Q29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL2NvY29h L1JlbW90ZU1lZGlhUGxheWVyUHJveHlDb2NvYS5tbQpAQCAtNDksMTEgKzQ5LDEyIEBAIHN0YXRp YyB2b2lkIHNldFZpZGVvSW5saW5lU2l6ZUlmUG9zc2libGUoTGF5ZXJIb3N0aW5nQ29udGV4dCYg Y29udGV4dCwgY29uc3QgV2ViCiAgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKIH0KIAotdm9p ZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUGxheWJhY2soYm9vbCBwcml2YXRl TW9kZSwgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6UHJlbG9hZCBwcmVsb2FkLCBib29sIHBy ZXNlcnZlc1BpdGNoLCBib29sIHByZXBhcmVGb3JSZW5kZXJpbmcsIGZsb2F0IHZpZGVvQ29udGVu dFNjYWxlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKE9wdGlvbmFsPExheWVySG9zdGluZ0NvbnRl eHRJRD4mJiBpbmxpbmVMYXllckhvc3RpbmdDb250ZXh0SWQpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQordm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUGxheWJhY2soYm9vbCBw cml2YXRlTW9kZSwgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6UHJlbG9hZCBwcmVsb2FkLCBi b29sIHByZXNlcnZlc1BpdGNoLCBib29sIHByZXBhcmVGb3JSZW5kZXJpbmcsIGZsb2F0IHZpZGVv Q29udGVudFNjYWxlLCBXZWJDb3JlOjpEeW5hbWljUmFuZ2VNb2RlIHByZWZlcnJlZER5bmFtaWNS YW5nZU1vZGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoT3B0aW9uYWw8TGF5ZXJIb3N0aW5nQ29u dGV4dElEPiYmIGlubGluZUxheWVySG9zdGluZ0NvbnRleHRJZCk+JiYgY29tcGxldGlvbkhhbmRs ZXIpCiB7CiAgICAgbV9wbGF5ZXItPnNldFByaXZhdGVCcm93c2luZ01vZGUocHJpdmF0ZU1vZGUp OwogICAgIG1fcGxheWVyLT5zZXRQcmVsb2FkKHByZWxvYWQpOwogICAgIG1fcGxheWVyLT5zZXRQ cmVzZXJ2ZXNQaXRjaChwcmVzZXJ2ZXNQaXRjaCk7CisgICAgbV9wbGF5ZXItPnNldFByZWZlcnJl ZER5bmFtaWNSYW5nZU1vZGUocHJlZmVycmVkRHluYW1pY1JhbmdlTW9kZSk7CiAgICAgaWYgKHBy ZXBhcmVGb3JSZW5kZXJpbmcpCiAgICAgICAgIG1fcGxheWVyLT5wcmVwYXJlRm9yUmVuZGVyaW5n KCk7CiAgICAgbV92aWRlb0NvbnRlbnRTY2FsZSA9IHZpZGVvQ29udGVudFNjYWxlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5weSBiL1NvdXJjZS9X ZWJLaXQvU2NyaXB0cy93ZWJraXQvbWVzc2FnZXMucHkKaW5kZXggY2RmYTdiZjQxZWRiN2IzNjli ZjE4YzU3OGFiMmQ2Yjg3YjY1ZWM3OC4uOGZmMTczYWQ4Mzk3NmJhNGM1NTM2MGU4MDFiZDE2MWI1 MzQyMTI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TY3JpcHRzL3dlYmtpdC9tZXNzYWdl cy5weQorKysgYi9Tb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5CkBAIC03 ODQsNiArNzg0LDcgQEAgZGVmIGhlYWRlcnNfZm9yX3R5cGUodHlwZSk6CiAgICAgICAgICdzdHJ1 Y3QgV2ViS2l0OjpXZWJTY3JpcHRNZXNzYWdlSGFuZGxlckRhdGEnOiBbJyJXZWJVc2VyQ29udGVu dENvbnRyb2xsZXJEYXRhVHlwZXMuaCInXSwKICAgICAgICAgJ3dlYnJ0Yzo6V2ViS2l0RW5jb2Rl ZEZyYW1lSW5mbyc6IFsnPHdlYnJ0Yy9zZGsvV2ViS2l0L1dlYktpdEVuY29kZXIuaD4nLCAnPFdl YkNvcmUvTGliV2ViUlRDRW51bVRyYWl0cy5oPiddLAogICAgICAgICAnUGxhdGZvcm1YUjo6RGV2 aWNlOjpGcmFtZURhdGEnOiBbJzxXZWJDb3JlL1BsYXRmb3JtWFIuaD4nXSwKKyAgICAgICAgJ1dl YkNvcmU6OkR5bmFtaWNSYW5nZU1vZGUnOiBbJzxXZWJDb3JlL1BsYXRmb3JtU2NyZWVuLmg+J10s CiAgICAgfQogCiAgICAgaGVhZGVycyA9IFtdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5jcHAK aW5kZXggYjk1ZTU5MWIxODJkZTM0NjNlZTdlMThmMDU1YTEzZmFjOTQwZTliNC4uMWE3OGU4YmM1 ZmQxNTI3OTFiMDcwYzU1YzNhNzQwYmY0OGI2NjRhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLmNwcApAQCAtMTM0LDggKzEzNCw5IEBAIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6fk1l ZGlhUGxheWVyUHJpdmF0ZVJlbW90ZSgpCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6 cHJlcGFyZUZvclBsYXliYWNrKGJvb2wgcHJpdmF0ZU1vZGUsIE1lZGlhUGxheWVyOjpQcmVsb2Fk IHByZWxvYWQsIGJvb2wgcHJlc2VydmVzUGl0Y2gsIGJvb2wgcHJlcGFyZSkKIHsKICAgICBhdXRv IHNjYWxlID0gbV9wbGF5ZXItPnBsYXllckNvbnRlbnRzU2NhbGUoKTsKKyAgICBhdXRvIHByZWZl cnJlZER5bmFtaWNSYW5nZU1vZGUgPSBtX3BsYXllci0+cHJlZmVycmVkRHluYW1pY1JhbmdlTW9k ZSgpOwogCi0gICAgY29ubmVjdGlvbigpLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6UmVt b3RlTWVkaWFQbGF5ZXJQcm94eTo6UHJlcGFyZUZvclBsYXliYWNrKHByaXZhdGVNb2RlLCBwcmVs b2FkLCBwcmVzZXJ2ZXNQaXRjaCwgcHJlcGFyZSwgc2NhbGUpLCBbd2Vha1RoaXMgPSBtYWtlV2Vh a1B0cigqdGhpcyksIHRoaXNdKGF1dG8gaW5saW5lTGF5ZXJIb3N0aW5nQ29udGV4dElkKSBtdXRh YmxlIHsKKyAgICBjb25uZWN0aW9uKCkuc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpSZW1v dGVNZWRpYVBsYXllclByb3h5OjpQcmVwYXJlRm9yUGxheWJhY2socHJpdmF0ZU1vZGUsIHByZWxv YWQsIHByZXNlcnZlc1BpdGNoLCBwcmVwYXJlLCBzY2FsZSwgcHJlZmVycmVkRHluYW1pY1Jhbmdl TW9kZSksIFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgdGhpc10oYXV0byBpbmxpbmVM YXllckhvc3RpbmdDb250ZXh0SWQpIG11dGFibGUgewogICAgICAgICBpZiAoIXdlYWtUaGlzKQog ICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xMjMzLDYgKzEyMzQsMTEgQEAgdm9pZCBNZWRpYVBs YXllclByaXZhdGVSZW1vdGU6OmFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlKCkKICAgICBjb25u ZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6QXBwbGljYXRp b25EaWRCZWNvbWVBY3RpdmUoKSwgbV9pZCk7CiB9CiAKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlOjpzZXRQcmVmZXJyZWREeW5hbWljUmFuZ2VNb2RlKER5bmFtaWNSYW5nZU1vZGUgbW9k ZSkKK3sKKyAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQ cm94eTo6U2V0UHJlZmVycmVkRHluYW1pY1JhbmdlTW9kZShtb2RlKSwgbV9pZCk7Cit9CisKIGJv b2wgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpwZXJmb3JtVGFza0F0TWVkaWFUaW1lKFdURjo6 RnVuY3Rpb248dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyLCBjb25zdCBNZWRpYVRpbWUmIG1l ZGlhVGltZSkKIHsKICAgICBhdXRvIGFzeW5jUmVwbHlIYW5kbGVyID0gW3dlYWtUaGlzID0gbWFr ZVdlYWtQdHIoKnRoaXMpLCB0aGlzLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpXShPcHRpb25hbDxNZWRpYVRpbWU+IGN1cnJlbnRUaW1lLCBPcHRpb25hbDxN b25vdG9uaWNUaW1lPiBxdWVyeVRpbWUpIG11dGFibGUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3Rl LmgKaW5kZXggYjM2ZGY0NDQ5NTFlMzJkZmZhODM4YTYxZTYxNzIwYmFhN2YzODQ3My4uZDE2OTQ0 ZTQ1ODg3NTA0OTBkNDI1ZDViNDA4ZDAxMzdmZWMyZDQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJl bW90ZS5oCkBAIC0zODMsNiArMzgzLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgYXBwbGljYXRp b25XaWxsUmVzaWduQWN0aXZlKCkgZmluYWw7CiAgICAgdm9pZCBhcHBsaWNhdGlvbkRpZEJlY29t ZUFjdGl2ZSgpIGZpbmFsOworICAgIHZvaWQgc2V0UHJlZmVycmVkRHluYW1pY1JhbmdlTW9kZShX ZWJDb3JlOjpEeW5hbWljUmFuZ2VNb2RlKSBmaW5hbDsKIAogI2lmIFVTRShBVkZPVU5EQVRJT04p CiAgICAgQVZQbGF5ZXIgKm9iakNBVkZvdW5kYXRpb25BVlBsYXllcigpIGNvbnN0IGZpbmFsIHsg cmV0dXJuIG51bGxwdHI7IH0K 430048 2021-05-28 13:43:29 -0700 2021-05-28 14:53:52 -0700 Build fix bug-226349.diff text/plain 3737 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNTUyZDkyNGMwOTA2Li45NzQ5ZDY0ZjZlY2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMjEtMDUtMjggIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNv bT4KKworICAgICAgICBbQ29jb2FdIEhEUiB2YXJpYW50cyBpbiBITFMgcGxheWxpc3RzIG5vdCBz ZWxlY3RlZCB3aGVuIHNjcmVlbiBpcyBIRFIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNjM0OQorICAgICAgICA8cmRhcjovLzc2OTYzOTc3PgorCisg ICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIyNzgyMDQuCisKKyAgICAgICAgVXBk YXRlIHRoZSBtZXRob2Qgc2lnbmF0dXJlIG9mIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBh cmVGb3JQbGF5YmFjayBmb3Igbm9uLUNvY29hCisgICAgICAgIHBsYXRmb3Jtcy4KKworICAgICAg ICAqIEdQVVByb2Nlc3MvbWVkaWEvZ3N0cmVhbWVyL1JlbW90ZU1lZGlhUGxheWVyUHJveHlHU3Ry ZWFtZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjpwcmVw YXJlRm9yUGxheWJhY2spOgorICAgICAgICAqIEdQVVByb2Nlc3MvbWVkaWEvcGxheXN0YXRpb24v UmVtb3RlTWVkaWFQbGF5ZXJQcm94eVBsYXlTdGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6cHJlcGFyZUZvclBsYXliYWNrKToKKyAgICAgICAgKiBH UFVQcm9jZXNzL21lZGlhL3dpbi9SZW1vdGVNZWRpYVBsYXllclByb3h5V2luLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6cHJlcGFyZUZvclBsYXliYWNrKToK KwogMjAyMS0wNS0yOCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIHN0dWIgaW1wbGVtZW50YXRpb24gb2YgQ0Egc2VwYXJhdGVkIHBvcnRhbCBiaXRzIGZvciBH cmFwaGljc0xheWVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEv Z3N0cmVhbWVyL1JlbW90ZU1lZGlhUGxheWVyUHJveHlHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL21lZGlhL2dzdHJlYW1lci9SZW1vdGVNZWRpYVBsYXllclByb3h5R1N0 cmVhbWVyLmNwcAppbmRleCBkODhmOWE2YWQxMjIuLjA5NWZlNWRiY2VkZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL2dzdHJlYW1lci9SZW1vdGVNZWRpYVBsYXll clByb3h5R1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEv Z3N0cmVhbWVyL1JlbW90ZU1lZGlhUGxheWVyUHJveHlHU3RyZWFtZXIuY3BwCkBAIC0zMyw3ICsz Myw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJv eHk6OnByZXBhcmVGb3JQbGF5YmFjayhib29sLCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpQ cmVsb2FkLCBib29sLCBib29sLCBmbG9hdCB2aWRlb0NvbnRlbnRTY2FsZSwgQ29tcGxldGlvbkhh bmRsZXI8dm9pZChPcHRpb25hbDxMYXllckhvc3RpbmdDb250ZXh0SUQ+JiYgaW5saW5lTGF5ZXJI b3N0aW5nQ29udGV4dElkKT4mJikKK3ZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6cHJlcGFy ZUZvclBsYXliYWNrKGJvb2wsIFdlYkNvcmU6Ok1lZGlhUGxheWVyRW51bXM6OlByZWxvYWQsIGJv b2wsIGJvb2wsIGZsb2F0LCBXZWJDb3JlOjpEeW5hbWljUmFuZ2VNb2RlLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKE9wdGlvbmFsPExheWVySG9zdGluZ0NvbnRleHRJRD4mJiBpbmxpbmVMYXllckhv c3RpbmdDb250ZXh0SWQpPiYmKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvcGxheXN0YXRpb24vUmVtb3RlTWVk aWFQbGF5ZXJQcm94eVBsYXlTdGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9t ZWRpYS9wbGF5c3RhdGlvbi9SZW1vdGVNZWRpYVBsYXllclByb3h5UGxheVN0YXRpb24uY3BwCmlu ZGV4IGFlOGM2YWM1ZTIzNC4uNjdlMzljNjMyYjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0dQVVByb2Nlc3MvbWVkaWEvcGxheXN0YXRpb24vUmVtb3RlTWVkaWFQbGF5ZXJQcm94eVBsYXlT dGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvcGxheXN0YXRp b24vUmVtb3RlTWVkaWFQbGF5ZXJQcm94eVBsYXlTdGF0aW9uLmNwcApAQCAtMzMsNyArMzMsNyBA QAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5Ojpw cmVwYXJlRm9yUGxheWJhY2soYm9vbCwgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6UHJlbG9h ZCwgYm9vbCwgYm9vbCwgZmxvYXQgdmlkZW9Db250ZW50U2NhbGUsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoT3B0aW9uYWw8TGF5ZXJIb3N0aW5nQ29udGV4dElEPiYmIGlubGluZUxheWVySG9zdGlu Z0NvbnRleHRJZCk+JiYpCit2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBhcmVGb3JQ bGF5YmFjayhib29sLCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpQcmVsb2FkLCBib29sLCBi b29sLCBmbG9hdCwgV2ViQ29yZTo6RHluYW1pY1JhbmdlTW9kZSwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChPcHRpb25hbDxMYXllckhvc3RpbmdDb250ZXh0SUQ+JiYgaW5saW5lTGF5ZXJIb3N0aW5n Q29udGV4dElkKT4mJikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL3dpbi9SZW1vdGVNZWRpYVBsYXllclByb3h5 V2luLmNwcCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS93aW4vUmVtb3RlTWVkaWFQ bGF5ZXJQcm94eVdpbi5jcHAKaW5kZXggNGExNTExZDE1MDgxLi5kYTViYjllNzY2ZWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS93aW4vUmVtb3RlTWVkaWFQbGF5 ZXJQcm94eVdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL3dpbi9S ZW1vdGVNZWRpYVBsYXllclByb3h5V2luLmNwcApAQCAtMzMsNyArMzMsNyBAQAogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIAotdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUGxh eWJhY2soYm9vbCwgV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtczo6UHJlbG9hZCwgYm9vbCwgYm9v bCwgZmxvYXQgdmlkZW9Db250ZW50U2NhbGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoT3B0aW9u YWw8TGF5ZXJIb3N0aW5nQ29udGV4dElEPiYmIGlubGluZUxheWVySG9zdGluZ0NvbnRleHRJZCk+ JiYpCit2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBhcmVGb3JQbGF5YmFjayhib29s LCBXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zOjpQcmVsb2FkLCBib29sLCBib29sLCBmbG9hdCwg V2ViQ29yZTo6RHluYW1pY1JhbmdlTW9kZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChPcHRpb25h bDxMYXllckhvc3RpbmdDb250ZXh0SUQ+JiYgaW5saW5lTGF5ZXJIb3N0aW5nQ29udGV4dElkKT4m JikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQo=