219353 2020-11-30 06:46:05 -0800 [GStreamer] SleepDisabler not destroyed when video playback stops 2021-06-28 07:14:43 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=186971 https://bugs.webkit.org/show_bug.cgi?id=219355 https://bugs.webkit.org/show_bug.cgi?id=219354 DoNotImportToRadar P2 Normal --- 1 mcatanzaro pnormand bugs-noreply calvaris cdumez cgarcia changseok eric.carlson esprehn+autocc ews-watchlist glenn gustavo gyuyoung.kim jer.noble mcatanzaro menard philipj pnormand sergio smoley vjaquez oldest_to_newest 1710587 0 mcatanzaro 2020-11-30 06:46:05 -0800 Bug #186971 fixed the media player such that it now (usually) creates a SleepDisabler when starting video playback. However, the SleepDisabler is not destroyed when the media is stopped. For example, say I stop a YouTube video and leave it open in a browser tab that I'm not currently viewing. The SleepDisabler will continue to inhibit sleep indefinitely (or would if SleepDisabler were working correctly; it is currently broken due to bug #219010.) The SleepDisabler should be destroyed when video playback stops, then recreated when playback resumes. 1772693 1 432274 pnormand 2021-06-25 08:34:03 -0700 Created attachment 432274 Patch 1772696 2 pnormand 2021-06-25 08:41:46 -0700 Eric, is this an issue on Apple ports too? The new test fails on the mac EWS. 1772702 3 eric.carlson 2021-06-25 09:05:10 -0700 (In reply to Philippe Normand from comment #2) > Eric, is this an issue on Apple ports too? The new test fails on the mac EWS. I haven't seen reports of it, so I don't believe it is a problem on the Apple ports. I'm not surprised the test fails as written though because we don't explicitly call `updateSleepDisabling` when playback ends. I assume it is called as a side effect of something that happens later on Apple ports. It would be better to make it explicit, something like this maybe: diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp index 3f21dfe8ed17..69f4bb870622 100644 --- a/Source/WebCore/html/HTMLMediaElement.cpp +++ b/Source/WebCore/html/HTMLMediaElement.cpp @@ -5809,8 +5809,10 @@ void HTMLMediaElement::dispatchEvent(Event& event) { DEBUG_LOG(LOGIDENTIFIER, event.type()); - if (m_removedBehaviorRestrictionsAfterFirstUserGesture && event.type() == eventNames().endedEvent) + if (m_removedBehaviorRestrictionsAfterFirstUserGesture && event.type() == eventNames().endedEvent) { document().userActivatedMediaFinishedPlaying(); + updateSleepDisabling(); + } HTMLElement::dispatchEvent(event); 1772705 4 pnormand 2021-06-25 09:17:14 -0700 Yes, indeed. Explicit is better! 1772868 5 432323 pnormand 2021-06-26 01:09:02 -0700 Created attachment 432323 Patch 1772873 6 432326 pnormand 2021-06-26 04:36:43 -0700 Created attachment 432326 Patch 1772927 7 ews-feeder 2021-06-27 02:32:46 -0700 Committed r279313 (239189@main): <https://commits.webkit.org/239189@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432326. 432274 2021-06-25 08:34:03 -0700 2021-06-26 01:08:57 -0700 Patch bug-219353-20210625083402.patch text/plain 4651 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGRkYjIwZTQ2ZmVlMGM3 Nzc2MWQ1Y2RjOTA2ZTA0NTNmYjUwNzM4NC4uOWVhYjkzMjEyMzk4OTk0NTlmMzdlZWM5NGIxZjM0 NWIzMzI5MTkwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTI1ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTbGVlcERpc2FibGVyIG5vdCBkZXN0cm95ZWQgd2hlbiB2aWRlbyBwbGF5YmFjayBzdG9wcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MzUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gR1N0cmVh bWVyIHBvcnRzIHRoZSBTbGVlcERpc2FibGVyIHJlbWFpbmVkIGFjdGl2ZSBhZnRlciBFT1MgYmVj YXVzZQorICAgICAgICBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVTbGVlcERpc2FibGluZygpIHdh cyBub3QgYmVpbmcgdHJpZ2dlcmVkLiBFbWl0dGluZyBhCisgICAgICAgIGNoYXJhY3RlcmlzdGlj Q2hhbmdlZCBldmVudCB0byB0aGUgTWVkaWFQbGF5ZXIgdXBvbiBFT1Mgc2VlbXMgbGlrZSBhIGdv b2QgdGhpbmcgdG8gZG8gaW4KKyAgICAgICAgZ2VuZXJhbCBhbmQgaGFzIHRoZSBnb29kIHNpZGUg ZWZmZWN0IG9mIHVwZGF0aW5nIHRoZSBTbGVlcERpc2FibGVyIGFzIHdlbGwuCisKKyAgICAgICAg VGVzdDogbWVkaWEvdmlkZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24uaHRt bAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmRpZEVuZCk6CisKIDIwMjEtMDYtMjUgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlh LmNvbT4KIAogICAgICAgICBbY3NzLWdyaWRdIENvbnNpZGVyIGNvbnRhaW5lcidzIHdyaXRpbmcg bW9kZSB0byBnZXQgZ3JpZCBpdGVtJ3MgbWFyZ2luCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGI2OTExZGZmNzk5NGFiN2QwYjM0OTA1ZjMw N2YwODczMWZiNjA4NjYuLmEyNTU5M2M5NWI0Y2I0ZDM5YmY5NTkxMDMxOGU0OWQ3MWIxOGU4Nzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBA IC0yNTI5LDYgKzI1MjksNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZGlk RW5kKCkKICNlbmRpZgogICAgIH0KICAgICB0aW1lQ2hhbmdlZCgpOworICAgIG1fcGxheWVyLT5j aGFyYWN0ZXJpc3RpY0NoYW5nZWQoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OmdldFN1cHBvcnRlZFR5cGVzKEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJbnNlbnNp dGl2ZUhhc2g+JiB0eXBlcykKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlMTM5NTQ5ZDc4MzJmOGMwY2QxN2UxZmMyMjg5NzI2 OTcyOTNjMjIxLi43NzViZmU2YmY1MGUwMjY1NGRiOTZmMzg4NDcwYWZlNjJiOTM3NjE0IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDYtMjUgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFu ZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHU3RyZWFtZXJdIFNsZWVwRGlzYWJsZXIgbm90IGRl c3Ryb3llZCB3aGVuIHZpZGVvIHBsYXliYWNrIHN0b3BzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkzNTMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWVuZGVkLWRvZXMtbm90LWhv bGQtc2xlZXAtYXNzZXJ0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEv dmlkZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24uaHRtbDogQWRkZWQuCisK IDIwMjEtMDYtMjUgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIEdTdHJlYW1lciBnYXJkZW5pbmcKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL21lZGlhL3ZpZGVvLWVuZGVkLWRvZXMtbm90LWhvbGQtc2xlZXAtYXNzZXJ0aW9uLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWVuZGVkLWRvZXMtbm90LWhvbGQt c2xlZXAtYXNzZXJ0aW9uLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42OWNlOTc5Yzk5YmZiMjRj ZDc2MTNkZTljODljY2FlNmE3ZjM2MTNmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv bWVkaWEvdmlkZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24tZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMTIgQEAKKworUlVOKHZpZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZp ZGVvIiwgImNvbnRlbnQvdGVzdCIpKQorRVZFTlQoY2FucGxheXRocm91Z2gpCitSVU4odmlkZW8u cGxheSgpKQorRVZFTlQocGxheWluZykKK0VWRU5UKHRpbWV1cGRhdGUpCitFWFBFQ1RFRCAoaW50 ZXJuYWxzLmVsZW1lbnRJc0Jsb2NraW5nRGlzcGxheVNsZWVwKHZpZGVvKSA9PSAndHJ1ZScpIE9L CitSVU4odmlkZW8uY3VycmVudFRpbWUgPSB2aWRlby5kdXJhdGlvbiAtIDAuMDUpCitFVkVOVChl bmRlZCkKK0VYUEVDVEVEIChpbnRlcm5hbHMuZWxlbWVudElzQmxvY2tpbmdEaXNwbGF5U2xlZXAo dmlkZW8pID09ICdmYWxzZScpIE9LCitFTkQgT0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9tZWRpYS92aWRlby1lbmRlZC1kb2VzLW5vdC1ob2xkLXNsZWVwLWFzc2VydGlvbi5odG1s IGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3Nl cnRpb24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kMGVkZjRhNzVjZWEwNjczZjU0ZTc1OGI2ZmE5N2FjYWZk ZWIyZmUxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZW5kZWQt ZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24uaHRtbApAQCAtMCwwICsxLDMxIEBACis8IURP Q1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+dmlkZW8tZW5k ZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb248L3RpdGxlPgorICAgICAgICA8c2NyaXB0 IHNyYz0idmlkZW8tdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSJtZWRp YS1maWxlLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgIHdpbmRvdy5h ZGRFdmVudExpc3RlbmVyKCdsb2FkJywgYXN5bmMgZXZlbnQgPT4geworICAgICAgICAgICAgIGZp bmRNZWRpYUVsZW1lbnQoKTsKKworICAgICAgICAgICAgIHJ1bigndmlkZW8uc3JjID0gZmluZE1l ZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90ZXN0IiknKTsKKyAgICAgICAgICAgICBhd2FpdCB3 YWl0Rm9yKHZpZGVvLCAnY2FucGxheXRocm91Z2gnKTsKKworICAgICAgICAgICAgIHJ1bigndmlk ZW8ucGxheSgpJyk7CisgICAgICAgICAgICAgYXdhaXQgd2FpdEZvcih2aWRlbywgJ3BsYXlpbmcn KTsKKyAgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKHZpZGVvLCAndGltZXVwZGF0ZScpOworCisg ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdpbnRlcm5hbHMuZWxlbWVudElzQmxvY2tpbmdEaXNw bGF5U2xlZXAodmlkZW8pJywgdHJ1ZSk7CisgICAgICAgICAgICAgcnVuKCd2aWRlby5jdXJyZW50 VGltZSA9IHZpZGVvLmR1cmF0aW9uIC0gMC4wNScpOworICAgICAgICAgICAgIGF3YWl0IHdhaXRG b3IodmlkZW8sICdlbmRlZCcpOworCisgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdpbnRlcm5h bHMuZWxlbWVudElzQmxvY2tpbmdEaXNwbGF5U2xlZXAodmlkZW8pJywgZmFsc2UpOworCisgICAg ICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgfSwge29uY2U6IHRydWV9KTsKKyAgICAgICAg PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8dmlkZW8gY29udHJv bHM+PC92aWRlbz4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 432323 2021-06-26 01:09:02 -0700 2021-06-26 04:36:37 -0700 Patch bug-219353-20210626010901.patch text/plain 4699 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVhOGViYTA5NGRlM2E4 OTg1OWMzZTdhMTI0MzU4MTFkZjdmYTY3Yy4uM2QwMzE3NGRjNWZkYWRlZTQ2YTZmMjI5MTI1NzUx MDQ0NzgwMDQwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI2ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTbGVlcERpc2FibGVyIG5vdCBkZXN0cm95ZWQgd2hlbiB2aWRlbyBwbGF5YmFjayBzdG9wcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MzUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gR1N0cmVh bWVyIHBvcnRzIHRoZSBTbGVlcERpc2FibGVyIHJlbWFpbmVkIGFjdGl2ZSBhZnRlciBFT1MgYmVj YXVzZQorICAgICAgICBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVTbGVlcERpc2FibGluZygpIHdh cyBub3QgYmVpbmcgdHJpZ2dlcmVkLiBBbiBleHBsaWNpdCBjbGVhbi11cCB1cG9uCisgICAgICAg IHRoZSBlbmRlZCBldmVudCBpbiB0aGUgbWVkaWEgZWxlbWVudCBpcyBiZXR0ZXIgdGhhbiBhbnkg b3RoZXIgaW1wbGljaXQgYWN0aW9uLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVvLWVuZGVk LWRvZXMtbm90LWhvbGQtc2xlZXAtYXNzZXJ0aW9uLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpk aXNwYXRjaEV2ZW50KToKKwogMjAyMS0wNi0yNSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBSZW1vdmUgcmVkdW5kYW50IHN0cnVjdCBSZXNvbHZl ZEl0ZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGM3OGEy MTQ5YzljYjg4YzQ4ZDU5N2UwMjg0MTdlMzQxNWZhMGY5ZjcuLjVmMzFjZWFiNzJiODYxYjhkN2Ri ODIwYWExZDk4YzE4NzNiYzE0ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcApAQCAtNTg2Miw4ICs1ODYyLDEyIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZGlz cGF0Y2hFdmVudChFdmVudCYgZXZlbnQpCiB7CiAgICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIs IGV2ZW50LnR5cGUoKSk7CiAKLSAgICBpZiAobV9yZW1vdmVkQmVoYXZpb3JSZXN0cmljdGlvbnNB ZnRlckZpcnN0VXNlckdlc3R1cmUgJiYgZXZlbnQudHlwZSgpID09IGV2ZW50TmFtZXMoKS5lbmRl ZEV2ZW50KQotICAgICAgICBkb2N1bWVudCgpLnVzZXJBY3RpdmF0ZWRNZWRpYUZpbmlzaGVkUGxh eWluZygpOworICAgIGlmIChldmVudC50eXBlKCkgPT0gZXZlbnROYW1lcygpLmVuZGVkRXZlbnQp IHsKKyAgICAgICAgaWYgKG1fcmVtb3ZlZEJlaGF2aW9yUmVzdHJpY3Rpb25zQWZ0ZXJGaXJzdFVz ZXJHZXN0dXJlKQorICAgICAgICAgICAgZG9jdW1lbnQoKS51c2VyQWN0aXZhdGVkTWVkaWFGaW5p c2hlZFBsYXlpbmcoKTsKKworICAgICAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOworICAgIH0K IAogICAgIEhUTUxFbGVtZW50OjpkaXNwYXRjaEV2ZW50KGV2ZW50KTsKIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRjMjdl MjZmMTA5YzRmZmM5YmFlZDQ3NDFjZGIxYzI5NWJiM2IwYjUuLjBiMmViNWVhYjU1YTMxNDMyYzRh MTY0YTM5OTg1NDYzNzhiZGFmMTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNi0yNSAg UGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dTdHJl YW1lcl0gU2xlZXBEaXNhYmxlciBub3QgZGVzdHJveWVkIHdoZW4gdmlkZW8gcGxheWJhY2sgc3Rv cHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTM1 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWVk aWEvdmlkZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24tZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS92aWRlby1lbmRlZC1kb2VzLW5vdC1ob2xkLXNsZWVw LWFzc2VydGlvbi5odG1sOiBBZGRlZC4KKwogMjAyMS0wNi0yNSAgQXJjYWR5IEdvbGRtaW50cy1P cmxvdiAgPGFnb2xkbWludHNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xJQl0gVXBkYXRlIHRl c3QgZXhwZWN0YXRpb25zIGFmdGVyIHIyNzkyMTcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21l ZGlhL3ZpZGVvLWVuZGVkLWRvZXMtbm90LWhvbGQtc2xlZXAtYXNzZXJ0aW9uLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWVuZGVkLWRvZXMtbm90LWhvbGQtc2xlZXAtYXNz ZXJ0aW9uLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42OWNlOTc5Yzk5YmZiMjRjZDc2MTNkZTlj ODljY2FlNmE3ZjM2MTNmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlk ZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24tZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsMTIgQEAKKworUlVOKHZpZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgImNv bnRlbnQvdGVzdCIpKQorRVZFTlQoY2FucGxheXRocm91Z2gpCitSVU4odmlkZW8ucGxheSgpKQor RVZFTlQocGxheWluZykKK0VWRU5UKHRpbWV1cGRhdGUpCitFWFBFQ1RFRCAoaW50ZXJuYWxzLmVs ZW1lbnRJc0Jsb2NraW5nRGlzcGxheVNsZWVwKHZpZGVvKSA9PSAndHJ1ZScpIE9LCitSVU4odmlk ZW8uY3VycmVudFRpbWUgPSB2aWRlby5kdXJhdGlvbiAtIDAuMDUpCitFVkVOVChlbmRlZCkKK0VY UEVDVEVEIChpbnRlcm5hbHMuZWxlbWVudElzQmxvY2tpbmdEaXNwbGF5U2xlZXAodmlkZW8pID09 ICdmYWxzZScpIE9LCitFTkQgT0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRp YS92aWRlby1lbmRlZC1kb2VzLW5vdC1ob2xkLXNsZWVwLWFzc2VydGlvbi5odG1sIGIvTGF5b3V0 VGVzdHMvbWVkaWEvdmlkZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5kMGVkZjRhNzVjZWEwNjczZjU0ZTc1OGI2ZmE5N2FjYWZkZWIyZmUxCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZW5kZWQtZG9lcy1ub3Qt aG9sZC1zbGVlcC1hc3NlcnRpb24uaHRtbApAQCAtMCwwICsxLDMxIEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+dmlkZW8tZW5kZWQtZG9lcy1u b3QtaG9sZC1zbGVlcC1hc3NlcnRpb248L3RpdGxlPgorICAgICAgICA8c2NyaXB0IHNyYz0idmlk ZW8tdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSJtZWRpYS1maWxlLmpz Ij48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgIHdpbmRvdy5hZGRFdmVudExp c3RlbmVyKCdsb2FkJywgYXN5bmMgZXZlbnQgPT4geworICAgICAgICAgICAgIGZpbmRNZWRpYUVs ZW1lbnQoKTsKKworICAgICAgICAgICAgIHJ1bigndmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgi dmlkZW8iLCAiY29udGVudC90ZXN0IiknKTsKKyAgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKHZp ZGVvLCAnY2FucGxheXRocm91Z2gnKTsKKworICAgICAgICAgICAgIHJ1bigndmlkZW8ucGxheSgp Jyk7CisgICAgICAgICAgICAgYXdhaXQgd2FpdEZvcih2aWRlbywgJ3BsYXlpbmcnKTsKKyAgICAg ICAgICAgICBhd2FpdCB3YWl0Rm9yKHZpZGVvLCAndGltZXVwZGF0ZScpOworCisgICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCdpbnRlcm5hbHMuZWxlbWVudElzQmxvY2tpbmdEaXNwbGF5U2xlZXAo dmlkZW8pJywgdHJ1ZSk7CisgICAgICAgICAgICAgcnVuKCd2aWRlby5jdXJyZW50VGltZSA9IHZp ZGVvLmR1cmF0aW9uIC0gMC4wNScpOworICAgICAgICAgICAgIGF3YWl0IHdhaXRGb3IodmlkZW8s ICdlbmRlZCcpOworCisgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdpbnRlcm5hbHMuZWxlbWVu dElzQmxvY2tpbmdEaXNwbGF5U2xlZXAodmlkZW8pJywgZmFsc2UpOworCisgICAgICAgICAgICAg ZW5kVGVzdCgpOworICAgICAgICAgfSwge29uY2U6IHRydWV9KTsKKyAgICAgICAgPC9zY3JpcHQ+ CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8dmlkZW8gY29udHJvbHM+PC92aWRl bz4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 432326 2021-06-26 04:36:43 -0700 2021-06-27 02:32:49 -0700 Patch bug-219353-20210626043642.patch text/plain 5084 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTVhOGViYTA5NGRlM2E4 OTg1OWMzZTdhMTI0MzU4MTFkZjdmYTY3Yy4uM2QwMzE3NGRjNWZkYWRlZTQ2YTZmMjI5MTI1NzUx MDQ0NzgwMDQwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI2ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTbGVlcERpc2FibGVyIG5vdCBkZXN0cm95ZWQgd2hlbiB2aWRlbyBwbGF5YmFjayBzdG9wcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MzUzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gR1N0cmVh bWVyIHBvcnRzIHRoZSBTbGVlcERpc2FibGVyIHJlbWFpbmVkIGFjdGl2ZSBhZnRlciBFT1MgYmVj YXVzZQorICAgICAgICBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVTbGVlcERpc2FibGluZygpIHdh cyBub3QgYmVpbmcgdHJpZ2dlcmVkLiBBbiBleHBsaWNpdCBjbGVhbi11cCB1cG9uCisgICAgICAg IHRoZSBlbmRlZCBldmVudCBpbiB0aGUgbWVkaWEgZWxlbWVudCBpcyBiZXR0ZXIgdGhhbiBhbnkg b3RoZXIgaW1wbGljaXQgYWN0aW9uLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVvLWVuZGVk LWRvZXMtbm90LWhvbGQtc2xlZXAtYXNzZXJ0aW9uLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpk aXNwYXRjaEV2ZW50KToKKwogMjAyMS0wNi0yNSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBSZW1vdmUgcmVkdW5kYW50IHN0cnVjdCBSZXNvbHZl ZEl0ZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGM3OGEy MTQ5YzljYjg4YzQ4ZDU5N2UwMjg0MTdlMzQxNWZhMGY5ZjcuLjAwMzUyNmZjMzE5YTlkMWI2YjA3 ZDY4YjJiNDYyYWNhODU0N2ZjZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcApAQCAtNTg2Miw4ICs1ODYyLDEyIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZGlz cGF0Y2hFdmVudChFdmVudCYgZXZlbnQpCiB7CiAgICAgREVCVUdfTE9HKExPR0lERU5USUZJRVIs IGV2ZW50LnR5cGUoKSk7CiAKLSAgICBpZiAobV9yZW1vdmVkQmVoYXZpb3JSZXN0cmljdGlvbnNB ZnRlckZpcnN0VXNlckdlc3R1cmUgJiYgZXZlbnQudHlwZSgpID09IGV2ZW50TmFtZXMoKS5lbmRl ZEV2ZW50KQotICAgICAgICBkb2N1bWVudCgpLnVzZXJBY3RpdmF0ZWRNZWRpYUZpbmlzaGVkUGxh eWluZygpOworICAgIGlmIChldmVudC50eXBlKCkgPT0gZXZlbnROYW1lcygpLmVuZGVkRXZlbnQp IHsKKyAgICAgICAgaWYgKG1fcmVtb3ZlZEJlaGF2aW9yUmVzdHJpY3Rpb25zQWZ0ZXJGaXJzdFVz ZXJHZXN0dXJlKQorICAgICAgICAgICAgZG9jdW1lbnQoKS51c2VyQWN0aXZhdGVkTWVkaWFGaW5p c2hlZFBsYXlpbmcoKTsKKworICAgICAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOworICAgIH0K IAogICAgIEhUTUxFbGVtZW50OjpkaXNwYXRjaEV2ZW50KGV2ZW50KTsKIApAQCAtNjg0Myw3ICs2 ODQ3LDcgQEAgSFRNTE1lZGlhRWxlbWVudDo6U2xlZXBUeXBlIEhUTUxNZWRpYUVsZW1lbnQ6OnNo b3VsZERpc2FibGVTbGVlcCgpIGNvbnN0CiAjaWYgIVBMQVRGT1JNKENPQ09BKSAmJiAhUExBVEZP Uk0oR1RLKSAmJiAhUExBVEZPUk0oV1BFKQogICAgIHJldHVybiBTbGVlcFR5cGU6Ok5vbmU7CiAj ZW5kaWYKLSAgICBpZiAoIW1fcGxheWVyIHx8IG1fcGxheWVyLT5wYXVzZWQoKSB8fCBsb29wKCkp CisgICAgaWYgKG1fc2VudEVuZEV2ZW50IHx8ICFtX3BsYXllciB8fCBtX3BsYXllci0+cGF1c2Vk KCkgfHwgbG9vcCgpKQogICAgICAgICByZXR1cm4gU2xlZXBUeXBlOjpOb25lOwogCiAjaWYgRU5B QkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkYzI3ZTI2ZjEwOWM0ZmZjOWJh ZWQ0NzQxY2RiMWMyOTViYjNiMGI1Li4wYjJlYjVlYWI1NWEzMTQzMmM0YTE2NGEzOTk4NTQ2Mzc4 YmRhZjEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDYtMjUgIFBoaWxpcHBlIE5vcm1h bmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHU3RyZWFtZXJdIFNsZWVwRGlz YWJsZXIgbm90IGRlc3Ryb3llZCB3aGVuIHZpZGVvIHBsYXliYWNrIHN0b3BzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkzNTMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWVuZGVk LWRvZXMtbm90LWhvbGQtc2xlZXAtYXNzZXJ0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogbWVkaWEvdmlkZW8tZW5kZWQtZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24uaHRt bDogQWRkZWQuCisKIDIwMjEtMDYtMjUgIEFyY2FkeSBHb2xkbWludHMtT3Jsb3YgIDxhZ29sZG1p bnRzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dMSUJdIFVwZGF0ZSB0ZXN0IGV4cGVjdGF0aW9u cyBhZnRlciByMjc5MjE3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1lbmRl ZC1kb2VzLW5vdC1ob2xkLXNsZWVwLWFzc2VydGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9tZWRpYS92aWRlby1lbmRlZC1kb2VzLW5vdC1ob2xkLXNsZWVwLWFzc2VydGlvbi1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uNjljZTk3OWM5OWJmYjI0Y2Q3NjEzZGU5Yzg5Y2NhZTZhN2YzNjEz ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWVuZGVkLWRvZXMt bm90LWhvbGQtc2xlZXAtYXNzZXJ0aW9uLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEyIEBACisK K1JVTih2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJjb250ZW50L3Rlc3QiKSkK K0VWRU5UKGNhbnBsYXl0aHJvdWdoKQorUlVOKHZpZGVvLnBsYXkoKSkKK0VWRU5UKHBsYXlpbmcp CitFVkVOVCh0aW1ldXBkYXRlKQorRVhQRUNURUQgKGludGVybmFscy5lbGVtZW50SXNCbG9ja2lu Z0Rpc3BsYXlTbGVlcCh2aWRlbykgPT0gJ3RydWUnKSBPSworUlVOKHZpZGVvLmN1cnJlbnRUaW1l ID0gdmlkZW8uZHVyYXRpb24gLSAwLjA1KQorRVZFTlQoZW5kZWQpCitFWFBFQ1RFRCAoaW50ZXJu YWxzLmVsZW1lbnRJc0Jsb2NraW5nRGlzcGxheVNsZWVwKHZpZGVvKSA9PSAnZmFsc2UnKSBPSwor RU5EIE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tZW5kZWQt ZG9lcy1ub3QtaG9sZC1zbGVlcC1hc3NlcnRpb24uaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3Zp ZGVvLWVuZGVkLWRvZXMtbm90LWhvbGQtc2xlZXAtYXNzZXJ0aW9uLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u ZDBlZGY0YTc1Y2VhMDY3M2Y1NGU3NThiNmZhOTdhY2FmZGViMmZlMQotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWVuZGVkLWRvZXMtbm90LWhvbGQtc2xlZXAtYXNz ZXJ0aW9uLmh0bWwKQEAgLTAsMCArMSwzMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAg ICA8aGVhZD4KKyAgICAgICAgPHRpdGxlPnZpZGVvLWVuZGVkLWRvZXMtbm90LWhvbGQtc2xlZXAt YXNzZXJ0aW9uPC90aXRsZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9InZpZGVvLXRlc3QuanMiPjwv c2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0ibWVkaWEtZmlsZS5qcyI+PC9zY3JpcHQ+Cisg ICAgICAgIDxzY3JpcHQ+CisgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcs IGFzeW5jIGV2ZW50ID0+IHsKKyAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisKKyAg ICAgICAgICAgICBydW4oJ3ZpZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgImNvbnRl bnQvdGVzdCIpJyk7CisgICAgICAgICAgICAgYXdhaXQgd2FpdEZvcih2aWRlbywgJ2NhbnBsYXl0 aHJvdWdoJyk7CisKKyAgICAgICAgICAgICBydW4oJ3ZpZGVvLnBsYXkoKScpOworICAgICAgICAg ICAgIGF3YWl0IHdhaXRGb3IodmlkZW8sICdwbGF5aW5nJyk7CisgICAgICAgICAgICAgYXdhaXQg d2FpdEZvcih2aWRlbywgJ3RpbWV1cGRhdGUnKTsKKworICAgICAgICAgICAgIHRlc3RFeHBlY3Rl ZCgnaW50ZXJuYWxzLmVsZW1lbnRJc0Jsb2NraW5nRGlzcGxheVNsZWVwKHZpZGVvKScsIHRydWUp OworICAgICAgICAgICAgIHJ1bigndmlkZW8uY3VycmVudFRpbWUgPSB2aWRlby5kdXJhdGlvbiAt IDAuMDUnKTsKKyAgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKHZpZGVvLCAnZW5kZWQnKTsKKwor ICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgnaW50ZXJuYWxzLmVsZW1lbnRJc0Jsb2NraW5nRGlz cGxheVNsZWVwKHZpZGVvKScsIGZhbHNlKTsKKworICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAg ICAgICAgIH0sIHtvbmNlOiB0cnVlfSk7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4K KyAgICA8Ym9keT4KKyAgICAgICAgPHZpZGVvIGNvbnRyb2xzPjwvdmlkZW8+CisgICAgPC9ib2R5 PgorPC9odG1sPgo=