229426 2021-08-23 15:01:36 -0700 De-flake media painting tests by delaying readyState >= HAVE_CURRENT_DATA until element is able to paint 2021-08-30 15:02:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson ews-watchlist glenn philipj sergio webkit-bug-importer oldest_to_newest 1786577 0 jer.noble 2021-08-23 15:01:36 -0700 De-flake media painting tests by delaying readyState >= HAVE_CURRENT_DATA until element is able to paint 1786582 1 436240 jer.noble 2021-08-23 15:12:59 -0700 Created attachment 436240 Patch 1786589 2 436240 eric.carlson 2021-08-23 15:25:22 -0700 Comment on attachment 436240 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436240&action=review > Source/WebCore/ChangeLog:27 > + a RGB image. s/a/an/ > Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:569 > + // progress to LikelyToKeepUp. Set the readyState to HAVE_ENOUGH_DATA, on the Nit: extra space between "to" and "HAVE_ENOUGH_DATA" > Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:591 > + // Do not allow us to progress beyond HaveMetadata until the layer is ready for display Nit: extra space between "progress" and "beyond" 1788671 3 webkit-bug-importer 2021-08-30 15:02:17 -0700 <rdar://problem/82549071> 436240 2021-08-23 15:12:59 -0700 2021-08-23 17:18:43 -0700 Patch bug-229426-20210823151258.patch text/plain 14508 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQ4ZDdiYTA3YzZjZDg3 ZDQxMzhmODI2Y2Q4ZmY2MzEwNzNkZTU3Ni4uMGQ0OGU3MzMzZTQ0YjhkYTMxMjQ4NmM3NzQ1OWZi ODY3MzA0YjZlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIxLTA4LTIzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIERlLWZsYWtlIG1lZGlhIHBh aW50aW5nIHRlc3RzIGJ5IGRlbGF5aW5nIHJlYWR5U3RhdGUgPj0gSEFWRV9DVVJSRU5UX0RBVEEg dW50aWwgZWxlbWVudCBpcyBhYmxlIHRvIHBhaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk0MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgSFRNTCBzcGVjJ3Mgd29yZGluZyBhcm91bmQgIkhB VkVfQ1VSUkVOVF9EQVRBIiBpcyBhbWJpZ3VvdXM7IHRoZSByZXF1aXJlbWVudCBpcworICAgICAg ICAiZGF0YSBmb3IgdGhlIGltbWVkaWF0ZSBjdXJyZW50IHBsYXliYWNrIHBvc2l0aW9uIGlzIGF2 YWlsYWJsZSIsIGJ1dCBkb2VzIG5vdCBzdGF0ZQorICAgICAgICB0aGF0IHRoZSBkZWNvZGVyIGhh cyBwcm92aWRlZCBhbiBpbWFnZSBmb3IgdGhlIGN1cnJlbnQgcGxheWJhY2sgcG9zaXRpb24uIEhv d2V2ZXIKKyAgICAgICAgYWJzZW50IGEgZGVmaW5pdGl2ZSBldmVudCBvciBzdGF0ZSwgdGVzdHMg YW5kIHNpdGVzIHVzZSByZWFkeVN0YXRlIGFzIGEgcHJveHkgZm9yCisgICAgICAgIHRoZSBhYmls aXR5IHRvIHBhaW50IGEgZnJhbWUuCisKKyAgICAgICAgRGVsYXkgbW92aW5nIHRvIEhBVkVfQ1VS UkVOVF9EQVRBIHVudGlsIHRoZSBkZWNvZGVyIGhhcyBwcm92aWRlZCBhbiBpbWFnZSB0byB0aGUK KyAgICAgICAgQVZQbGF5ZXJMYXllciBvciBBVlBsYXllckl0ZW1WaWRlb091dHB1dCAodGhvdWdo IGlmIGJvdGggYXJlIGNyZWF0ZWQgYXQgdGhlIHNhbWUgdGltZSwKKyAgICAgICAgdGhleSB3aWxs IGJvdGggZ2V0IGltYWdlcyBmcm9tIHRoZSBmYW4gb3V0IGF0IHRoZSBzYW1lIHRpbWUgYXMgd2Vs bCkuCisKKyAgICAgICAgVGhlIHN0YXRlIG1hY2hpbmUgaW4gdXBkYXRlU3RhdGVzKCkgaGFzIGJl ZW4gcmVmYWN0b3JlZCB0byBmaXQgbW9yZSBuZWF0bHkgaW50byBhCisgICAgICAgIGNvdXBsZSBv ZiBzd2l0Y2goKSBzdGF0ZW1lbnRzLiBBdCB0aGUgZW5kIG9mIHVwZGF0ZVN0YXRlcygpLCBpZiB0 aGUgcHJldmlvdXMgcmVhZHlTdGF0ZQorICAgICAgICB3YXMgPCBIQVZFX0NVUlJFTlRfREFUQSwg dGhlIG5ldyByZWFkeVN0YXRlIGlzID49IEhBVkVfQ1VSUkVOVF9EQVRBLCBhIHZpZGVvIHRyYWNr CisgICAgICAgIGV4aXN0cyBhbmQgaXMgZW5hYmxlZCwgYW5kIHRoZXJlIGlzIG5vdCB5ZXQgYW4g YXZhaWxhYmxlIGRlY29kZWQgZnJhbWUsIHJlc2V0IHRoZQorICAgICAgICBuZXcgcmVhZHlTdGF0 ZSB0byBIQVZFX01FVEFEQVRBLiBSZXZpc2l0IHRoZSBkZWNpc2lvbiB3aGVuIHRoZSBwbGF5ZXIg bGF5ZXIgb3Igb3V0cHV0CisgICAgICAgIG5vdGlmaWVzIHVzIG9mIGEgbmV3IGZyYW1lLgorCisg ICAgICAgIE1ha2UgdmlkZW9PdXRwdXRIYXNBdmFpbGFibGVGcmFtZSgpIGEgdHJ1ZSBjb25zdCBm dW5jdGlvbjsgbW92ZSB0aGUgY2FsbCB0byBjcmVhdGUgdGhlCisgICAgICAgIHZpZGVvT3V0cHV0 IGludG8gdGhlIGNhbGxlci4gQWxzbywgaXQgc2hvdWxkIGNoZWNrIHdoZXRoZXIgYSBwaXhlbEJ1 ZmZlciBleGlzdHMsIG5vdCBqdXN0CisgICAgICAgIGEgUkdCIGltYWdlLgorCisgICAgICAgIGlz UmVhZHlGb3JWaWRlb1NldHVwKCkgc2hvdWxkIG5vdCB0YWtlIHRoZSB2aXNpYmlsaXR5IGZsYWcg aW50byBjb25zaWRlcmF0aW9uOyB0aGlzIHdpbGwKKyAgICAgICAgYmxvY2sgYSB2aWRlb091dHB1 dCBmcm9tIGJlaW5nIGNyZWF0ZWQgd2hlbiBhbiBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSB0aGUg RE9NIG9yIGhhcyBpdHMKKyAgICAgICAgUmVuZGVyZXIgZGVzdHJveWVkIGJ5IHNldHRpbmcgZGlz cGxheTpub25lLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmlzUmVhZHlGb3JWaWRlb1NldHVwIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6dXBkYXRl U3RhdGVzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakM6OmNyZWF0ZVZpZGVvT3V0cHV0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnZpZGVvT3V0cHV0SGFzQXZhaWxhYmxlRnJhbWUgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6dXBkYXRlTGFzdEltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakM6Om91dHB1dE1lZGlhRGF0YVdpbGxDaGFuZ2UpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6dmlkZW9PdXRwdXRI YXNBdmFpbGFibGVGcmFtZSk6IERlbGV0ZWQuCisKIDIwMjEtMDgtMTcgIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjgwNzIzKTogUHJvdGVj dGVkIEhMUyArIEVNRSBwbGF5YmFjayBmYWlscyB3aXRoICJ0ZW1wb3JhcnkgZXJyb3IiCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3Bw CmluZGV4IGNmODgzYzc1ZjhhZTM0YmRhZDQ2YTU0ZTJkODQwNmI2YWFiYjJiNGEuLjZmNjQ4OWUy ZjU5YzkxZWY1MTQ3YTc1N2U5MGNkMWY2MDAwZWY4MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwCkBAIC00NTAsNyArNDUw LDkgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmlzUmVhZHlGb3JWaWRl b1NldHVwKCkgY29uc3QKICAgICAvLyBBVkZvdW5kYXRpb24gd2lsbCBub3QgcmV0dXJuIHRydWUg Zm9yIGZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSB1bnRpbAogICAgIC8vIGFuIEFWUGxheWVyTGF5 ZXIgaGFzIGJlZW4gYWRkZWQgdG8gdGhlIEFWUGxheWVySXRlbSwgc28gYWxsb3cgdmlkZW8gc2V0 dXAKICAgICAvLyBoZXJlIGlmIGEgdmlkZW8gdHJhY2sgdG8gdHJpZ2dlciBhbGxvY2F0aW9uIG9m IGEgQVZQbGF5ZXJMYXllci4KLSAgICByZXR1cm4gKG1faXNBbGxvd2VkVG9SZW5kZXIgfHwgbV9j YWNoZWRIYXNWaWRlbykgJiYgbV9yZWFkeVN0YXRlID49IE1lZGlhUGxheWVyOjpSZWFkeVN0YXRl OjpIYXZlTWV0YWRhdGEgJiYgbV92aXNpYmxlOworICAgIHJldHVybiAobV9pc0FsbG93ZWRUb1Jl bmRlciB8fCBtX2NhY2hlZEhhc1ZpZGVvKQorICAgICAgICAmJiBtX2Fzc2V0SXNQbGF5YWJsZQor ICAgICAgICAmJiBwbGF5ZXJJdGVtU3RhdHVzKCkgPj0gTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1T dGF0dXNSZWFkeVRvUGxheTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b246OnByZXBhcmVGb3JSZW5kZXJpbmcoKQpAQCAtNTA3LDExICs1MDksMjggQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnVwZGF0ZVN0YXRlcygpCiAgICAgICAgIAogICAg ICAgICBtX2Fzc2V0SXNQbGF5YWJsZSA9IChhc3NldFN0YXR1cyA9PSBNZWRpYVBsYXllckFWQXNz ZXRTdGF0dXNQbGF5YWJsZSk7CiAgICAgICAgIGlmIChtX3JlYWR5U3RhdGUgPCBNZWRpYVBsYXll cjo6UmVhZHlTdGF0ZTo6SGF2ZU1ldGFkYXRhICYmIGFzc2V0U3RhdHVzID4gTWVkaWFQbGF5ZXJB VkFzc2V0U3RhdHVzTG9hZGluZykgewotICAgICAgICAgICAgaWYgKG1fYXNzZXRJc1BsYXlhYmxl KSB7Ci0gICAgICAgICAgICAgICAgaWYgKGFzc2V0U3RhdHVzID49IE1lZGlhUGxheWVyQVZBc3Nl dFN0YXR1c0xvYWRlZCkKLSAgICAgICAgICAgICAgICAgICAgbmV3UmVhZHlTdGF0ZSA9IE1lZGlh UGxheWVyOjpSZWFkeVN0YXRlOjpIYXZlTWV0YWRhdGE7CisgICAgICAgICAgICBzd2l0Y2ggKGFz c2V0U3RhdHVzKSB7CisgICAgICAgICAgICBjYXNlIE1lZGlhUGxheWVyQVZBc3NldFN0YXR1c0Rv ZXNOb3RFeGlzdDoKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzVW5r bm93bjoKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzTG9hZGluZzoK KyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgICAgICBi cmVhazsKKworICAgICAgICAgICAgY2FzZSBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNGYWlsZWQ6 CisgICAgICAgICAgICAgICAgLy8gRklYIE1FOiBmZXRjaCB0aGUgZXJyb3IgYXNzb2NpYXRlZCB3 aXRoIHRoZSBAInBsYXlhYmxlIiBrZXkgdG8gZGlzdGluZ3Vpc2ggYmV0d2VlbiBmb3JtYXQKKyAg ICAgICAgICAgICAgICAvLyBhbmQgbmV0d29yayBlcnJvcnMuCisgICAgICAgICAgICAgICAgbmV3 TmV0d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZTo6Rm9ybWF0RXJyb3I7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVkFz c2V0U3RhdHVzQ2FuY2VsbGVkOgorICAgICAgICAgICAgICAgIC8vIE5vLW9wLgorICAgICAgICAg ICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBjYXNlIE1lZGlhUGxheWVyQVZBc3NldFN0YXR1 c0xvYWRlZDoKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzUGxheWFi bGU6CisgICAgICAgICAgICAgICAgbmV3UmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpSZWFkeVN0 YXRlOjpIYXZlTWV0YWRhdGE7CiAgICAgICAgICAgICAgICAgaWYgKGl0ZW1TdGF0dXMgPD0gTWVk aWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNVbmtub3duKSB7Ci0gICAgICAgICAgICAgICAgICAg IGlmIChhc3NldFN0YXR1cyA9PSBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNGYWlsZWQgfHwgbV9w cmVsb2FkID4gTWVkaWFQbGF5ZXI6OlByZWxvYWQ6Ok1ldGFEYXRhIHx8IGlzTGl2ZVN0cmVhbSgp KSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChtX3ByZWxvYWQgPiBNZWRpYVBsYXllcjo6UHJl bG9hZDo6TWV0YURhdGEgfHwgaXNMaXZlU3RyZWFtKCkpIHsKICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIFRoZSBhc3NldCBpcyBwbGF5YWJsZSBidXQgZG9lc24ndCBzdXBwb3J0IGluc3BlY3Rp b24gcHJpb3IgdG8gcGxheWJhY2sgKGVnLiBzdHJlYW1pbmcgZmlsZXMpLAogICAgICAgICAgICAg ICAgICAgICAgICAgLy8gb3Igd2UgYXJlIHN1cHBvc2VkIHRvIHByZXBhcmUgZm9yIHBsYXliYWNr IGltbWVkaWF0ZWx5LCBzbyBjcmVhdGUgdGhlIHBsYXllciBpdGVtIG5vdy4KICAgICAgICAgICAg ICAgICAgICAgICAgIG5ld05ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6 OkxvYWRpbmc7CkBAIC01MTksNTcgKzUzOCw2OCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbjo6dXBkYXRlU3RhdGVzKCkKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCiAg ICAgICAgICAgICAgICAgICAgICAgICBuZXdOZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TmV0 d29ya1N0YXRlOjpJZGxlOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICAgICAgLy8gRklYIE1FOiBmZXRjaCB0aGUgZXJyb3IgYXNzb2NpYXRlZCB3 aXRoIHRoZSBAInBsYXlhYmxlIiBrZXkgdG8gZGlzdGluZ3Vpc2ggYmV0d2VlbiBmb3JtYXQgCi0g ICAgICAgICAgICAgICAgLy8gYW5kIG5ldHdvcmsgZXJyb3JzLgotICAgICAgICAgICAgICAgIG5l d05ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6OkZvcm1hdEVycm9yOwog ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIAorCisgICAgICAgIGJvb2wgZnVsbHlM b2FkZWQgPSAobWF4VGltZUxvYWRlZCgpID09IGR1cmF0aW9uTWVkaWFUaW1lKCkpOwogICAgICAg ICBpZiAoYXNzZXRTdGF0dXMgPj0gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVzTG9hZGVkICYmIGl0 ZW1TdGF0dXMgPiBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1Vua25vd24pIHsKICAgICAg ICAgICAgIHN3aXRjaCAoaXRlbVN0YXR1cykgewogICAgICAgICAgICAgY2FzZSBNZWRpYVBsYXll ckFWUGxheWVySXRlbVN0YXR1c0RvZXNOb3RFeGlzdDoKICAgICAgICAgICAgIGNhc2UgTWVkaWFQ bGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNVbmtub3duOgotICAgICAgICAgICAgY2FzZSBNZWRpYVBs YXllckFWUGxheWVySXRlbVN0YXR1c0ZhaWxlZDoKKyAgICAgICAgICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgICAgICAgICBicmVhazsKIAotICAgICAgICAgICAgY2FzZSBN ZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1BsYXliYWNrTGlrZWx5VG9LZWVwVXA6Ci0gICAg ICAgICAgICBjYXNlIE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVtU3RhdHVzUGxheWJhY2tCdWZmZXJG dWxsOgotICAgICAgICAgICAgICAgIC8vIElmIHRoZSBzdGF0dXMgYmVjb21lcyBQbGF5YmFja0J1 ZmZlckZ1bGwsIGxvYWRpbmcgc3RvcHMgYW5kIHRoZSBzdGF0dXMgd2lsbCBub3QKLSAgICAgICAg ICAgICAgICAvLyBwcm9ncmVzcyB0byBMaWtlbHlUb0tlZXBVcC4gU2V0IHRoZSByZWFkeVN0YXRl IHRvICBIQVZFX0VOT1VHSF9EQVRBLCBvbiB0aGUKLSAgICAgICAgICAgICAgICAvLyBwcmVzdW1w dGlvbiB0aGF0IGlmIHRoZSBwbGF5YmFjayBidWZmZXIgaXMgZnVsbCwgcGxheWJhY2sgd2lsbCBw cm9iYWJseSBub3Qgc3RhbGwuCi0gICAgICAgICAgICAgICAgbmV3UmVhZHlTdGF0ZSA9IE1lZGlh UGxheWVyOjpSZWFkeVN0YXRlOjpIYXZlRW5vdWdoRGF0YTsKKyAgICAgICAgICAgIGNhc2UgTWVk aWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNGYWlsZWQ6CisgICAgICAgICAgICAgICAgbmV3TmV0 d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZTo6RGVjb2RlRXJyb3I7CiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXll ckl0ZW1TdGF0dXNSZWFkeVRvUGxheToKICAgICAgICAgICAgICAgICBpZiAobV9yZWFkeVN0YXRl ICE9IE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlOjpIYXZlRW5vdWdoRGF0YSAmJiBtYXhUaW1lTG9h ZGVkKCkgPiBjdXJyZW50TWVkaWFUaW1lKCkpCiAgICAgICAgICAgICAgICAgICAgIG5ld1JlYWR5 U3RhdGUgPSBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZTo6SGF2ZUZ1dHVyZURhdGE7CisgICAgICAg ICAgICAgICAgbmV3TmV0d29ya1N0YXRlID0gZnVsbHlMb2FkZWQgPyBNZWRpYVBsYXllcjo6TmV0 d29ya1N0YXRlOjpMb2FkZWQgOiBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpMb2FkaW5nOwog ICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICBjYXNlIE1lZGlhUGxheWVyQVZQ bGF5ZXJJdGVtU3RhdHVzUGxheWJhY2tCdWZmZXJFbXB0eToKICAgICAgICAgICAgICAgICBuZXdS ZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGU6OkhhdmVDdXJyZW50RGF0YTsKKyAg ICAgICAgICAgICAgICBuZXdOZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRl OjpMb2FkaW5nOwogICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICBpZiAoaXRlbVN0YXR1cyA9PSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1Bs YXliYWNrQnVmZmVyRnVsbCkKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXllckl0 ZW1TdGF0dXNQbGF5YmFja0J1ZmZlckZ1bGw6CisgICAgICAgICAgICAgICAgLy8gSWYgdGhlIHN0 YXR1cyBiZWNvbWVzIFBsYXliYWNrQnVmZmVyRnVsbCwgbG9hZGluZyBzdG9wcyBhbmQgdGhlIHN0 YXR1cyB3aWxsIG5vdAorICAgICAgICAgICAgICAgIC8vIHByb2dyZXNzIHRvIExpa2VseVRvS2Vl cFVwLiBTZXQgdGhlIHJlYWR5U3RhdGUgdG8gIEhBVkVfRU5PVUdIX0RBVEEsIG9uIHRoZQorICAg ICAgICAgICAgICAgIC8vIHByZXN1bXB0aW9uIHRoYXQgaWYgdGhlIHBsYXliYWNrIGJ1ZmZlciBp cyBmdWxsLCBwbGF5YmFjayB3aWxsIHByb2JhYmx5IG5vdCBzdGFsbC4KKyAgICAgICAgICAgICAg ICBuZXdSZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGU6OkhhdmVFbm91Z2hEYXRh OwogICAgICAgICAgICAgICAgIG5ld05ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVyOjpOZXR3b3Jr U3RhdGU6OklkbGU7Ci0gICAgICAgICAgICBlbHNlIGlmIChpdGVtU3RhdHVzID09IE1lZGlhUGxh eWVyQVZQbGF5ZXJJdGVtU3RhdHVzRmFpbGVkKQotICAgICAgICAgICAgICAgIG5ld05ldHdvcmtT dGF0ZSA9IE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6OkRlY29kZUVycm9yOwotICAgICAgICAg ICAgZWxzZSBpZiAoaXRlbVN0YXR1cyAhPSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1Bs YXliYWNrQnVmZmVyRnVsbCAmJiBpdGVtU3RhdHVzID49IE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVt U3RhdHVzUmVhZHlUb1BsYXkpCi0gICAgICAgICAgICAgICAgbmV3TmV0d29ya1N0YXRlID0gKG1h eFRpbWVMb2FkZWQoKSA9PSBkdXJhdGlvbk1lZGlhVGltZSgpKSA/IE1lZGlhUGxheWVyOjpOZXR3 b3JrU3RhdGU6OkxvYWRlZCA6IE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6OkxvYWRpbmc7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBs YXllckl0ZW1TdGF0dXNQbGF5YmFja0xpa2VseVRvS2VlcFVwOgorICAgICAgICAgICAgICAgIG5l d1JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZTo6SGF2ZUVub3VnaERhdGE7Cisg ICAgICAgICAgICAgICAgbmV3TmV0d29ya1N0YXRlID0gZnVsbHlMb2FkZWQgPyBNZWRpYVBsYXll cjo6TmV0d29ya1N0YXRlOjpMb2FkZWQgOiBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpMb2Fk aW5nOworICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICB9CiAgICAgICAgIH0K ICAgICB9CiAKLSAgICBpZiAoaXNSZWFkeUZvclZpZGVvU2V0dXAoKSAmJiBjdXJyZW50UmVuZGVy aW5nTW9kZSgpICE9IHByZWZlcnJlZFJlbmRlcmluZ01vZGUoKSkKLSAgICAgICAgc2V0VXBWaWRl b1JlbmRlcmluZygpOworICAgIGlmIChtX2NhY2hlZEhhc1ZpZGVvKSB7CisgICAgICAgIGlmIChp c1JlYWR5Rm9yVmlkZW9TZXR1cCgpICYmIGN1cnJlbnRSZW5kZXJpbmdNb2RlKCkgIT0gcHJlZmVy cmVkUmVuZGVyaW5nTW9kZSgpKQorICAgICAgICAgICAgc2V0VXBWaWRlb1JlbmRlcmluZygpOwor CisgICAgICAgIGlmICghaGFzQXZhaWxhYmxlVmlkZW9GcmFtZSgpKSB7CisgICAgICAgICAgICBt X2hhdmVSZXBvcnRlZEZpcnN0VmlkZW9GcmFtZSA9IGZhbHNlOwogCi0gICAgaWYgKCFtX2hhdmVS ZXBvcnRlZEZpcnN0VmlkZW9GcmFtZSAmJiBtX2NhY2hlZEhhc1ZpZGVvICYmIGhhc0F2YWlsYWJs ZVZpZGVvRnJhbWUoKSkgewotICAgICAgICBpZiAobV9yZWFkeVN0YXRlIDwgTWVkaWFQbGF5ZXI6 OlJlYWR5U3RhdGU6OkhhdmVDdXJyZW50RGF0YSkKLSAgICAgICAgICAgIG5ld1JlYWR5U3RhdGUg PSBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZTo6SGF2ZUN1cnJlbnREYXRhOwotICAgICAgICBtX2hh dmVSZXBvcnRlZEZpcnN0VmlkZW9GcmFtZSA9IHRydWU7Ci0gICAgICAgIG1fcGxheWVyLT5maXJz dFZpZGVvRnJhbWVBdmFpbGFibGUoKTsKLSAgICB9IGVsc2UgaWYgKCFoYXNBdmFpbGFibGVWaWRl b0ZyYW1lKCkpCi0gICAgICAgIG1faGF2ZVJlcG9ydGVkRmlyc3RWaWRlb0ZyYW1lID0gZmFsc2U7 CisgICAgICAgICAgICAvLyBEbyBub3QgYWxsb3cgdXMgdG8gcHJvZ3Jlc3MgIGJleW9uZCBIYXZl TWV0YWRhdGEgdW50aWwgdGhlIGxheWVyIGlzIHJlYWR5IGZvciBkaXNwbGF5CisgICAgICAgICAg ICAvLyBvciB0aGUgdmlkZW8gb3V0cHV0IGhhcyBhbiBhdmFpbGFibGUgZnJhbWUuCisgICAgICAg ICAgICBpZiAobV9yZWFkeVN0YXRlIDw9IE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlOjpIYXZlTWV0 YWRhdGEKKyAgICAgICAgICAgICAgICAmJiBuZXdSZWFkeVN0YXRlID4gTWVkaWFQbGF5ZXI6OlJl YWR5U3RhdGU6OkhhdmVNZXRhZGF0YSkgeworICAgICAgICAgICAgICAgIG5ld1JlYWR5U3RhdGUg PSBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZTo6SGF2ZU1ldGFkYXRhOworICAgICAgICAgICAgICAg IElORk9fTE9HKExPR0lERU5USUZJRVIsICJsb3dlcmVkIHJlYWR5U3RhdGUgdG8gIiwgbmV3UmVh ZHlTdGF0ZSwgIiBiZWNhdXNlICFoYXNBdmFpbGFibGVWaWRlb0ZyYW1lKCkiKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfSBlbHNlIGlmICghbV9oYXZlUmVwb3J0ZWRGaXJzdFZpZGVvRnJhbWUp IHsKKyAgICAgICAgICAgIG1faGF2ZVJlcG9ydGVkRmlyc3RWaWRlb0ZyYW1lID0gdHJ1ZTsKKyAg ICAgICAgICAgIG1fcGxheWVyLT5maXJzdFZpZGVvRnJhbWVBdmFpbGFibGUoKTsKKyAgICAgICAg fQorICAgIH0KIAogICAgIGlmIChtX25ldHdvcmtTdGF0ZSAhPSBuZXdOZXR3b3JrU3RhdGUpCiAg ICAgICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgImVudGVyZWQgd2l0aCBuZXR3b3JrU3Rh dGUgIiwgbV9uZXR3b3JrU3RhdGUsICIsIGV4aXRpbmcgd2l0aCAiLCBuZXdOZXR3b3JrU3RhdGUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQy5oCmluZGV4IDUzMmI1NDNhMjIyOThiOWM3YTNiNmJkZGM5NThm NGFlZWI3ZTJhMjUuLjBkZGRhYzkzOTYwMjQ0YTljY2ExNWNlOTdmZWJhMGJiNDIzOWRiYmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDLmgKQEAgLTI1MSw3ICsyNTEsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgY3JlYXRlVmlkZW9PdXRwdXQoKTsKICAgICB2b2lkIGRlc3Ryb3lWaWRlb091dHB1dCgpOwog ICAgIGJvb2wgdXBkYXRlTGFzdFBpeGVsQnVmZmVyKCk7Ci0gICAgYm9vbCB2aWRlb091dHB1dEhh c0F2YWlsYWJsZUZyYW1lKCk7CisgICAgYm9vbCB2aWRlb091dHB1dEhhc0F2YWlsYWJsZUZyYW1l KCkgY29uc3Q7CiAgICAgdm9pZCBwYWludFdpdGhWaWRlb091dHB1dChHcmFwaGljc0NvbnRleHQm LCBjb25zdCBGbG9hdFJlY3QmKTsKICAgICBSZWZQdHI8TmF0aXZlSW1hZ2U+IG5hdGl2ZUltYWdl Rm9yQ3VycmVudFRpbWUoKSBmaW5hbDsKICAgICB2b2lkIHdhaXRGb3JWaWRlb091dHB1dE1lZGlh RGF0YVdpbGxDaGFuZ2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4IDFiNzYwYjEzYzU1 OTgwYzIxZDY4Mzg1ODlkMGNiZWM5Yzk0NTQ1MTMuLmZhYTQ3N2JlNmYxOTZkNDRkMDdjNTk5NGJh YWUzM2E5OGU0Njc0MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtMjQzMCw2ICsyNDMw LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRl b091dHB1dCgpCiAKICAgICBtX3ZpZGVvT3V0cHV0RGVsZWdhdGUgPSBhZG9wdE5TKFtbV2ViQ29y ZUFWRlB1bGxEZWxlZ2F0ZSBhbGxvY10gaW5pdFdpdGhQbGF5ZXI6bWFrZVdlYWtQdHIoKnRoaXMp XSk7CiAgICAgW21fdmlkZW9PdXRwdXQgc2V0RGVsZWdhdGU6bV92aWRlb091dHB1dERlbGVnYXRl LmdldCgpIHF1ZXVlOmdsb2JhbFB1bGxEZWxlZ2F0ZVF1ZXVlKCldOworICAgIFttX3ZpZGVvT3V0 cHV0IHJlcXVlc3ROb3RpZmljYXRpb25PZk1lZGlhRGF0YUNoYW5nZVdpdGhBZHZhbmNlSW50ZXJ2 YWw6MF07CiAKICAgICBbbV9hdlBsYXllckl0ZW0uZ2V0KCkgYWRkT3V0cHV0Om1fdmlkZW9PdXRw dXQuZ2V0KCldOwogCkBAIC0yNDc0LDE3ICsyNDc1LDE0IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6dXBkYXRlTGFzdFBpeGVsQnVmZmVyKCkKICAgICByZXR1cm4g dHJ1ZTsKIH0KIAotYm9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjp2aWRl b091dHB1dEhhc0F2YWlsYWJsZUZyYW1lKCkKK2Jvb2wgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQzo6dmlkZW9PdXRwdXRIYXNBdmFpbGFibGVGcmFtZSgpIGNvbnN0CiB7Ci0gICAg aWYgKCFtX2F2UGxheWVySXRlbSB8fCByZWFkeVN0YXRlKCkgPCBNZWRpYVBsYXllcjo6UmVhZHlT dGF0ZTo6SGF2ZUN1cnJlbnREYXRhKQorICAgIGlmICghbV92aWRlb091dHB1dCkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKG1fbGFzdEltYWdlKQorICAgIGlmIChtX2xhc3RJbWFn ZSB8fCBtX2xhc3RQaXhlbEJ1ZmZlcikKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAo IW1fdmlkZW9PdXRwdXQpCi0gICAgICAgIGNyZWF0ZVZpZGVvT3V0cHV0KCk7Ci0KICAgICByZXR1 cm4gW21fdmlkZW9PdXRwdXQgaGFzTmV3UGl4ZWxCdWZmZXJGb3JJdGVtVGltZTpbbV9hdlBsYXll ckl0ZW0gY3VycmVudFRpbWVdXTsKIH0KIApAQCAtMjQ5Myw2ICsyNDkxLDkgQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjp1cGRhdGVMYXN0SW1hZ2UoVXBkYXRlVHlw ZSB0eXBlKQogICAgIGlmICghbV9hdlBsYXllckl0ZW0gfHwgcmVhZHlTdGF0ZSgpIDwgTWVkaWFQ bGF5ZXI6OlJlYWR5U3RhdGU6OkhhdmVDdXJyZW50RGF0YSkKICAgICAgICAgcmV0dXJuOwogCisg ICAgaWYgKCFtX3ZpZGVvT3V0cHV0KQorICAgICAgICBjcmVhdGVWaWRlb091dHB1dCgpOworCiAg ICAgaWYgKHR5cGUgPT0gVXBkYXRlVHlwZTo6VXBkYXRlU3luY2hyb25vdXNseSAmJiAhbV9sYXN0 SW1hZ2UgJiYgIXZpZGVvT3V0cHV0SGFzQXZhaWxhYmxlRnJhbWUoKSkKICAgICAgICAgd2FpdEZv clZpZGVvT3V0cHV0TWVkaWFEYXRhV2lsbENoYW5nZSgpOwogCkBAIC0yNTc4LDYgKzI1NzksOCBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6Om91dHB1dE1lZGlhRGF0 YVdpbGxDaGFuZ2UoKQogewogICAgIGlmIChtX3J1bm5pbmdNb2RhbFBhaW50KQogICAgICAgICBS dW5Mb29wOjptYWluKCkuc3RvcCgpOworCisgICAgdXBkYXRlU3RhdGVzKCk7CiB9CiAKICNpZiBF TkFCTEUoTEVHQUNZX0VOQ1JZUFRFRF9NRURJQSkK