50228 2010-11-30 05:45:28 -0800 Theme not updated when MediaPlayer m_private engine changes 2010-12-03 00:40:12 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 50382 1 pnormand webkit-unassigned cgarcia eric.carlson eric oldest_to_newest 314971 0 pnormand 2010-11-30 05:45:28 -0800 RenderTheme relies on the mediaElement supportsFullscreen and supportMuting to know wether it should paint the fullscreen and mute buttons or not. The problem is that the MediaPlayer first loads a NullMediaPlayerPrivate which doesn't support those. So if you display a page with a video element and controls enabled (no autoplay), the theme will be rendered without those buttons until video playback starts and the controls are painted again. So I think we could have a mediaPlayerBackendChanged() callback in the mediaPlayerClient interface which in the case of the HTMLMediaElement trigger an update of the theme. Would that make sense, Eric? The new callback would be called by the MediaPlayer each time m_private variable is cleared/changed. 315040 1 eric.carlson 2010-11-30 07:42:48 -0800 (In reply to comment #0) > RenderTheme relies on the mediaElement supportsFullscreen and supportMuting to know wether > it should paint the fullscreen and mute buttons or not. The problem is that the MediaPlayer first > loads a NullMediaPlayerPrivate which doesn't support those. So if you display a page with a video > element and controls enabled (no autoplay), the theme will be rendered without those buttons > until video playback starts and the controls are painted again. > > So I think we could have a mediaPlayerBackendChanged() callback in the mediaPlayerClient > interface which in the case of the HTMLMediaElement trigger an update of the theme. Would > that make sense, Eric? The new callback would be called by the MediaPlayer each time > m_private variable is cleared/changed. Sounds like a good idea. 316079 2 pnormand 2010-12-02 04:03:52 -0800 Sorry this bug is invalid, the issue of controls buttons not displayed some times is specific to the GStreamer media-player. Will file a separate bug. 316133 3 pnormand 2010-12-02 07:24:19 -0800 Turns out this is really needed, at least in the GStreamer player case where hasVideo and hasAudio are dependant on the player state. So when these values are updated the controls update needs to be triggered as well. See also bug 50382 316141 4 75376 pnormand 2010-12-02 07:36:34 -0800 Created attachment 75376 proposed patch 316183 5 eric 2010-12-02 09:08:29 -0800 Attachment 75376 did not build on mac: Build output: http://queues.webkit.org/results/6839008 316195 6 75385 pnormand 2010-12-02 09:19:56 -0800 Created attachment 75385 proposed patch 316220 7 75385 eric.carlson 2010-12-02 09:52:18 -0800 Comment on attachment 75385 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=75385&action=review > WebCore/html/HTMLMediaElement.cpp:1964 > +void HTMLMediaElement::mediaPlayerBackendUpdated(MediaPlayer*) I am not sure about this function name, the term "backend" isn't used anywhere else in this file. "Media engine" is used in both comments and "mediaEngineError", so maybe "mediaPlayerEngineUpdated" or "mediaPlayerEngineChanged" instead? > WebCore/html/HTMLMediaElement.cpp:1969 > + toRenderMedia(renderer())->updateFromElement(); Why is this cast necessary, updateFromElement() is called elsewhere in the file without it? r+, though I would prefer a different name for the callback. 316710 8 pnormand 2010-12-03 00:40:12 -0800 Thanks, I went for mediaPlayerEngineUpdated. Landed in http://trac.webkit.org/changeset/73249 75376 2010-12-02 07:36:34 -0800 2010-12-02 09:19:56 -0800 proposed patch proposed-patch.patch text/plain 4663 pnormand RnJvbSAzZDMwZWZiNmRmMGE2MzBhYTA1MTA1OWQ5MTJiMzBhZTg5ZTNiMDYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDIgRGVjIDIwMTAgMTU6MDQ6MTUgKzAxMDAKU3ViamVjdDogW1BBVENIXSBw cm9wb3NlZCBwYXRjaAoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMTkgKysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwICAgICAgICAgfCAgICA5ICsrKysrKysrKwogV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuaCAgICAgICAgICAgfCAgICAxICsKIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXIuY3BwIHwgICAgOSArKysrKysrKy0KIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvTWVkaWFQbGF5ZXIuaCAgIHwgICAgMiArKwogNSBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRkYzY4OC4uYmUyMjQ4YSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAor MjAxMC0xMi0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlbWUgbm90IHVw ZGF0ZWQgd2hlbiBNZWRpYVBsYXllciBtX3ByaXZhdGUgZW5naW5lIGNoYW5nZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMjI4CisKKyAgICAgICAg VHJpZ2dlciBhIG5ldyByZW5kZXJpbmcgb2YgdGhlIG1lZGlhIGVsZW1lbnQgd2hlbiB0aGUgcHJp dmF0ZQorICAgICAgICBtZWRpYS1wbGF5ZXIgYmFja2VuZCBpcyB1cGRhdGVkLgorCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyQmFja2VuZFVwZGF0ZWQpOgorICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpNZWRpYVBsYXllcik6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6bG9hZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyQ2xpZW50 OjptZWRpYVBsYXllckJhY2tlbmRVcGRhdGVkKToKKwogMjAxMC0xMi0wMiAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGM5NmJiMWUuLjVhMjc0Y2UgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTE5NjEsNiArMTk2MSwxNSBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyUmVuZGVyaW5nTW9kZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKQog fQogI2VuZGlmCiAKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJCYWNrZW5kVXBk YXRlZChNZWRpYVBsYXllciogcGxheWVyKQoreworICAgIGJlZ2luUHJvY2Vzc2luZ01lZGlhUGxh eWVyQ2FsbGJhY2soKTsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBs YXllckJhY2tlbmRVcGRhdGVkIik7CisgICAgaWYgKHJlbmRlcmVyKCkpCisgICAgICAgIHRvUmVu ZGVyTWVkaWEocmVuZGVyZXIoKSktPnVwZGF0ZUZyb21FbGVtZW50KCk7CisgICAgZW5kUHJvY2Vz c2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKK30KKwogUGFzc1JlZlB0cjxUaW1lUmFuZ2VzPiBI VE1MTWVkaWFFbGVtZW50OjpidWZmZXJlZCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3BsYXllcikK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmggYi9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDYxMjIxYjguLjY4ZTg1NjUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuaApAQCAtMjI3LDYgKzIyNyw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBi b29sIG1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZChNZWRpYVBsYXllciopOwog ICAgIHZpcnR1YWwgdm9pZCBtZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFuZ2VkKE1lZGlhUGxh eWVyKik7CiAjZW5kaWYKKyAgICB2aXJ0dWFsIHZvaWQgbWVkaWFQbGF5ZXJCYWNrZW5kVXBkYXRl ZChNZWRpYVBsYXllciopOwogCiAgICAgdm9pZCBsb2FkVGltZXJGaXJlZChUaW1lcjxIVE1MTWVk aWFFbGVtZW50PiopOwogICAgIHZvaWQgYXN5bmNFdmVudFRpbWVyRmlyZWQoVGltZXI8SFRNTE1l ZGlhRWxlbWVudD4qKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVk aWFQbGF5ZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAK aW5kZXggNTRiOTQxYy4uOTAxM2FhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9NZWRpYVBsYXllci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRp YVBsYXllci5jcHAKQEAgLTI2Miw2ICsyNjIsOCBAQCBNZWRpYVBsYXllcjo6TWVkaWFQbGF5ZXIo TWVkaWFQbGF5ZXJDbGllbnQqIGNsaWVudCkKICAgICAgICAgbV9jdXJyZW50TWVkaWFFbmdpbmUg PSBlbmdpbmVzWzBdOwogICAgICAgICBtX3ByaXZhdGUuY2xlYXIoKTsKICAgICAgICAgbV9wcml2 YXRlLnNldChlbmdpbmVzWzBdLT5jb25zdHJ1Y3Rvcih0aGlzKSk7CisgICAgICAgIGlmIChtX21l ZGlhUGxheWVyQ2xpZW50KQorICAgICAgICAgICAgbV9tZWRpYVBsYXllckNsaWVudC0+bWVkaWFQ bGF5ZXJCYWNrZW5kVXBkYXRlZCh0aGlzKTsKICAgICB9CiAjZW5kaWYKIH0KQEAgLTMwMyw2ICsz MDUsOCBAQCB2b2lkIE1lZGlhUGxheWVyOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBD b250ZW50VHlwZSYgY29udGVudFR5cGUpCiAgICAgICAgIG1fY3VycmVudE1lZGlhRW5naW5lID0g ZW5naW5lOwogICAgICAgICBtX3ByaXZhdGUuY2xlYXIoKTsKICAgICAgICAgbV9wcml2YXRlLnNl dChlbmdpbmUtPmNvbnN0cnVjdG9yKHRoaXMpKTsKKyAgICAgICAgaWYgKG1fbWVkaWFQbGF5ZXJD bGllbnQpCisgICAgICAgICAgICBtX21lZGlhUGxheWVyQ2xpZW50LT5tZWRpYVBsYXllckJhY2tl bmRVcGRhdGVkKHRoaXMpOwogI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQogICAg ICAgICBtX3ByaXZhdGUtPnNldE1lZGlhUGxheWVyUHJveHkobV9wbGF5ZXJQcm94eSk7CiAjZW5k aWYKQEAgLTMxMiw4ICszMTYsMTEgQEAgdm9pZCBNZWRpYVBsYXllcjo6bG9hZChjb25zdCBTdHJp bmcmIHVybCwgY29uc3QgQ29udGVudFR5cGUmIGNvbnRlbnRUeXBlKQogCiAgICAgaWYgKG1fcHJp dmF0ZSkKICAgICAgICAgbV9wcml2YXRlLT5sb2FkKHVybCk7Ci0gICAgZWxzZQorICAgIGVsc2Ug ewogICAgICAgICBtX3ByaXZhdGUuc2V0KGNyZWF0ZU51bGxNZWRpYVBsYXllcih0aGlzKSk7Cisg ICAgICAgIGlmIChtX21lZGlhUGxheWVyQ2xpZW50KQorICAgICAgICAgICAgbV9tZWRpYVBsYXll ckNsaWVudC0+bWVkaWFQbGF5ZXJCYWNrZW5kVXBkYXRlZCh0aGlzKTsKKyAgICB9CiB9ICAgIAog CiBib29sIE1lZGlhUGxheWVyOjpoYXNBdmFpbGFibGVWaWRlb0ZyYW1lKCkgY29uc3QKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaCBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAppbmRleCBjOWMwNDJiLi5kNTI2ZjZlIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCkBAIC0xMzYsNiArMTM2LDgg QEAgcHVibGljOgogICAgIC8vIHRoZSBtb3ZpZSBzaXplIGhhcyBjaGFuZ2VkCiAgICAgdmlydHVh bCB2b2lkIG1lZGlhUGxheWVyU2l6ZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKSB7IH0KIAorICAgIHZp cnR1YWwgdm9pZCBtZWRpYVBsYXllckJhY2tlbmRVcGRhdGVkKE1lZGlhUGxheWVyKikgeyB9CisK ICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gd2hldGhlciB0aGUgcmVu ZGVyaW5nIHN5c3RlbSBjYW4gYWNjZWxlcmF0ZSB0aGUgZGlzcGxheSBvZiB0aGlzIE1lZGlhUGxh eWVyLgogICAgIHZpcnR1YWwgYm9vbCBtZWRpYVBsYXllclJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0 ZWQoTWVkaWFQbGF5ZXIqKSB7IHJldHVybiBmYWxzZTsgfQotLSAKMS43LjIuMw== 75385 2010-12-02 09:19:56 -0800 2010-12-02 09:52:18 -0800 proposed patch proposed-patch.patch text/plain 4663 pnormand RnJvbSBmM2Q2OTIxMWI0ZTgyMWJiNzk1MGYzNWE2OTJhMjU4MzkzOWVhNmFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDIgRGVjIDIwMTAgMTU6MDQ6MTUgKzAxMDAKU3ViamVjdDogW1BBVENIXSBw cm9wb3NlZCBwYXRjaAoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMTkgKysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwICAgICAgICAgfCAgICA5ICsrKysrKysrKwogV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuaCAgICAgICAgICAgfCAgICAxICsKIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXIuY3BwIHwgICAgOSArKysrKysrKy0KIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvTWVkaWFQbGF5ZXIuaCAgIHwgICAgMiArKwogNSBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E4ZjlkZC4uNjIzNTcyYyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAor MjAxMC0xMi0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlbWUgbm90IHVw ZGF0ZWQgd2hlbiBNZWRpYVBsYXllciBtX3ByaXZhdGUgZW5naW5lIGNoYW5nZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMjI4CisKKyAgICAgICAg VHJpZ2dlciBhIG5ldyByZW5kZXJpbmcgb2YgdGhlIG1lZGlhIGVsZW1lbnQgd2hlbiB0aGUgcHJp dmF0ZQorICAgICAgICBtZWRpYS1wbGF5ZXIgYmFja2VuZCBpcyB1cGRhdGVkLgorCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyQmFja2VuZFVwZGF0ZWQpOgorICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpNZWRpYVBsYXllcik6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6bG9hZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyQ2xpZW50 OjptZWRpYVBsYXllckJhY2tlbmRVcGRhdGVkKToKKwogMjAxMC0xMi0wMiAgVmluY2VudCBTY2hl aWIgIDxzY2hlaWJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZp c2hlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBjOTZiYjFlLi5mOTU3MmNkIDEw MDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0xOTYxLDYgKzE5NjEsMTUgQEAgdm9pZCBI VE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFuZ2VkKE1lZGlhUGxh eWVyKikKIH0KICNlbmRpZgogCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQmFj a2VuZFVwZGF0ZWQoTWVkaWFQbGF5ZXIqKQoreworICAgIGJlZ2luUHJvY2Vzc2luZ01lZGlhUGxh eWVyQ2FsbGJhY2soKTsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBs YXllckJhY2tlbmRVcGRhdGVkIik7CisgICAgaWYgKHJlbmRlcmVyKCkpCisgICAgICAgIHRvUmVu ZGVyTWVkaWEocmVuZGVyZXIoKSktPnVwZGF0ZUZyb21FbGVtZW50KCk7CisgICAgZW5kUHJvY2Vz c2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKK30KKwogUGFzc1JlZlB0cjxUaW1lUmFuZ2VzPiBI VE1MTWVkaWFFbGVtZW50OjpidWZmZXJlZCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3BsYXllcikK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmggYi9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDYxMjIxYjguLjY4ZTg1NjUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuaApAQCAtMjI3LDYgKzIyNyw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBi b29sIG1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZChNZWRpYVBsYXllciopOwog ICAgIHZpcnR1YWwgdm9pZCBtZWRpYVBsYXllclJlbmRlcmluZ01vZGVDaGFuZ2VkKE1lZGlhUGxh eWVyKik7CiAjZW5kaWYKKyAgICB2aXJ0dWFsIHZvaWQgbWVkaWFQbGF5ZXJCYWNrZW5kVXBkYXRl ZChNZWRpYVBsYXllciopOwogCiAgICAgdm9pZCBsb2FkVGltZXJGaXJlZChUaW1lcjxIVE1MTWVk aWFFbGVtZW50PiopOwogICAgIHZvaWQgYXN5bmNFdmVudFRpbWVyRmlyZWQoVGltZXI8SFRNTE1l ZGlhRWxlbWVudD4qKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVk aWFQbGF5ZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAK aW5kZXggNTRiOTQxYy4uOTAxM2FhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9NZWRpYVBsYXllci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRp YVBsYXllci5jcHAKQEAgLTI2Miw2ICsyNjIsOCBAQCBNZWRpYVBsYXllcjo6TWVkaWFQbGF5ZXIo TWVkaWFQbGF5ZXJDbGllbnQqIGNsaWVudCkKICAgICAgICAgbV9jdXJyZW50TWVkaWFFbmdpbmUg PSBlbmdpbmVzWzBdOwogICAgICAgICBtX3ByaXZhdGUuY2xlYXIoKTsKICAgICAgICAgbV9wcml2 YXRlLnNldChlbmdpbmVzWzBdLT5jb25zdHJ1Y3Rvcih0aGlzKSk7CisgICAgICAgIGlmIChtX21l ZGlhUGxheWVyQ2xpZW50KQorICAgICAgICAgICAgbV9tZWRpYVBsYXllckNsaWVudC0+bWVkaWFQ bGF5ZXJCYWNrZW5kVXBkYXRlZCh0aGlzKTsKICAgICB9CiAjZW5kaWYKIH0KQEAgLTMwMyw2ICsz MDUsOCBAQCB2b2lkIE1lZGlhUGxheWVyOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBD b250ZW50VHlwZSYgY29udGVudFR5cGUpCiAgICAgICAgIG1fY3VycmVudE1lZGlhRW5naW5lID0g ZW5naW5lOwogICAgICAgICBtX3ByaXZhdGUuY2xlYXIoKTsKICAgICAgICAgbV9wcml2YXRlLnNl dChlbmdpbmUtPmNvbnN0cnVjdG9yKHRoaXMpKTsKKyAgICAgICAgaWYgKG1fbWVkaWFQbGF5ZXJD bGllbnQpCisgICAgICAgICAgICBtX21lZGlhUGxheWVyQ2xpZW50LT5tZWRpYVBsYXllckJhY2tl bmRVcGRhdGVkKHRoaXMpOwogI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQogICAg ICAgICBtX3ByaXZhdGUtPnNldE1lZGlhUGxheWVyUHJveHkobV9wbGF5ZXJQcm94eSk7CiAjZW5k aWYKQEAgLTMxMiw4ICszMTYsMTEgQEAgdm9pZCBNZWRpYVBsYXllcjo6bG9hZChjb25zdCBTdHJp bmcmIHVybCwgY29uc3QgQ29udGVudFR5cGUmIGNvbnRlbnRUeXBlKQogCiAgICAgaWYgKG1fcHJp dmF0ZSkKICAgICAgICAgbV9wcml2YXRlLT5sb2FkKHVybCk7Ci0gICAgZWxzZQorICAgIGVsc2Ug ewogICAgICAgICBtX3ByaXZhdGUuc2V0KGNyZWF0ZU51bGxNZWRpYVBsYXllcih0aGlzKSk7Cisg ICAgICAgIGlmIChtX21lZGlhUGxheWVyQ2xpZW50KQorICAgICAgICAgICAgbV9tZWRpYVBsYXll ckNsaWVudC0+bWVkaWFQbGF5ZXJCYWNrZW5kVXBkYXRlZCh0aGlzKTsKKyAgICB9CiB9ICAgIAog CiBib29sIE1lZGlhUGxheWVyOjpoYXNBdmFpbGFibGVWaWRlb0ZyYW1lKCkgY29uc3QKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaCBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAppbmRleCBjOWMwNDJiLi5kNTI2ZjZlIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCkBAIC0xMzYsNiArMTM2LDgg QEAgcHVibGljOgogICAgIC8vIHRoZSBtb3ZpZSBzaXplIGhhcyBjaGFuZ2VkCiAgICAgdmlydHVh bCB2b2lkIG1lZGlhUGxheWVyU2l6ZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKSB7IH0KIAorICAgIHZp cnR1YWwgdm9pZCBtZWRpYVBsYXllckJhY2tlbmRVcGRhdGVkKE1lZGlhUGxheWVyKikgeyB9CisK ICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gd2hldGhlciB0aGUgcmVu ZGVyaW5nIHN5c3RlbSBjYW4gYWNjZWxlcmF0ZSB0aGUgZGlzcGxheSBvZiB0aGlzIE1lZGlhUGxh eWVyLgogICAgIHZpcnR1YWwgYm9vbCBtZWRpYVBsYXllclJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0 ZWQoTWVkaWFQbGF5ZXIqKSB7IHJldHVybiBmYWxzZTsgfQotLSAKMS43LjIuMw==