146766 2015-07-08 17:44:46 -0700 Videos on apple.com don't show up when restored from page cache. 2015-07-23 21:21:56 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=147254 InRadar P2 Normal --- 1 kling kling cdumez eric.carlson jer.noble kling mmaxfield oldest_to_newest 1108027 0 kling 2015-07-08 17:44:46 -0700 <rdar://problem/21712311> Looks like page cache and media elements don't go that well together. 1108028 1 256442 kling 2015-07-08 17:45:34 -0700 Created attachment 256442 Patch (no test) 1108070 2 256454 kling 2015-07-08 19:57:27 -0700 Created attachment 256454 Patch Now with layout test coverage. 1108074 3 256454 darin 2015-07-08 20:07:22 -0700 Comment on attachment 256454 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256454&action=review > Source/WebCore/html/HTMLMediaElement.cpp:4867 > + LOG(Media, "HTMLMediaElement::stopWithoutDeletingMediaPlayer(%p)", this); Name here doesn’t match the actual function name above. 1108081 4 kling 2015-07-08 20:29:28 -0700 Committed r186569: <http://trac.webkit.org/changeset/186569> 1108210 5 256454 cdumez 2015-07-09 09:28:38 -0700 Comment on attachment 256454 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256454&action=review > Source/WebCore/html/HTMLMediaElement.cpp:4870 > exitFullscreen(); While this is a step in the right direction. I think there are still a few issues. > Source/WebCore/html/HTMLMediaElement.cpp:4887 > m_asyncEventQueue.close(); This completely drops pending events (including the one that may have been queued by exitFullscreen() above. What we really want is to delay the event firing until after resume() is called, not drop the pending events. 1108219 6 cdumez 2015-07-09 09:43:42 -0700 (In reply to comment #5) > Comment on attachment 256454 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=256454&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:4870 > > exitFullscreen(); > > While this is a step in the right direction. I think there are still a few > issues. > > > Source/WebCore/html/HTMLMediaElement.cpp:4887 > > m_asyncEventQueue.close(); > > This completely drops pending events (including the one that may have been > queued by exitFullscreen() above. What we really want is to delay the event > firing until after resume() is called, not drop the pending events. I mean delaying events is what we really want in the suspend() case. In the stop() case, dropping events like we currently do is fine. 1108220 7 256454 cdumez 2015-07-09 09:43:53 -0700 Comment on attachment 256454 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256454&action=review >> Source/WebCore/html/HTMLMediaElement.cpp:4887 >> m_asyncEventQueue.close(); > > This completely drops pending events (including the one that may have been queued by exitFullscreen() above. What we really want is to delay the event firing until after resume() is called, not drop the pending events. The call to cancelPendingEventsAndCallbacks() above is also an issue (for the same reason). 1109637 8 jer.noble 2015-07-15 09:04:15 -0700 We should make sure that HTMLMediaElement::setShouldBufferData(false) is called in this case, now that the MediaPlayerPrivate stays alive in the page cache. 256442 2015-07-08 17:45:34 -0700 2015-07-08 19:57:27 -0700 Patch (no test) bug-146766.diff text/plain 3367 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwOWE4YjliLi5jZDM1MGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTUtMDctMDggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFZpZGVvcyBvbiBhcHBsZS5jb20gZG9uJ3Qgc2hvdyB1cCB3aGVuIHJlc3RvcmVkIGZyb20g cGFnZSBjYWNoZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE0Njc2Nj4KKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzIxNzEyMzExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEJyZWFrIG91dCBtb3N0IG9mIEhUTUxNZWRpYUVsZW1lbnQ6 OnN0b3AoKSAob3ZlcnJpZGUgb2YgQWN0aXZlRE9NT2JqZWN0OjpzdG9wKCksIHRvIGJlIGNsZWFy KQorICAgICAgICBpbnRvIGEgc3RvcFdpdGhvdXREZXN0cm95aW5nTWVkaWFQbGF5ZXIoKSBmdW5j dGlvbiB0aGF0IGJvdGggc3RvcCgpIGFuZCBzdXNwZW5kKCkgY2FuIGNhbGwuCisKKyAgICAgICAg QmVmb3JlIHRoaXMgY2hhbmdlLCBzdXNwZW5kKCkgd291bGQgY2FsbCBzdG9wKCkgd2hlbiBtb3Zp bmcgaW50byB0aGUgcGFnZSBjYWNoZSwga2lsbGluZyB0aGUKKyAgICAgICAgaW50ZXJuYWwgTWVk aWFQbGF5ZXIgb2JqZWN0IHdoaWNoIGNhdXNlZCB0aGUgdmlkZW8gdG8gZGlzYXBwZWFyIGZyb20g dGhlIHBhZ2UuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c3RvcFdpdGhvdXREZXN0cm95aW5nTWVkaWFQ bGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c3RvcCk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzdXNwZW5kKToKKyAgICAgICAgKiBodG1s L0hUTUxNZWRpYUVsZW1lbnQuaDoKKwogMjAxNS0wNy0wOCAgTWF0dGhldyBEYWl0ZXIgIDxtZGFp dGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhcmVkIGNvbnRlbnRNSU1FVHlwZXMgZm9yIE1l ZGlhU3RyZWFtcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXgg ZGI0MDQzMi4uNjE5ZjE4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwCkBAIC00ODYyLDkgKzQ4NjIsMTAgQEAgY29uc3QgY2hhciogSFRNTE1lZGlhRWxlbWVudDo6 YWN0aXZlRE9NT2JqZWN0TmFtZSgpIGNvbnN0CiAgICAgcmV0dXJuICJIVE1MTWVkaWFFbGVtZW50 IjsKIH0KIAotdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzdG9wKCkKK3ZvaWQgSFRNTE1lZGlhRWxl bWVudDo6c3RvcFdpdGhvdXREZXN0cm95aW5nTWVkaWFQbGF5ZXIoKQogewotICAgIExPRyhNZWRp YSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnN0b3AoJXApIiwgdGhpcyk7CisgICAgTE9HKE1lZGlhLCAi SFRNTE1lZGlhRWxlbWVudDo6c3RvcFdpdGhvdXREZWxldGluZ01lZGlhUGxheWVyKCVwKSIsIHRo aXMpOworCiAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBWaWRlb0Z1bGxzY3JlZW5N b2RlTm9uZSkKICAgICAgICAgZXhpdEZ1bGxzY3JlZW4oKTsKICAgICAKQEAgLTQ4ODUsMTMgKzQ4 ODYsMjAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzdG9wKCkKIAogICAgIG1fYXN5bmNFdmVu dFF1ZXVlLmNsb3NlKCk7CiAKKyAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOworfQorCit2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnN0b3AoKQoreworICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVs ZW1lbnQ6OnN0b3AoJXApIiwgdGhpcyk7CisKKyAgICBzdG9wV2l0aG91dERlc3Ryb3lpbmdNZWRp YVBsYXllcigpOworCiAgICAgLy8gT25jZSBhbiBhY3RpdmUgRE9NIG9iamVjdCBoYXMgYmVlbiBz dG9wcGVkIGl0IGNhbiBub3QgYmUgcmVzdGFydGVkLCBzbyB3ZSBjYW4gZGVhbGxvY2F0ZQogICAg IC8vIHRoZSBtZWRpYSBwbGF5ZXIgbm93LiBOb3RlIHRoYXQgdXNlckNhbmNlbGxlZExvYWQgd2ls bCBhbHJlYWR5IGNhbGxlZCBjbGVhck1lZGlhUGxheWVyCiAgICAgLy8gaWYgdGhlIG1lZGlhIHdh cyBub3QgZnVsbHkgbG9hZGVkLCBidXQgd2UgbmVlZCB0aGUgc2FtZSBjbGVhbnVwIGlmIHRoZSBm aWxlIHdhcyBjb21wbGV0ZWx5CiAgICAgLy8gbG9hZGVkIGFuZCBjYWxsaW5nIGl0IGFnYWluIHdv bid0IGNhdXNlIGFueSBwcm9ibGVtcy4KICAgICBjbGVhck1lZGlhUGxheWVyKEV2ZXJ5RGVsYXll ZEFjdGlvbik7Ci0KLSAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOwogfQogCiB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCkBAIC00OTAxLDcg KzQ5MDksNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVu c2lvbiB3aHkpCiAgICAgc3dpdGNoICh3aHkpCiAgICAgewogICAgICAgICBjYXNlIFBhZ2VDYWNo ZToKLSAgICAgICAgICAgIHN0b3AoKTsKKyAgICAgICAgICAgIHN0b3BXaXRob3V0RGVzdHJveWlu Z01lZGlhUGxheWVyKCk7CiAgICAgICAgICAgICBtX21lZGlhU2Vzc2lvbi0+YWRkQmVoYXZpb3JS ZXN0cmljdGlvbihNZWRpYUVsZW1lbnRTZXNzaW9uOjpSZXF1aXJlUGFnZUNvbnNlbnRUb1Jlc3Vt ZU1lZGlhKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIERvY3VtZW50V2lsbEJl UGF1c2VkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCA1ODMyYzA5 Li40OGQyNTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaApAQCAtNTA1 LDYgKzUwNSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdXNwZW5kKFJlYXNvbkZvclN1c3BlbnNp b24pIG92ZXJyaWRlOwogICAgIHZvaWQgcmVzdW1lKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzdG9w KCkgb3ZlcnJpZGU7CisgICAgdm9pZCBzdG9wV2l0aG91dERlc3Ryb3lpbmdNZWRpYVBsYXllcigp OwogICAgIAogICAgIHZpcnR1YWwgdm9pZCBtZWRpYVZvbHVtZURpZENoYW5nZSgpIG92ZXJyaWRl OwogCg== 256454 2015-07-08 19:57:27 -0700 2015-07-08 20:07:22 -0700 Patch bug-146766-2.diff text/plain 5920 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzM2ZlY2FmLi5lYTE5M2NkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMDct MDggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFZpZGVvcyBv biBhcHBsZS5jb20gZG9uJ3Qgc2hvdyB1cCB3aGVuIHJlc3RvcmVkIGZyb20gcGFnZSBjYWNoZS4K KyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE0Njc2Nj4KKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzIxNzEyMzExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFR3ZWFrZWQgYW4gZXhpc3RpbmcgbWVkaWEgZWxlbWVudCBwYWdlIGNhY2hpbmcg dGVzdCB0byBkdW1wIG91dCB0aGUgdmlkZW8gaGVpZ2h0CisgICAgICAgIGFmdGVyIHJlc3Rvcmlu ZyBmcm9tIHBhZ2UgY2FjaGUuIEZhaWx1cmUgdG8gcmVzdG9yZSB0aGUgdmlkZW8gcGxheWVyIHdv dWxkIHJlc3VsdAorICAgICAgICBpbiBpbmNvcnJlY3QgZ2VvbWV0cnkgKGl0IGZhbGxzIGJhY2sg dG8gUmVuZGVyUmVwbGFjZWQncyBkZWZhdWx0IDMwMHgxNTAuKQorCisgICAgICAgICogbWVkaWEv cmVzdG9yZS1mcm9tLXBhZ2UtY2FjaGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3Jl c3RvcmUtZnJvbS1wYWdlLWNhY2hlLmh0bWw6CisKIDIwMTUtMDctMDggIFdlbnNvbiBIc2llaCAg PHdoc2llaEBiZXJrZWxleS5lZHU+CiAKICAgICAgICAgRml4IGFzeW5jaHJvbm91cyBmdW5jdGlv biBjYWxscyBmb3Igc2Nyb2xsIHNuYXAgYW5pbWF0aW9uIHRlc3RzCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9tZWRpYS9yZXN0b3JlLWZyb20tcGFnZS1jYWNoZS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9tZWRpYS9yZXN0b3JlLWZyb20tcGFnZS1jYWNoZS1leHBlY3RlZC50eHQKaW5kZXgg YzlhZTZlOC4uZTA0YjFlZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvcmVzdG9yZS1m cm9tLXBhZ2UtY2FjaGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL21lZGlhL3Jlc3Rv cmUtZnJvbS1wYWdlLWNhY2hlLWV4cGVjdGVkLnR4dApAQCAtNyw0ICs3LDYgQEAgRVhQRUNURUQg KGxvYWRDb3VudCA9PSAnMCcpIE9LCiAqKiogUGFnZSBnb2luZyBpbnRvIGNhY2hlCiAqKiogUGFn ZSByZXR1cm5lZCBmcm9tIGNhY2hlCiBFWFBFQ1RFRCAobG9hZENvdW50ID09ICcxJykgT0sKK0VY UEVDVEVEICh2aWRlb0NvbXB1dGVkU3R5bGUud2lkdGggPT0gJzMyMHB4JykgT0sKK0VYUEVDVEVE ICh2aWRlb0NvbXB1dGVkU3R5bGUuaGVpZ2h0ID09ICcyNDBweCcpIE9LCiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL21lZGlhL3Jlc3RvcmUtZnJvbS1wYWdlLWNhY2hlLmh0bWwgYi9MYXlvdXRU ZXN0cy9tZWRpYS9yZXN0b3JlLWZyb20tcGFnZS1jYWNoZS5odG1sCmluZGV4IDFkYjIwOWYuLjQ4 MzM2MjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL3Jlc3RvcmUtZnJvbS1wYWdlLWNh Y2hlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvcmVzdG9yZS1mcm9tLXBhZ2UtY2FjaGUu aHRtbApAQCAtMjEsNyArMjEsMTMgQEAKICAgICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KCIqKiogUGFnZSByZXR1cm5lZCBmcm9tIGNhY2hlIik7CiAKICAgICAgICAgICAgICAgICAgICAg dGVzdEV4cGVjdGVkKCJsb2FkQ291bnQiLCAxKTsKLSAgICAgICAgICAgICAgICAgICAgCisKKyAg ICAgICAgICAgICAgICAgICAgLy8gRHVtcCB0aGUgaGVpZ2h0IG9mIHRoZSB2aWRlbyBzbyB3ZSBj YW4gdmVyaWZ5IHRoYXQgdGhlIHBsYXllciB3YXMgcmVzdG9yZWQuCisgICAgICAgICAgICAgICAg ICAgIHZpZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3ZpZGVvJylbMF07Cisg ICAgICAgICAgICAgICAgICAgIHZpZGVvQ29tcHV0ZWRTdHlsZSA9IGdldENvbXB1dGVkU3R5bGUo dmlkZW8pOworICAgICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvQ29tcHV0ZWRT dHlsZS53aWR0aCIsICIzMjBweCIpOworICAgICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQo InZpZGVvQ29tcHV0ZWRTdHlsZS5oZWlnaHQiLCAiMjQwcHgiKTsKKwogICAgICAgICAgICAgICAg ICAgICAvLyBzY2hlZHVsZSB0aGUgdGVzdCB0byBlbmQgc2hvcnRseSwgYnV0IHdhaXQgbG9uZyBl bm91Z2ggZm9yIHRoZSBlbGVtZW50IHRvIGZpcmUgbG9hZGluZyBldmVudHMKICAgICAgICAgICAg ICAgICAgICAgLy8gIGlmIHRoYXQgaXMgZ29pbmcgdG8gaGFwcGVuCiAgICAgICAgICAgICAgICAg ICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7IGlmICh3aW5kb3cudGVzdFJ1bm5lcikgdGVzdFJ1 bm5lci5ub3RpZnlEb25lKCk7IH0sIDIwMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDlhOGI5Yi4uODU3YzIx NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA3LTA4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBWaWRlb3Mgb24gYXBwbGUuY29tIGRvbid0 IHNob3cgdXAgd2hlbiByZXN0b3JlZCBmcm9tIHBhZ2UgY2FjaGUuCisgICAgICAgIDxodHRwczov L3dlYmtpdC5vcmcvYi8xNDY3NjY+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTcxMjMxMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCcmVhayBv dXQgbW9zdCBvZiBIVE1MTWVkaWFFbGVtZW50OjpzdG9wKCkgKG92ZXJyaWRlIG9mIEFjdGl2ZURP TU9iamVjdDo6c3RvcCgpLCB0byBiZSBjbGVhcikKKyAgICAgICAgaW50byBhIHN0b3BXaXRob3V0 RGVzdHJveWluZ01lZGlhUGxheWVyKCkgZnVuY3Rpb24gdGhhdCBib3RoIHN0b3AoKSBhbmQgc3Vz cGVuZCgpIGNhbiBjYWxsLgorCisgICAgICAgIEJlZm9yZSB0aGlzIGNoYW5nZSwgc3VzcGVuZCgp IHdvdWxkIGNhbGwgc3RvcCgpIHdoZW4gbW92aW5nIGludG8gdGhlIHBhZ2UgY2FjaGUsIGtpbGxp bmcgdGhlCisgICAgICAgIGludGVybmFsIE1lZGlhUGxheWVyIG9iamVjdCB3aGljaCBjYXVzZWQg dGhlIHZpZGVvIHRvIGRpc2FwcGVhciBmcm9tIHRoZSBwYWdlLgorCisgICAgICAgIFRlc3Q6IExh eW91dFRlc3RzL21lZGlhL3Jlc3RvcmUtZnJvbS1wYWdlLWNhY2hlLmh0bWwgKGFtZW5kZWQpCisK KyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6c3RvcFdpdGhvdXREZXN0cm95aW5nTWVkaWFQbGF5ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c3RvcCk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpzdXNwZW5kKToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVs ZW1lbnQuaDoKKwogMjAxNS0wNy0wOCAgTWF0dGhldyBEYWl0ZXIgIDxtZGFpdGVyQGFwcGxlLmNv bT4KIAogICAgICAgICBDbGVhcmVkIGNvbnRlbnRNSU1FVHlwZXMgZm9yIE1lZGlhU3RyZWFtcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggZGI0MDQzMi4uNjE5 ZjE4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC00ODYy LDkgKzQ4NjIsMTAgQEAgY29uc3QgY2hhciogSFRNTE1lZGlhRWxlbWVudDo6YWN0aXZlRE9NT2Jq ZWN0TmFtZSgpIGNvbnN0CiAgICAgcmV0dXJuICJIVE1MTWVkaWFFbGVtZW50IjsKIH0KIAotdm9p ZCBIVE1MTWVkaWFFbGVtZW50OjpzdG9wKCkKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c3RvcFdp dGhvdXREZXN0cm95aW5nTWVkaWFQbGF5ZXIoKQogewotICAgIExPRyhNZWRpYSwgIkhUTUxNZWRp YUVsZW1lbnQ6OnN0b3AoJXApIiwgdGhpcyk7CisgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxl bWVudDo6c3RvcFdpdGhvdXREZWxldGluZ01lZGlhUGxheWVyKCVwKSIsIHRoaXMpOworCiAgICAg aWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSkKICAg ICAgICAgZXhpdEZ1bGxzY3JlZW4oKTsKICAgICAKQEAgLTQ4ODUsMTMgKzQ4ODYsMjAgQEAgdm9p ZCBIVE1MTWVkaWFFbGVtZW50OjpzdG9wKCkKIAogICAgIG1fYXN5bmNFdmVudFF1ZXVlLmNsb3Nl KCk7CiAKKyAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOworfQorCit2b2lkIEhUTUxNZWRpYUVs ZW1lbnQ6OnN0b3AoKQoreworICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnN0b3Ao JXApIiwgdGhpcyk7CisKKyAgICBzdG9wV2l0aG91dERlc3Ryb3lpbmdNZWRpYVBsYXllcigpOwor CiAgICAgLy8gT25jZSBhbiBhY3RpdmUgRE9NIG9iamVjdCBoYXMgYmVlbiBzdG9wcGVkIGl0IGNh biBub3QgYmUgcmVzdGFydGVkLCBzbyB3ZSBjYW4gZGVhbGxvY2F0ZQogICAgIC8vIHRoZSBtZWRp YSBwbGF5ZXIgbm93LiBOb3RlIHRoYXQgdXNlckNhbmNlbGxlZExvYWQgd2lsbCBhbHJlYWR5IGNh bGxlZCBjbGVhck1lZGlhUGxheWVyCiAgICAgLy8gaWYgdGhlIG1lZGlhIHdhcyBub3QgZnVsbHkg bG9hZGVkLCBidXQgd2UgbmVlZCB0aGUgc2FtZSBjbGVhbnVwIGlmIHRoZSBmaWxlIHdhcyBjb21w bGV0ZWx5CiAgICAgLy8gbG9hZGVkIGFuZCBjYWxsaW5nIGl0IGFnYWluIHdvbid0IGNhdXNlIGFu eSBwcm9ibGVtcy4KICAgICBjbGVhck1lZGlhUGxheWVyKEV2ZXJ5RGVsYXllZEFjdGlvbik7Ci0K LSAgICB1cGRhdGVTbGVlcERpc2FibGluZygpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCkBAIC00OTAxLDcgKzQ5MDksNyBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnN1c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCiAg ICAgc3dpdGNoICh3aHkpCiAgICAgewogICAgICAgICBjYXNlIFBhZ2VDYWNoZToKLSAgICAgICAg ICAgIHN0b3AoKTsKKyAgICAgICAgICAgIHN0b3BXaXRob3V0RGVzdHJveWluZ01lZGlhUGxheWVy KCk7CiAgICAgICAgICAgICBtX21lZGlhU2Vzc2lvbi0+YWRkQmVoYXZpb3JSZXN0cmljdGlvbihN ZWRpYUVsZW1lbnRTZXNzaW9uOjpSZXF1aXJlUGFnZUNvbnNlbnRUb1Jlc3VtZU1lZGlhKTsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIERvY3VtZW50V2lsbEJlUGF1c2VkOgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCA1ODMyYzA5Li40OGQyNTUwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaApAQCAtNTA1LDYgKzUwNSw3IEBA IHByaXZhdGU6CiAgICAgdm9pZCBzdXNwZW5kKFJlYXNvbkZvclN1c3BlbnNpb24pIG92ZXJyaWRl OwogICAgIHZvaWQgcmVzdW1lKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzdG9wKCkgb3ZlcnJpZGU7 CisgICAgdm9pZCBzdG9wV2l0aG91dERlc3Ryb3lpbmdNZWRpYVBsYXllcigpOwogICAgIAogICAg IHZpcnR1YWwgdm9pZCBtZWRpYVZvbHVtZURpZENoYW5nZSgpIG92ZXJyaWRlOwogCg==