226899 2021-06-10 14:31:01 -0700 REGRESSION: (r278544) [ Mac-wk1 ] media/media-continues-playing-after-replace-source.html is a flaky failure 2021-06-25 15:30:52 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=227367 InRadar P2 Normal --- 1 tsavell cdumez calvaris cdumez changseok darin eric.carlson esprehn+autocc ews-watchlist ggaren glenn gyuyoung.kim jer.noble peng.liu6 philipj rniwa sergio webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1768737 0 tsavell 2021-06-10 14:31:01 -0700 media/media-continues-playing-after-replace-source.html this test has been flaky failing sense the changes in https://trac.webkit.org/changeset/278544/webkit History: https://results.webkit.org/?suite=layout-tests&test=media/media-continues-playing-after-replace-source.html Diff: --- /Volumes/Data/worker/bigsur-debug-tests-wk1/build/layout-test-results/media/media-continues-playing-after-replace-source-expected.txt +++ /Volumes/Data/worker/bigsur-debug-tests-wk1/build/layout-test-results/media/media-continues-playing-after-replace-source-actual.txt @@ -5,7 +5,7 @@ EVENT(playing) EXPECTED (testElement.currentTime > '0') OK Replacing the media's source element: -EXPECTED (testElement.currentTime == '0') OK +EXPECTED (testElement.currentTime == '0'), OBSERVED '0.205980314234375' FAIL EXPECTED (testElement.currentTime > '0') OK END OF TEST 1768738 1 webkit-bug-importer 2021-06-10 14:31:42 -0700 <rdar://problem/79160701> 1768740 2 tsavell 2021-06-10 14:33:43 -0700 This test is effecting wk1 queues 1768741 3 cdumez 2021-06-10 14:33:53 -0700 Looking. 1768776 4 431147 cdumez 2021-06-10 15:41:16 -0700 Created attachment 431147 Patch 1768817 5 431147 rniwa 2021-06-10 16:58:15 -0700 Comment on attachment 431147 Patch Maybe we can do the same for other media related code where we use callOnMainThread? 1768818 6 cdumez 2021-06-10 16:58:47 -0700 (In reply to Ryosuke Niwa from comment #5) > Comment on attachment 431147 [details] > Patch > > Maybe we can do the same for other media related code where we use > callOnMainThread? Probably, I plan to follow up. 1768832 7 ews-feeder 2021-06-10 18:02:12 -0700 Committed r278746 (238707@main): <https://commits.webkit.org/238707@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431147. 431147 2021-06-10 15:41:16 -0700 2021-06-10 18:02:14 -0700 Patch bug-226899-20210610154115.patch text/plain 12307 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjdiODk2MDlmODU4ZDUx ZjZhNjk0MmUyNzZkMmZhZDY0OGEwZWFkOC4uOWQzNzE2Zjk4NWI3NmIwNGQ2MDYwMDBmYmRlY2Nl ZWYxYjI2NGE5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTA2LTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogKHIyNzg1 NDQpIFsgTWFjLXdrMSBdIG1lZGlhL21lZGlhLWNvbnRpbnVlcy1wbGF5aW5nLWFmdGVyLXJlcGxh Y2Utc291cmNlLmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY4OTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzc5MTYwNzAxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEhhdmUgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQyBzY2hlZHVsZSB0YXNr cyBvbiB0aGUgSFRNTCBldmVudCBsb29wIGluc3RlYWQgb2Ygc2ltcGx5IHVzaW5nCisgICAgICAg IGNhbGxPbk1haW5UaHJlYWQoKSB0byBhZGRyZXNzIGZsYWtpbmVzcyBpc3N1ZXMsIHNpbmNlIHRo ZSByZXN0IG9mIHRoZSBtZWRpYSBjb2RlIHVzZXMgdGhlIEhUTUwgZXZlbnQKKyAgICAgICAgbG9v cC4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclF1ZXVlVGFza09uRXZlbnRMb29wKToK KyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9NZWRpYVBsYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6 cXVldWVUYXNrT25FdmVudExvb3ApOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlh UGxheWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllckNsaWVudDo6bWVkaWFQbGF5 ZXJRdWV1ZVRhc2tPbkV2ZW50TG9vcCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnF1ZXVlVGFza09uRXZlbnRM b29wKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAg ICAgICAgKC1bV2ViQ29yZUFWRk1vdmllT2JzZXJ2ZXIgbWV0YWRhdGFMb2FkZWRdKToKKyAgICAg ICAgKC1bV2ViQ29yZUFWRk1vdmllT2JzZXJ2ZXIgZGlkRW5kOl0pOgorICAgICAgICAoLVtXZWJD b3JlQVZGTW92aWVPYnNlcnZlciBvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOm9mT2JqZWN0OmNoYW5n ZTpjb250ZXh0Ol0pOgorICAgICAgICAoLVtXZWJDb3JlQVZGTW92aWVPYnNlcnZlciBsZWdpYmxl T3V0cHV0OmRpZE91dHB1dEF0dHJpYnV0ZWRTdHJpbmdzOm5hdGl2ZVNhbXBsZUJ1ZmZlcnM6Zm9y SXRlbVRpbWU6XSk6CisgICAgICAgICgtW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIG91dHB1dFNl cXVlbmNlV2FzRmx1c2hlZDpdKToKKyAgICAgICAgKC1bV2ViQ29yZUFWRk1vdmllT2JzZXJ2ZXIg bWV0YWRhdGFPdXRwdXQ6ZGlkT3V0cHV0VGltZWRNZXRhZGF0YUdyb3Vwczpmcm9tUGxheWVySXRl bVRyYWNrOl0pOgorICAgICAgICAoLVtXZWJDb3JlQVZGTW92aWVPYnNlcnZlciBtZXRhZGF0YUNv bGxlY3RvcjpkaWRDb2xsZWN0RGF0ZVJhbmdlTWV0YWRhdGFHcm91cHM6aW5kZXhlc09mTmV3R3Jv dXBzOmluZGV4ZXNPZk1vZGlmaWVkR3JvdXBzOl0pOgorICAgICAgICAoLVtXZWJDb3JlQVZGTG9h ZGVyRGVsZWdhdGUgcmVzb3VyY2VMb2FkZXI6c2hvdWxkV2FpdEZvckxvYWRpbmdPZlJlcXVlc3Rl ZFJlc291cmNlOl0pOgorICAgICAgICAoLVtXZWJDb3JlQVZGTG9hZGVyRGVsZWdhdGUgcmVzb3Vy Y2VMb2FkZXI6ZGlkQ2FuY2VsTG9hZGluZ1JlcXVlc3Q6XSk6CisKIDIwMjEtMDYtMTAgIEFyY2Fk eSBHb2xkbWludHMtT3Jsb3YgIDxhZ29sZG1pbnRzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0Nh aXJvXSBGaXggUGF0aDo6Ym91bmRpbmdSZWN0U2xvd0Nhc2Ugd2hlbiB0aGUgcGF0aCBpcyBhIHNp bmdsZSBNb3ZlVG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4 IDBmZWQ2M2I5YTBjY2U1NzE5MGU3ZjU4MGZkMDU5ZDQ5ZThhZGJkOTkuLjNmMjFkZmU4ZWQxNzlj MjY5NmU0YzYxODUyMTQ5OWNkNmE2NjdjZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcApAQCAtODEzOCw2ICs4MTM4LDExIEBAIE1lZGlhRWxlbWVudFNlc3Npb24m IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhU2Vzc2lvbigpIGNvbnN0CiAgICAgcmV0dXJuICptX21l ZGlhU2Vzc2lvbjsKIH0KIAordm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclF1ZXVl VGFza09uRXZlbnRMb29wKEZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQoreworICAgIGRvY3VtZW50 KCkuZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgV1RGTW92 ZSh0YXNrKSk7Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6c2NoZWR1bGVFdmVudE9uKFQmIHRhcmdldCwgUmVmPEV2ZW50PiYmIGV2ZW50KQogewogICAg IHRhcmdldC5xdWV1ZUNhbmNlbGxhYmxlVGFza1RvRGlzcGF0Y2hFdmVudCh0YXJnZXQsIFRhc2tT b3VyY2U6Ok1lZGlhRWxlbWVudCwgbV9hc3luY0V2ZW50c0NhbmNlbGxhdGlvbkdyb3VwLCBXVEZN b3ZlKGV2ZW50KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IGUy ZDJiOGUyODhmNDRkOGQ2MWNkYTQ0MDkyZDFhNWU5NWM3NGRhZTIuLmQ0MWU2NTY3NmViZWRlZTk0 OWJiY2EyMjhhMzZjNmMxMzM0ZmE2NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5oCkBAIC02NjcsNiArNjY3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIG1lZGlhUGxheWVy V2lsbEluaXRpYWxpemVNZWRpYUVuZ2luZSgpIGZpbmFsOwogICAgIHZvaWQgbWVkaWFQbGF5ZXJE aWRJbml0aWFsaXplTWVkaWFFbmdpbmUoKSBmaW5hbDsKICAgICB2b2lkIG1lZGlhUGxheWVyUmVs b2FkQW5kUmVzdW1lUGxheWJhY2tJZk5lZWRlZCgpIGZpbmFsOworICAgIHZvaWQgbWVkaWFQbGF5 ZXJRdWV1ZVRhc2tPbkV2ZW50TG9vcChGdW5jdGlvbjx2b2lkKCk+JiYpIGZpbmFsOwogCiAgICAg dm9pZCBzY2hlZHVsZU1lZGlhRW5naW5lV2FzVXBkYXRlZCgpOwogICAgIHZvaWQgbWVkaWFFbmdp bmVXYXNVcGRhdGVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9NZWRpYVBsYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5jcHAKaW5kZXggMmFlMjk1OTY4MjU0ZmRiYzhlOGM4NzJkYjZmYzQ2N2IxM2Zm ZTIxMS4uOGIwNjQ3ODY0NzJiNGQzMTkxMDg5ZGEzNmQ1ZGIwNjZmMjM5NTMzZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtNjA1 LDYgKzYwNSwxMiBAQCB2b2lkIE1lZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRpYUVuZ2luZShj b25zdCBNZWRpYVBsYXllckZhY3RvcnkqIGN1cnJlbnQpCiAgICAgY2xpZW50KCkubWVkaWFQbGF5 ZXJEaWRJbml0aWFsaXplTWVkaWFFbmdpbmUoKTsKIH0KIAordm9pZCBNZWRpYVBsYXllcjo6cXVl dWVUYXNrT25FdmVudExvb3AoRnVuY3Rpb248dm9pZCgpPiYmIHRhc2spCit7CisgICAgQVNTRVJU KGlzTWFpblRocmVhZCgpKTsKKyAgICBjbGllbnQoKS5tZWRpYVBsYXllclF1ZXVlVGFza09uRXZl bnRMb29wKFdURk1vdmUodGFzaykpOworfQorCiBib29sIE1lZGlhUGxheWVyOjpoYXNBdmFpbGFi bGVWaWRlb0ZyYW1lKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9wcml2YXRlLT5oYXNBdmFpbGFi bGVWaWRlb0ZyYW1lKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9NZWRpYVBsYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVk aWFQbGF5ZXIuaAppbmRleCBlMDIzOTQzMWE3Y2MwYWY5YzYxYTcxM2U0MjI4MmY1NjY5YTA2MGI0 Li5iZjUyMzNlZmMwOTM1NzQzNDE4ZTVkNmRhZTFlODE1NzczZjc0NjhmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKQEAgLTI4NCw2ICsyODQs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBTdHJpbmcgYXVkaW9PdXRwdXREZXZpY2VJZCgpIGNv bnN0IHsgcmV0dXJuIHsgfTsgfQogICAgIHZpcnR1YWwgU3RyaW5nIGF1ZGlvT3V0cHV0RGV2aWNl SWRPdmVycmlkZSgpIGNvbnN0IHsgcmV0dXJuIHsgfTsgfQogCisgICAgdmlydHVhbCB2b2lkIG1l ZGlhUGxheWVyUXVldWVUYXNrT25FdmVudExvb3AoRnVuY3Rpb248dm9pZCgpPiYmIHRhc2spIHsg Y2FsbE9uTWFpblRocmVhZChXVEZNb3ZlKHRhc2spKTsgfQorCiAjaWYgIVJFTEVBU0VfTE9HX0RJ U0FCTEVECiAgICAgdmlydHVhbCBjb25zdCB2b2lkKiBtZWRpYVBsYXllckxvZ0lkZW50aWZpZXIo KSB7IHJldHVybiBudWxscHRyOyB9CiAgICAgdmlydHVhbCBjb25zdCBMb2dnZXImIG1lZGlhUGxh eWVyTG9nZ2VyKCkgPSAwOwpAQCAtMzg3LDYgKzM4OSw4IEBAIHB1YmxpYzoKICAgICBib29sIHNo b3VsZENvbnRpbnVlQWZ0ZXJLZXlOZWVkZWQoKSBjb25zdCB7IHJldHVybiBtX3Nob3VsZENvbnRp bnVlQWZ0ZXJLZXlOZWVkZWQ7IH0KICNlbmRpZgogCisgICAgdm9pZCBxdWV1ZVRhc2tPbkV2ZW50 TG9vcChGdW5jdGlvbjx2b2lkKCk+JiYpOworCiAgICAgYm9vbCBwYXVzZWQoKSBjb25zdDsKICAg ICBib29sIHNlZWtpbmcoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAppbmRleCA2OGI0ZjU3MzUyMGNiYjBiNjVh OWI0ODVmNWQ2OWE5Mzc0YWUwZWFlLi5iYmQ1NjBhZDRjYTAwMDkxYWMxOWJkM2ZlZjlhZDJmY2Jl ZTAwMzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uLmNwcApAQCAtMTA1Miw2ICsxMDUyLDEzIEBAIGJvb2wgTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uOjppc1Vuc3VwcG9ydGVkTUlNRVR5cGUoY29uc3QgU3RyaW5nJiB0 eXBlKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb246OnF1ZXVlVGFza09uRXZlbnRMb29wKEZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQor eworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgaWYgKG1fcGxheWVyKQorICAgICAg ICBtX3BsYXllci0+cXVldWVUYXNrT25FdmVudExvb3AoV1RGTW92ZSh0YXNrKSk7Cit9CisKICNp ZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKIFdURkxvZ0NoYW5uZWwmIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbjo6bG9nQ2hhbm5lbCgpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgKaW5kZXggMGZmMWI3OGRjMjVi YTEwMjlmMjI1NTk2MWQyYWIwNjRkOGMwMjIwZi4uNDgyMjhiYWYzYjAyMmJmYTM0MGU0YTFmYzQw ZmIxZTgyOTM0NjY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb24uaApAQCAtNjQsNiArNjQsOCBAQCBwdWJsaWM6CiAjaWYgRU5BQkxF KFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKICAgICB2b2lkIHBsYXliYWNrVGFyZ2V0SXNXaXJl bGVzc0NoYW5nZWQoKTsKICNlbmRpZgorCisgICAgdm9pZCBxdWV1ZVRhc2tPbkV2ZW50TG9vcChG dW5jdGlvbjx2b2lkKCk+JiYpOwogICAgIAogICAgIGNsYXNzIE5vdGlmaWNhdGlvbiB7CiAgICAg cHVibGljOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXggOWY2NzllYzk5NjA0NDNlYmIxNzE5 NWM3NjRmNjg5NmJmYjk1NWE3OC4uYTc2ZTEwYTBlNjI4ZTA1ZGVhMTYxZDI1NmMxMDI3ODc4ZTAw NzkwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC0zNTc4LDcgKzM1NzgsMTAgQEAgLSAo dm9pZClkaXNjb25uZWN0CiAtICh2b2lkKW1ldGFkYXRhTG9hZGVkCiB7CiAgICAgZW5zdXJlT25N YWluVGhyZWFkKFtzZWxmLCBzdHJvbmdTZWxmID0gcmV0YWluUHRyKHNlbGYpXSB7Ci0gICAgICAg IGNhbGxPbk1haW5UaHJlYWQoW3BsYXllciA9IG1fcGxheWVyXSB7CisgICAgICAgIGlmICghbV9w bGF5ZXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgbV9wbGF5ZXItPnF1ZXVlVGFz a09uRXZlbnRMb29wKFtwbGF5ZXIgPSBtX3BsYXllcl0gewogICAgICAgICAgICAgaWYgKHBsYXll cikKICAgICAgICAgICAgICAgICBwbGF5ZXItPm1ldGFkYXRhTG9hZGVkKCk7CiAgICAgICAgIH0p OwpAQCAtMzU4OSw3ICszNTkyLDEwIEBAIC0gKHZvaWQpZGlkRW5kOihOU05vdGlmaWNhdGlvbiAq KXVudXNlZE5vdGlmaWNhdGlvbgogewogICAgIFVOVVNFRF9QQVJBTSh1bnVzZWROb3RpZmljYXRp b24pOwogICAgIGVuc3VyZU9uTWFpblRocmVhZChbc2VsZiwgc3Ryb25nU2VsZiA9IHJldGFpblB0 cihzZWxmKV0gewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtwbGF5ZXIgPSBtX3BsYXllcl0g eworICAgICAgICBpZiAoIW1fcGxheWVyKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg IG1fcGxheWVyLT5xdWV1ZVRhc2tPbkV2ZW50TG9vcChbcGxheWVyID0gbV9wbGF5ZXJdIHsKICAg ICAgICAgICAgIGlmIChwbGF5ZXIpCiAgICAgICAgICAgICAgICAgcGxheWVyLT5kaWRFbmQoKTsK ICAgICAgICAgfSk7CkBAIC0zNTk5LDcgKzM2MDUsMTAgQEAgLSAodm9pZClkaWRFbmQ6KE5TTm90 aWZpY2F0aW9uICopdW51c2VkTm90aWZpY2F0aW9uCiAtICh2b2lkKW9ic2VydmVWYWx1ZUZvcktl eVBhdGg6a2V5UGF0aCBvZk9iamVjdDooaWQpb2JqZWN0IGNoYW5nZTooTlNEaWN0aW9uYXJ5ICop Y2hhbmdlIGNvbnRleHQ6KE1lZGlhUGxheWVyQVZGb3VuZGF0aW9uT2JzZXJ2YXRpb25Db250ZXh0 KWNvbnRleHQKIHsKICAgICBlbnN1cmVPbk1haW5UaHJlYWQoW3NlbGYsIHN0cm9uZ1NlbGYgPSBy ZXRhaW5QdHIoc2VsZiksIGtleVBhdGggPSByZXRhaW5QdHIoa2V5UGF0aCksIGNoYW5nZSA9IHJl dGFpblB0cihjaGFuZ2UpLCBvYmplY3QgPSByZXRhaW5QdHIob2JqZWN0KSwgY29udGV4dF0oKSBt dXRhYmxlIHsKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbcGxheWVyID0gbV9wbGF5ZXIsIGtl eVBhdGggPSBXVEZNb3ZlKGtleVBhdGgpLCBjaGFuZ2UgPSBXVEZNb3ZlKGNoYW5nZSksIG9iamVj dCA9IFdURk1vdmUob2JqZWN0KSwgY29udGV4dF0geworICAgICAgICBpZiAoIW1fcGxheWVyKQor ICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIG1fcGxheWVyLT5xdWV1ZVRhc2tPbkV2ZW50 TG9vcChbcGxheWVyID0gbV9wbGF5ZXIsIGtleVBhdGggPSBXVEZNb3ZlKGtleVBhdGgpLCBjaGFu Z2UgPSBXVEZNb3ZlKGNoYW5nZSksIG9iamVjdCA9IFdURk1vdmUob2JqZWN0KSwgY29udGV4dF0g ewogICAgICAgICAgICAgaWYgKCFwbGF5ZXIpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCkBA IC0zNjk4LDcgKzM3MDcsMTAgQEAgLSAodm9pZClsZWdpYmxlT3V0cHV0OihpZClvdXRwdXQgZGlk T3V0cHV0QXR0cmlidXRlZFN0cmluZ3M6KE5TQXJyYXkgKilzdHJpbmdzIG4KICAgICBVTlVTRURf UEFSQU0ob3V0cHV0KTsKIAogICAgIGVuc3VyZU9uTWFpblRocmVhZChbc2VsZiwgc3Ryb25nU2Vs ZiA9IHJldGFpblB0cihzZWxmKSwgc3RyaW5ncyA9IHJldGFpblB0cihzdHJpbmdzKSwgbmF0aXZl U2FtcGxlcyA9IHJldGFpblB0cihuYXRpdmVTYW1wbGVzKSwgaXRlbVRpbWVdKCkgbXV0YWJsZSB7 Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3BsYXllciA9IG1fcGxheWVyLCBzdHJpbmdzID0g V1RGTW92ZShzdHJpbmdzKSwgbmF0aXZlU2FtcGxlcyA9IFdURk1vdmUobmF0aXZlU2FtcGxlcyks IGl0ZW1UaW1lXSB7CisgICAgICAgIGlmICghbV9wbGF5ZXIpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgbV9wbGF5ZXItPnF1ZXVlVGFza09uRXZlbnRMb29wKFtwbGF5ZXIgPSBtX3Bs YXllciwgc3RyaW5ncyA9IFdURk1vdmUoc3RyaW5ncyksIG5hdGl2ZVNhbXBsZXMgPSBXVEZNb3Zl KG5hdGl2ZVNhbXBsZXMpLCBpdGVtVGltZV0gewogICAgICAgICAgICAgaWYgKCFwbGF5ZXIpCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0zNzE1LDcgKzM3MjcsMTAgQEAgLSAodm9pZClv dXRwdXRTZXF1ZW5jZVdhc0ZsdXNoZWQ6KGlkKW91dHB1dAogICAgIFVOVVNFRF9QQVJBTShvdXRw dXQpOwogCiAgICAgZW5zdXJlT25NYWluVGhyZWFkKFtzZWxmLCBzdHJvbmdTZWxmID0gcmV0YWlu UHRyKHNlbGYpXSB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3BsYXllciA9IG1fcGxheWVy XSB7CisgICAgICAgIGlmICghbV9wbGF5ZXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgbV9wbGF5ZXItPnF1ZXVlVGFza09uRXZlbnRMb29wKFtwbGF5ZXIgPSBtX3BsYXllcl0gewog ICAgICAgICAgICAgaWYgKHBsYXllcikKICAgICAgICAgICAgICAgICBwbGF5ZXItPmZsdXNoQ3Vl cygpOwogICAgICAgICB9KTsKQEAgLTM3MzEsNyArMzc0Niw3IEBAIC0gKHZvaWQpbWV0YWRhdGFP dXRwdXQ6KEFWUGxheWVySXRlbU1ldGFkYXRhT3V0cHV0ICopb3V0cHV0IGRpZE91dHB1dFRpbWVk TWV0YWRhCiAgICAgaWYgKCFtX3BsYXllciB8fCAhbWV0YWRhdGFHcm91cHMpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGNhbGxPbk1haW5UaHJlYWQoW3BsYXllciA9IG1fcGxheWVyLCBtZXRhZGF0 YUdyb3VwcyA9IHJldGFpblB0cihtZXRhZGF0YUdyb3VwcyksIGN1cnJlbnRUaW1lID0gbV9wbGF5 ZXItPmN1cnJlbnRNZWRpYVRpbWUoKV0geworICAgIG1fcGxheWVyLT5xdWV1ZVRhc2tPbkV2ZW50 TG9vcChbcGxheWVyID0gbV9wbGF5ZXIsIG1ldGFkYXRhR3JvdXBzID0gcmV0YWluUHRyKG1ldGFk YXRhR3JvdXBzKSwgY3VycmVudFRpbWUgPSBtX3BsYXllci0+Y3VycmVudE1lZGlhVGltZSgpXSB7 CiAgICAgICAgIGlmICghcGxheWVyKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0zNzUyLDcg KzM3NjcsNyBAQCAtICh2b2lkKW1ldGFkYXRhQ29sbGVjdG9yOihBVlBsYXllckl0ZW1NZXRhZGF0 YUNvbGxlY3RvciAqKW1ldGFkYXRhQ29sbGVjdG9yIGRpZAogICAgIGlmICghbV9wbGF5ZXIgfHwg IW1ldGFkYXRhR3JvdXBzKQogICAgICAgICByZXR1cm47CiAKLSAgICBjYWxsT25NYWluVGhyZWFk KFtwbGF5ZXIgPSBtX3BsYXllciwgbWV0YWRhdGFHcm91cHMgPSByZXRhaW5QdHIobWV0YWRhdGFH cm91cHMpLCBjdXJyZW50VGltZSA9IG1fcGxheWVyLT5jdXJyZW50TWVkaWFUaW1lKCldIHsKKyAg ICBtX3BsYXllci0+cXVldWVUYXNrT25FdmVudExvb3AoW3BsYXllciA9IG1fcGxheWVyLCBtZXRh ZGF0YUdyb3VwcyA9IHJldGFpblB0cihtZXRhZGF0YUdyb3VwcyksIGN1cnJlbnRUaW1lID0gbV9w bGF5ZXItPmN1cnJlbnRNZWRpYVRpbWUoKV0gewogICAgICAgICBpZiAoIXBsYXllcikKICAgICAg ICAgICAgIHJldHVybjsKIApAQCAtMzc3OSw3ICszNzk0LDEwIEBAIC0gKEJPT0wpcmVzb3VyY2VM b2FkZXI6KEFWQXNzZXRSZXNvdXJjZUxvYWRlciAqKXJlc291cmNlTG9hZGVyIHNob3VsZFdhaXRG b3JMb2FkCiAgICAgICAgIHJldHVybiBOTzsKIAogICAgIGVuc3VyZU9uTWFpblRocmVhZChbc2Vs Ziwgc3Ryb25nU2VsZiA9IHJldGFpblB0cihzZWxmKSwgbG9hZGluZ1JlcXVlc3QgPSByZXRhaW5Q dHIobG9hZGluZ1JlcXVlc3QpXSgpIG11dGFibGUgewotICAgICAgICBjYWxsT25NYWluVGhyZWFk KFtwbGF5ZXIgPSBtX3BsYXllciwgbG9hZGluZ1JlcXVlc3QgPSBXVEZNb3ZlKGxvYWRpbmdSZXF1 ZXN0KV0geworICAgICAgICBpZiAoIW1fcGxheWVyKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIG1fcGxheWVyLT5xdWV1ZVRhc2tPbkV2ZW50TG9vcChbcGxheWVyID0gbV9wbGF5ZXIs IGxvYWRpbmdSZXF1ZXN0ID0gV1RGTW92ZShsb2FkaW5nUmVxdWVzdCldIHsKICAgICAgICAgICAg IGlmICghcGxheWVyKSB7CiAgICAgICAgICAgICAgICAgW2xvYWRpbmdSZXF1ZXN0IGZpbmlzaExv YWRpbmdXaXRoRXJyb3I6bmlsXTsKICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC0zODA1LDcg KzM4MjMsMTAgQEAgLSAodm9pZClyZXNvdXJjZUxvYWRlcjooQVZBc3NldFJlc291cmNlTG9hZGVy ICopcmVzb3VyY2VMb2FkZXIgZGlkQ2FuY2VsTG9hZGluZ1IKIHsKICAgICBVTlVTRURfUEFSQU0o cmVzb3VyY2VMb2FkZXIpOwogICAgIGVuc3VyZU9uTWFpblRocmVhZChbc2VsZiwgc3Ryb25nU2Vs ZiA9IHJldGFpblB0cihzZWxmKSwgbG9hZGluZ1JlcXVlc3QgPSByZXRhaW5QdHIobG9hZGluZ1Jl cXVlc3QpXSgpIG11dGFibGUgewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtwbGF5ZXIgPSBt X3BsYXllciwgbG9hZGluZ1JlcXVlc3QgPSBXVEZNb3ZlKGxvYWRpbmdSZXF1ZXN0KV0geworICAg ICAgICBpZiAoIW1fcGxheWVyKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIG1fcGxh eWVyLT5xdWV1ZVRhc2tPbkV2ZW50TG9vcChbcGxheWVyID0gbV9wbGF5ZXIsIGxvYWRpbmdSZXF1 ZXN0ID0gV1RGTW92ZShsb2FkaW5nUmVxdWVzdCldIHsKIAogICAgICAgICAgICAgU2NyaXB0RGlz YWxsb3dlZFNjb3BlOjpJbk1haW5UaHJlYWQgc2NyaXB0RGlzYWxsb3dlZFNjb3BlOwogCg==