180197 2017-11-30 07:20:34 -0800 [GStreamer] Ensure SleepDisabler is not held by pages in page cache 2018-01-22 07:20:06 -0800 1 1 1 Unclassified WebKit Media Other PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=178485 InRadar P2 Normal --- 181432 181471 1 mcatanzaro pnormand bugs-noreply cgarcia eric.carlson mcatanzaro pnormand webkit-bug-importer youennf oldest_to_newest 1376313 0 mcatanzaro 2017-11-30 07:20:34 -0800 After implementing PAL::SleepDisabler for GTK in bug #178485, I decided to try removing the early return at the top of HTMLMediaElement::shouldDisableSleep for non-Cocoa ports, hoping that HTMLMediaElement would create a SleepDisabler during video playback and destroy it at the end of video playback, to keep the display from turning off when a video is playing. I tested it on youtube.com and noticed the following unexpected behavior: (1) When playing a video on YouTube, no SleepDisabler is initially created during normal video playback, so the display will turn off undesirably. (2) But a SleepDisabler *is* created when pressing the browser's Back button during video playback. (3) The SleepDisabler is then only destroyed when (a) closing the browser tab that had been displaying YouTube, or (b) when pressing Forward to bring back the original YouTube page. So I think monitor sleep is disabled when the YouTube page is in the page cache, and not reenabled until the page exits the page cache. That's not good! I wonder if this is a GTK-specific problem, or if it's also broken on macOS and iOS. 1381001 1 youennf 2017-12-12 18:20:20 -0800 > So I think monitor sleep is disabled when the YouTube page is in the page > cache, and not reenabled until the page exits the page cache. That's not > good! I wonder if this is a GTK-specific problem, or if it's also broken on > macOS and iOS. This works as expected in macOS and iOS for YouTube so there might be something specific to GTK. Maybe some debugging would help here to know why there is no SleepDisabler in the first place when clicking play/pause... 1387174 2 pnormand 2018-01-09 02:50:44 -0800 Michael can you upload your patch? Did you implement MediaPlayerPrivate::setShouldDisableSleep() too? 1387188 3 pnormand 2018-01-09 03:31:41 -0800 The problem seems to be with that line for the GStreamer ports: bool shouldBeAbleToSleep = !hasVideo() || !hasAudio(); the value is true, so that's why no sleep disabler is created. This is likely an issue with the GStreamer backend. I suspect the pipeline is not fully built when this code is called. 1387199 4 330811 pnormand 2018-01-09 04:47:05 -0800 Created attachment 330811 Patch 1387202 5 330811 cgarcia 2018-01-09 04:58:06 -0800 Comment on attachment 330811 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=330811&action=review > Source/WebCore/ChangeLog:13 > + The sleep disabler is now checked again whenever the media player > + playback state or other charasteristic has changed in the media > + engine. On GStreamer backend side we now properly emit playback > + state changes and characteristic updates to the client when the > + pipeline state changes and when audio/video tracks changes are > + detected. The GST part is related but independent, right? I would split the patch. 1387204 6 330812 pnormand 2018-01-09 05:09:40 -0800 Created attachment 330812 Patch 1387222 7 pnormand 2018-01-09 05:57:41 -0800 Hi Eric, can you please review this patch? 1387237 8 pnormand 2018-01-09 06:44:31 -0800 Committed r226630: <https://trac.webkit.org/changeset/226630> 1387238 9 webkit-bug-importer 2018-01-09 06:46:20 -0800 <rdar://problem/36374983> 1387260 10 mcatanzaro 2018-01-09 08:04:30 -0800 Note this change does more than indicated by the commit message: media playback now (hopefully) causes sleep to be disabled for the first time. That is great! Thanks! 1391627 11 mcatanzaro 2018-01-22 07:20:06 -0800 This has uncovered a bug in GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=705942#c12 WebKit is now doing the right thing, so I don't suggest we change anything. 330811 2018-01-09 04:47:05 -0800 2018-01-09 05:09:36 -0800 Patch bug-180197-20180109124704.patch text/plain 11731 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWMzMTQ5NzgzNTAxMDhl ZTg2OWFkZTc2YjcwMDM0YWYyNDgzY2I2NS4uOThhMzZjYmM1MThmOGMwZjJjZWU3ZThmY2U2NjE1 ZGNiZmY5NDc0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE4LTAxLTA5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBFbnN1cmUgU2xlZXBEaXNhYmxlciBpcyBub3QgaGVsZCBieSBwYWdlcyBpbiBwYWdlIGNhY2hl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAxOTcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgc2xl ZXAgZGlzYWJsZXIgaXMgbm93IGNoZWNrZWQgYWdhaW4gd2hlbmV2ZXIgdGhlIG1lZGlhIHBsYXll cgorICAgICAgICBwbGF5YmFjayBzdGF0ZSBvciBvdGhlciBjaGFyYXN0ZXJpc3RpYyBoYXMgY2hh bmdlZCBpbiB0aGUgbWVkaWEKKyAgICAgICAgZW5naW5lLiBPbiBHU3RyZWFtZXIgYmFja2VuZCBz aWRlIHdlIG5vdyBwcm9wZXJseSBlbWl0IHBsYXliYWNrCisgICAgICAgIHN0YXRlIGNoYW5nZXMg YW5kIGNoYXJhY3RlcmlzdGljIHVwZGF0ZXMgdG8gdGhlIGNsaWVudCB3aGVuIHRoZQorICAgICAg ICBwaXBlbGluZSBzdGF0ZSBjaGFuZ2VzIGFuZCB3aGVuIGF1ZGlvL3ZpZGVvIHRyYWNrcyBjaGFu Z2VzIGFyZQorICAgICAgICBkZXRlY3RlZC4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXll clBsYXliYWNrU3RhdGVDaGFuZ2VkKToKKyAgICAgICAgQ2hlY2sgaWYgdGhlIHNsZWVwIGRpc2Fi bGVyIHN0YXRlIG5lZWRzIHRvIGJlIHVwZGF0ZWQgb3Igbm90LgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJDaGFyYWN0ZXJpc3RpY0NoYW5nZWQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNob3VsZERpc2FibGVTbGVl cCBjb25zdCk6IEVuYWJsZQorICAgICAgICBzbGVlcCBkaXNhYmxlciBmb3IgR1RLIGFuZCBXUEUg cG9ydHMuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnBsYXliYWNrUG9zaXRpb24gY29uc3QpOiBUaGlzIGRlYnVnIG1lc3NhZ2Ug YXBwZWFycyB0b28gb2Z0ZW4gaW4gbG9ncy4gRGVtb3RlLgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpkdXJhdGlvbk1lZGlhVGltZSBjb25zdCk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQ bGF5ZXJPZlZpZGVvKTogRW1pdCBjaGFyYXN0ZXJpc3RpY0NoYW5nZWQgbm90aWZpY2F0aW9uLgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5 ZXJPZkF1ZGlvKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnVwZGF0ZVN0YXRlcyk6IEtlZXAgdHJhY2sgb2Ygb2xkIGFuZCBjdXJyZW50IHBp cGVsaW5lIHN0YXRlLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoKKwogMjAxOC0wMS0wOSAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjI0NDYw KTogVGV4dCBmaWVsZHMgc29tZXRpbWVzIGdldCAibWVzc2VkIHVwIgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggMWFhMDQ1OTk4YjRjNGJkN2U3MzM3ZmVlNjc0 NjlmZTM5MWYwMjczMi4uMjM3YjQxYjZmZjhiZGIwZjViYWRhYjM5ZGMyMmUyZTAyYzk5Yzg0OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC00ODQ4LDYgKzQ4 NDgsOSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyUGxheWJhY2tTdGF0ZUNo YW5nZWQoTWVkaWFQbGF5ZXIqKQogICAgICAgICBwYXVzZUludGVybmFsKCk7CiAgICAgZWxzZQog ICAgICAgICBwbGF5SW50ZXJuYWwoKTsKKworICAgIHVwZGF0ZVNsZWVwRGlzYWJsaW5nKCk7CisK ICAgICBlbmRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjaygpOwogfQogCkBAIC01MDIyLDYg KzUwMjUsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ2hhcmFjdGVyaXN0 aWNDaGFuZ2VkKE1lZGlhUGxheWVyKikKIAogICAgIG1fbWVkaWFTZXNzaW9uLT5jYW5Qcm9kdWNl QXVkaW9DaGFuZ2VkKCk7CiAKKyAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOworCiAgICAgZW5k UHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKIH0KIApAQCAtNjYzNiw4ICs2NjQxLDcg QEAgc3RhdGljIGlubGluZSBib29sIGlzUmVtb3RlTWVkaWFTdHJlYW1WaWRlb1RyYWNrKFJlZlB0 cjxNZWRpYVN0cmVhbVRyYWNrPiYgaXRlbSkKIAogSFRNTE1lZGlhRWxlbWVudDo6U2xlZXBUeXBl IEhUTUxNZWRpYUVsZW1lbnQ6OnNob3VsZERpc2FibGVTbGVlcCgpIGNvbnN0CiB7Ci0gICAgLy8g U2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAxOTcgYmVmb3Jl IHJlbW92aW5nIHRoaXMgZ3VhcmQuCi0jaWYgIVBMQVRGT1JNKENPQ09BKQorI2lmICFQTEFURk9S TShDT0NPQSkgJiYgIVBMQVRGT1JNKEdUSykgJiYgIVBMQVRGT1JNKFdQRSkKICAgICByZXR1cm4g U2xlZXBUeXBlOjpOb25lOwogI2VuZGlmCiAgICAgaWYgKCFtX3BsYXllciB8fCBtX3BsYXllci0+ cGF1c2VkKCkgfHwgbG9vcCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcAppbmRleCBjOWFjMTg3ZjJjZjQzMTZmY2E5ZjdlN2E5MThiYzE3ZGZlNzFj NTZiLi5jMWZmZmFjNWQ4MmFiYmU0MmZhOWVmODgxMDczYjhlMzA5YTg2NTcyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMzE3LDcgKzMx Nyw3IEBAIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBsYXliYWNrUG9z aXRpb24oKSBjb25zdAogICAgICAgICBnc3RfcXVlcnlfcGFyc2VfcG9zaXRpb24ocXVlcnksIDAs ICZwb3NpdGlvbik7CiAgICAgZ3N0X3F1ZXJ5X3VucmVmKHF1ZXJ5KTsKIAotICAgIEdTVF9ERUJV RygiUG9zaXRpb24gJSIgR1NUX1RJTUVfRk9STUFULCBHU1RfVElNRV9BUkdTKHBvc2l0aW9uKSk7 CisgICAgR1NUX0xPRygiUG9zaXRpb24gJSIgR1NUX1RJTUVfRk9STUFULCBHU1RfVElNRV9BUkdT KHBvc2l0aW9uKSk7CiAKICAgICBNZWRpYVRpbWUgcGxheWJhY2tQb3NpdGlvbiA9IE1lZGlhVGlt ZTo6emVyb1RpbWUoKTsKICAgICBHc3RDbG9ja1RpbWUgZ3N0cmVhbWVyUG9zaXRpb24gPSBzdGF0 aWNfY2FzdDxHc3RDbG9ja1RpbWU+KHBvc2l0aW9uKTsKQEAgLTQzMiw3ICs0MzIsNyBAQCBNZWRp YVRpbWUgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpkdXJhdGlvbk1lZGlhVGltZSgpIGNv bnN0CiAgICAgICAgIHJldHVybiBNZWRpYVRpbWU6OnBvc2l0aXZlSW5maW5pdGVUaW1lKCk7CiAg ICAgfQogCi0gICAgR1NUX0RFQlVHKCJEdXJhdGlvbjogJSIgR1NUX1RJTUVfRk9STUFULCBHU1Rf VElNRV9BUkdTKHRpbWVMZW5ndGgpKTsKKyAgICBHU1RfTE9HKCJEdXJhdGlvbjogJSIgR1NUX1RJ TUVfRk9STUFULCBHU1RfVElNRV9BUkdTKHRpbWVMZW5ndGgpKTsKIAogICAgIHJldHVybiBNZWRp YVRpbWUodGltZUxlbmd0aCwgR1NUX1NFQ09ORCk7CiAgICAgLy8gRklYTUU6IGhhbmRsZSAzLjE0 LjkuNSBwcm9wZXJseQpAQCAtNjA5LDcgKzYwOSwxMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZWaWRlbygpCiAgICAgR3N0RWxlbWVudCogZWxlbWVu dCA9IHVzZU1lZGlhU291cmNlID8gbV9zb3VyY2UuZ2V0KCkgOiBtX3BpcGVsaW5lLmdldCgpOwog ICAgIGdfb2JqZWN0X2dldChlbGVtZW50LCAibi12aWRlbyIsICZudW1UcmFja3MsIG51bGxwdHIp OwogCisgICAgYm9vbCBvbGRIYXNWaWRlbyA9IG1faGFzVmlkZW87CiAgICAgbV9oYXNWaWRlbyA9 IG51bVRyYWNrcyA+IDA7CisgICAgaWYgKG9sZEhhc1ZpZGVvICE9IG1faGFzVmlkZW8pCisgICAg ICAgIG1fcGxheWVyLT5jaGFyYWN0ZXJpc3RpY0NoYW5nZWQoKTsKKwogICAgIGlmIChtX2hhc1Zp ZGVvKQogICAgICAgICBtX3BsYXllci0+c2l6ZUNoYW5nZWQoKTsKIApAQCAtNjc0LDcgKzY3OCwx MCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZBdWRp bygpCiAgICAgR3N0RWxlbWVudCogZWxlbWVudCA9IHVzZU1lZGlhU291cmNlID8gbV9zb3VyY2Uu Z2V0KCkgOiBtX3BpcGVsaW5lLmdldCgpOwogICAgIGdfb2JqZWN0X2dldChlbGVtZW50LCAibi1h dWRpbyIsICZudW1UcmFja3MsIG51bGxwdHIpOwogCisgICAgYm9vbCBvbGRIYXNBdWRpbyA9IG1f aGFzQXVkaW87CiAgICAgbV9oYXNBdWRpbyA9IG51bVRyYWNrcyA+IDA7CisgICAgaWYgKG9sZEhh c0F1ZGlvICE9IG1faGFzQXVkaW8pCisgICAgICAgIG1fcGxheWVyLT5jaGFyYWN0ZXJpc3RpY0No YW5nZWQoKTsKIAogICAgIGlmICh1c2VNZWRpYVNvdXJjZSkgewogICAgICAgICBHU1RfREVCVUco IlRyYWNrcyBtYW5hZ2VkIGJ5IHNvdXJjZSBlbGVtZW50LiBCYWlsaW5nIG91dCBub3cuIik7CkBA IC0xNDkyLDI3ICsxNDk5LDI3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1 cGRhdGVTdGF0ZXMoKQogCiAgICAgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBvbGROZXR3b3Jr U3RhdGUgPSBtX25ldHdvcmtTdGF0ZTsKICAgICBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSBvbGRS ZWFkeVN0YXRlID0gbV9yZWFkeVN0YXRlOwotICAgIEdzdFN0YXRlIHN0YXRlOwogICAgIEdzdFN0 YXRlIHBlbmRpbmc7CiAKLSAgICBHc3RTdGF0ZUNoYW5nZVJldHVybiBnZXRTdGF0ZVJlc3VsdCA9 IGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BpcGVsaW5lLmdldCgpLCAmc3RhdGUsICZwZW5kaW5n LCAyNTAgKiBHU1RfTlNFQ09ORCk7CisgICAgbV9vbGRTdGF0ZSA9IG1fY3VycmVudFN0YXRlOwor ICAgIEdzdFN0YXRlQ2hhbmdlUmV0dXJuIGdldFN0YXRlUmVzdWx0ID0gZ3N0X2VsZW1lbnRfZ2V0 X3N0YXRlKG1fcGlwZWxpbmUuZ2V0KCksICZtX2N1cnJlbnRTdGF0ZSwgJnBlbmRpbmcsIDI1MCAq IEdTVF9OU0VDT05EKTsKIAogICAgIGJvb2wgc2hvdWxkVXBkYXRlUGxheWJhY2tTdGF0ZSA9IGZh bHNlOwogICAgIHN3aXRjaCAoZ2V0U3RhdGVSZXN1bHQpIHsKICAgICBjYXNlIEdTVF9TVEFURV9D SEFOR0VfU1VDQ0VTUzogewotICAgICAgICBHU1RfREVCVUcoIlN0YXRlOiAlcywgcGVuZGluZzog JXMiLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShzdGF0ZSksIGdzdF9lbGVtZW50X3N0YXRl X2dldF9uYW1lKHBlbmRpbmcpKTsKKyAgICAgICAgR1NUX0RFQlVHKCJTdGF0ZTogJXMsIHBlbmRp bmc6ICVzIiwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUobV9jdXJyZW50U3RhdGUpLCBnc3Rf ZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShwZW5kaW5nKSk7CiAKICAgICAgICAgLy8gRG8gbm90aGlu ZyBpZiBvbiBFT1MgYW5kIHN0YXRlIGNoYW5nZWQgdG8gUkVBRFkgdG8gYXZvaWQgcmVjcmVhdGlu ZyB0aGUgcGxheWVyCiAgICAgICAgIC8vIG9uIEhUTUxNZWRpYUVsZW1lbnQgYW5kIHByb3Blcmx5 IGdlbmVyYXRlIHRoZSB2aWRlbyAnZW5kZWQnIGV2ZW50LgotICAgICAgICBpZiAobV9pc0VuZFJl YWNoZWQgJiYgc3RhdGUgPT0gR1NUX1NUQVRFX1JFQURZKQorICAgICAgICBpZiAobV9pc0VuZFJl YWNoZWQgJiYgbV9jdXJyZW50U3RhdGUgPT0gR1NUX1NUQVRFX1JFQURZKQogICAgICAgICAgICAg YnJlYWs7CiAKLSAgICAgICAgbV9yZXNldFBpcGVsaW5lID0gc3RhdGUgPD0gR1NUX1NUQVRFX1JF QURZOworICAgICAgICBtX3Jlc2V0UGlwZWxpbmUgPSBtX2N1cnJlbnRTdGF0ZSA8PSBHU1RfU1RB VEVfUkVBRFk7CiAKICAgICAgICAgYm9vbCBkaWRCdWZmZXJpbmcgPSBtX2J1ZmZlcmluZzsKIAog ICAgICAgICAvLyBVcGRhdGUgcmVhZHkgYW5kIG5ldHdvcmsgc3RhdGVzLgotICAgICAgICBzd2l0 Y2ggKHN0YXRlKSB7CisgICAgICAgIHN3aXRjaCAobV9jdXJyZW50U3RhdGUpIHsKICAgICAgICAg Y2FzZSBHU1RfU1RBVEVfTlVMTDoKICAgICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxh eWVyOjpIYXZlTm90aGluZzsKICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gTWVkaWFQbGF5 ZXI6OkVtcHR5OwpAQCAtMTU0OCw3ICsxNTU1LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAgICAgICAgIH0KIAogICAgICAgICAvLyBTeW5jIHN0 YXRlcyB3aGVyZSBuZWVkZWQuCi0gICAgICAgIGlmIChzdGF0ZSA9PSBHU1RfU1RBVEVfUEFVU0VE KSB7CisgICAgICAgIGlmIChtX2N1cnJlbnRTdGF0ZSA9PSBHU1RfU1RBVEVfUEFVU0VEKSB7CiAg ICAgICAgICAgICBpZiAoIW1fdm9sdW1lQW5kTXV0ZUluaXRpYWxpemVkKSB7CiAgICAgICAgICAg ICAgICAgbm90aWZ5UGxheWVyT2ZWb2x1bWVDaGFuZ2UoKTsKICAgICAgICAgICAgICAgICBub3Rp ZnlQbGF5ZXJPZk11dGUoKTsKQEAgLTE1NTksNyArMTU2Niw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICAgICAgICAgIEdTVF9ERUJV RygiW0J1ZmZlcmluZ10gUmVzdGFydGluZyBwbGF5YmFjay4iKTsKICAgICAgICAgICAgICAgICBj aGFuZ2VQaXBlbGluZVN0YXRlKEdTVF9TVEFURV9QTEFZSU5HKTsKICAgICAgICAgICAgIH0KLSAg ICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PSBHU1RfU1RBVEVfUExBWUlORykgeworICAgICAgICB9 IGVsc2UgaWYgKG1fY3VycmVudFN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKSB7CiAgICAgICAg ICAgICBtX3BhdXNlZCA9IGZhbHNlOwogCiAgICAgICAgICAgICBpZiAoKG1fYnVmZmVyaW5nICYm ICFpc0xpdmVTdHJlYW0oKSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7CkBAIC0xNTY5LDM0ICsxNTc2 LDQwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQog ICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG1fcGF1c2VkID0gdHJ1ZTsKIAotICAgICAgICBp ZiAobV9yZXF1ZXN0ZWRTdGF0ZSA9PSBHU1RfU1RBVEVfUEFVU0VEICYmIHN0YXRlID09IEdTVF9T VEFURV9QQVVTRUQpIHsKKyAgICAgICAgR1NUX0RFQlVHKCJPbGQgc3RhdGU6ICVzLCBuZXcgc3Rh dGU6ICVzIChyZXF1ZXN0ZWQ6ICVzKSIsIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKG1fb2xk U3RhdGUpLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShtX2N1cnJlbnRTdGF0ZSksIGdzdF9l bGVtZW50X3N0YXRlX2dldF9uYW1lKG1fcmVxdWVzdGVkU3RhdGUpKTsKKyAgICAgICAgaWYgKG1f cmVxdWVzdGVkU3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRCAmJiBtX2N1cnJlbnRTdGF0ZSA9PSBH U1RfU1RBVEVfUEFVU0VEKSB7CisgICAgICAgICAgICBzaG91bGRVcGRhdGVQbGF5YmFja1N0YXRl ID0gdHJ1ZTsKKyAgICAgICAgICAgIEdTVF9JTkZPKCJSZXF1ZXN0ZWQgc3RhdGUgY2hhbmdlIHRv ICVzIHdhcyBjb21wbGV0ZWQiLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShtX2N1cnJlbnRT dGF0ZSkpOworICAgICAgICB9CisgICAgICAgIGlmICgobV9vbGRTdGF0ZSAhPSBtX2N1cnJlbnRT dGF0ZSkgJiYgKChtX29sZFN0YXRlID4gR1NUX1NUQVRFX1JFQURZICYmIG1fY3VycmVudFN0YXRl ID4gR1NUX1NUQVRFX1JFQURZKQorICAgICAgICAgICAgfHwgKG1fY3VycmVudFN0YXRlIDwgR1NU X1NUQVRFX1BMQVlJTkcgJiYgbV9vbGRTdGF0ZSA+IEdTVF9TVEFURV9SRUFEWSkpKSB7CisgICAg ICAgICAgICBHU1RfSU5GTygiUGxheWJhY2sgc3RhdGUgY2hhbmdlZCBmcm9tICVzIHRvICVzLiBO b3RpZnlpbmcgdGhlIG1lZGlhIHBsYXllciBjbGllbnQiLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRf bmFtZShtX29sZFN0YXRlKSwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUobV9jdXJyZW50U3Rh dGUpKTsKICAgICAgICAgICAgIHNob3VsZFVwZGF0ZVBsYXliYWNrU3RhdGUgPSB0cnVlOwotICAg ICAgICAgICAgR1NUX0RFQlVHKCJSZXF1ZXN0ZWQgc3RhdGUgY2hhbmdlIHRvICVzIHdhcyBjb21w bGV0ZWQiLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShzdGF0ZSkpOwogICAgICAgICB9CiAK ICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgR1NUX1NUQVRFX0NIQU5HRV9BU1lOQzoK LSAgICAgICAgR1NUX0RFQlVHKCJBc3luYzogU3RhdGU6ICVzLCBwZW5kaW5nOiAlcyIsIGdzdF9l bGVtZW50X3N0YXRlX2dldF9uYW1lKHN0YXRlKSwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUo cGVuZGluZykpOworICAgICAgICBHU1RfREVCVUcoIkFzeW5jOiBTdGF0ZTogJXMsIHBlbmRpbmc6 ICVzIiwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUobV9jdXJyZW50U3RhdGUpLCBnc3RfZWxl bWVudF9zdGF0ZV9nZXRfbmFtZShwZW5kaW5nKSk7CiAgICAgICAgIC8vIENoYW5nZSBpbiBwcm9n cmVzcy4KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX0ZBSUxVUkU6 Ci0gICAgICAgIEdTVF9ERUJVRygiRmFpbHVyZTogU3RhdGU6ICVzLCBwZW5kaW5nOiAlcyIsIGdz dF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKHN0YXRlKSwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25h bWUocGVuZGluZykpOworICAgICAgICBHU1RfREVCVUcoIkZhaWx1cmU6IFN0YXRlOiAlcywgcGVu ZGluZzogJXMiLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShtX2N1cnJlbnRTdGF0ZSksIGdz dF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKHBlbmRpbmcpKTsKICAgICAgICAgLy8gQ2hhbmdlIGZh aWxlZAogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBHU1RfU1RBVEVfQ0hBTkdFX05PX1BSRVJP TEw6Ci0gICAgICAgIEdTVF9ERUJVRygiTm8gcHJlcm9sbDogU3RhdGU6ICVzLCBwZW5kaW5nOiAl cyIsIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKHN0YXRlKSwgZ3N0X2VsZW1lbnRfc3RhdGVf Z2V0X25hbWUocGVuZGluZykpOworICAgICAgICBHU1RfREVCVUcoIk5vIHByZXJvbGw6IFN0YXRl OiAlcywgcGVuZGluZzogJXMiLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShtX2N1cnJlbnRT dGF0ZSksIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKHBlbmRpbmcpKTsKIAogICAgICAgICAv LyBMaXZlIHBpcGVsaW5lcyBnbyBpbiBQQVVTRUQgd2l0aG91dCBwcmVyb2xsaW5nLgogICAgICAg ICBtX2lzU3RyZWFtaW5nID0gdHJ1ZTsKICAgICAgICAgc2V0RG93bmxvYWRCdWZmZXJpbmcoKTsK IAotICAgICAgICBpZiAoc3RhdGUgPT0gR1NUX1NUQVRFX1JFQURZKQorICAgICAgICBpZiAobV9j dXJyZW50U3RhdGUgPT0gR1NUX1NUQVRFX1JFQURZKQogICAgICAgICAgICAgbV9yZWFkeVN0YXRl ID0gTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nOwotICAgICAgICBlbHNlIGlmIChzdGF0ZSA9PSBH U1RfU1RBVEVfUEFVU0VEKSB7CisgICAgICAgIGVsc2UgaWYgKG1fY3VycmVudFN0YXRlID09IEdT VF9TVEFURV9QQVVTRUQpIHsKICAgICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVy OjpIYXZlRW5vdWdoRGF0YTsKICAgICAgICAgICAgIG1fcGF1c2VkID0gdHJ1ZTsKLSAgICAgICAg fSBlbHNlIGlmIChzdGF0ZSA9PSBHU1RfU1RBVEVfUExBWUlORykKKyAgICAgICAgfSBlbHNlIGlm IChtX2N1cnJlbnRTdGF0ZSA9PSBHU1RfU1RBVEVfUExBWUlORykKICAgICAgICAgICAgIG1fcGF1 c2VkID0gZmFsc2U7CiAKICAgICAgICAgaWYgKCFtX3BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkK QEAgLTE2MjMsNyArMTYzNiw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1 cGRhdGVTdGF0ZXMoKQogICAgICAgICBtX3BsYXllci0+cmVhZHlTdGF0ZUNoYW5nZWQoKTsKICAg ICB9CiAKLSAgICBpZiAoZ2V0U3RhdGVSZXN1bHQgPT0gR1NUX1NUQVRFX0NIQU5HRV9TVUNDRVNT ICYmIHN0YXRlID49IEdTVF9TVEFURV9QQVVTRUQpIHsKKyAgICBpZiAoZ2V0U3RhdGVSZXN1bHQg PT0gR1NUX1NUQVRFX0NIQU5HRV9TVUNDRVNTICYmIG1fY3VycmVudFN0YXRlID49IEdTVF9TVEFU RV9QQVVTRUQpIHsKICAgICAgICAgdXBkYXRlUGxheWJhY2tSYXRlKCk7CiAgICAgICAgIGlmICht X3NlZWtJc1BlbmRpbmcpIHsKICAgICAgICAgICAgIEdTVF9ERUJVRygiW1NlZWtdIGNvbW1pdHRp bmcgcGVuZGluZyBzZWVrIHRvICVzIiwgdG9TdHJpbmcobV9zZWVrVGltZSkudXRmOCgpLmRhdGEo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXgg YTczYTkyNDdmMzExNWU5ZGI1ZDM4MjlhOTRiYzVmZTYzMjk0OTk4Ny4uM2Q3N2VhMTQzOGE3ZWRm M2Q2OWVlYzNjYzkzYTQ5NjU0NWM2ZWU4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuaApAQCAtMTkwLDYgKzE5MCw4IEBAIHByb3RlY3RlZDoKICAgICBt dXRhYmxlIE1lZGlhVGltZSBtX2R1cmF0aW9uQXRFT1M7CiAgICAgYm9vbCBtX3BhdXNlZDsKICAg ICBmbG9hdCBtX3BsYXliYWNrUmF0ZTsKKyAgICBHc3RTdGF0ZSBtX2N1cnJlbnRTdGF0ZTsKKyAg ICBHc3RTdGF0ZSBtX29sZFN0YXRlOwogICAgIEdzdFN0YXRlIG1fcmVxdWVzdGVkU3RhdGU7CiAg ICAgYm9vbCBtX3Jlc2V0UGlwZWxpbmU7CiAgICAgYm9vbCBtX3NlZWtpbmc7Cg== 330812 2018-01-09 05:09:40 -0800 2018-01-09 06:35:23 -0800 Patch bug-180197-20180109130939.patch text/plain 2345 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWMzMTQ5NzgzNTAxMDhl ZTg2OWFkZTc2YjcwMDM0YWYyNDgzY2I2NS4uYmNiMTE4MjE1NzQ0Mjc1N2NhNzFiNjEzZDU1ZjBm MjdhYWExMDY3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTAxLTA5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBFbnN1cmUgU2xlZXBEaXNhYmxlciBpcyBub3QgaGVsZCBieSBwYWdlcyBpbiBwYWdlIGNhY2hl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAxOTcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgc2xl ZXAgZGlzYWJsZXIgaXMgbm93IGNoZWNrZWQgYWdhaW4gd2hlbmV2ZXIgdGhlIG1lZGlhIHBsYXll cgorICAgICAgICBwbGF5YmFjayBzdGF0ZSBvciBvdGhlciBjaGFyYXN0ZXJpc3RpYyBoYXMgY2hh bmdlZCBpbiB0aGUgbWVkaWEKKyAgICAgICAgZW5naW5lLgorCisgICAgICAgICogaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1l ZGlhUGxheWVyUGxheWJhY2tTdGF0ZUNoYW5nZWQpOgorICAgICAgICBDaGVjayBpZiB0aGUgc2xl ZXAgZGlzYWJsZXIgc3RhdGUgbmVlZHMgdG8gYmUgdXBkYXRlZCBvciBub3QuCisgICAgICAgIChX ZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckNoYXJhY3RlcmlzdGljQ2hhbmdl ZCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2hvdWxkRGlz YWJsZVNsZWVwIGNvbnN0KTogRW5hYmxlCisgICAgICAgIHNsZWVwIGRpc2FibGVyIGZvciBHVEsg YW5kIFdQRSBwb3J0cy4KKwogMjAxOC0wMS0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjI0NDYwKTogVGV4dCBmaWVs ZHMgc29tZXRpbWVzIGdldCAibWVzc2VkIHVwIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKaW5kZXggMWFhMDQ1OTk4YjRjNGJkN2U3MzM3ZmVlNjc0NjlmZTM5MWYwMjcz Mi4uMjM3YjQxYjZmZjhiZGIwZjViYWRhYjM5ZGMyMmUyZTAyYzk5Yzg0OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC00ODQ4LDYgKzQ4NDgsOSBAQCB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyUGxheWJhY2tTdGF0ZUNoYW5nZWQoTWVkaWFQ bGF5ZXIqKQogICAgICAgICBwYXVzZUludGVybmFsKCk7CiAgICAgZWxzZQogICAgICAgICBwbGF5 SW50ZXJuYWwoKTsKKworICAgIHVwZGF0ZVNsZWVwRGlzYWJsaW5nKCk7CisKICAgICBlbmRQcm9j ZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjaygpOwogfQogCkBAIC01MDIyLDYgKzUwMjUsOCBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ2hhcmFjdGVyaXN0aWNDaGFuZ2VkKE1l ZGlhUGxheWVyKikKIAogICAgIG1fbWVkaWFTZXNzaW9uLT5jYW5Qcm9kdWNlQXVkaW9DaGFuZ2Vk KCk7CiAKKyAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOworCiAgICAgZW5kUHJvY2Vzc2luZ01l ZGlhUGxheWVyQ2FsbGJhY2soKTsKIH0KIApAQCAtNjYzNiw4ICs2NjQxLDcgQEAgc3RhdGljIGlu bGluZSBib29sIGlzUmVtb3RlTWVkaWFTdHJlYW1WaWRlb1RyYWNrKFJlZlB0cjxNZWRpYVN0cmVh bVRyYWNrPiYgaXRlbSkKIAogSFRNTE1lZGlhRWxlbWVudDo6U2xlZXBUeXBlIEhUTUxNZWRpYUVs ZW1lbnQ6OnNob3VsZERpc2FibGVTbGVlcCgpIGNvbnN0CiB7Ci0gICAgLy8gU2VlIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAxOTcgYmVmb3JlIHJlbW92aW5nIHRo aXMgZ3VhcmQuCi0jaWYgIVBMQVRGT1JNKENPQ09BKQorI2lmICFQTEFURk9STShDT0NPQSkgJiYg IVBMQVRGT1JNKEdUSykgJiYgIVBMQVRGT1JNKFdQRSkKICAgICByZXR1cm4gU2xlZXBUeXBlOjpO b25lOwogI2VuZGlmCiAgICAgaWYgKCFtX3BsYXllciB8fCBtX3BsYXllci0+cGF1c2VkKCkgfHwg bG9vcCgpKQo=