224818 2021-04-20 09:25:29 -0700 [Media] Allow access to MediaElement id from MediaPlayerPrivate 2021-04-24 15:03:27 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris cdumez cgarcia changseok eric.carlson esprehn+autocc ews-watchlist glenn gustavo gyuyoung.kim jer.noble menard philipj sergio vjaquez webkit-bug-importer oldest_to_newest 1752288 0 pnormand 2021-04-20 09:25:29 -0700 That could be useful for accurate naming of the internal player/pipeline in the MediaPlayerPrivate. 1752290 1 426556 pnormand 2021-04-20 09:31:14 -0700 Created attachment 426556 Patch 1753515 2 ews-feeder 2021-04-23 02:46:09 -0700 Committed r276493 (236952@main): <https://commits.webkit.org/236952@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426556. 1753561 3 pnormand 2021-04-23 06:31:28 -0700 Follow-up in r276495. 1753905 4 webkit-bug-importer 2021-04-24 15:03:27 -0700 <rdar://problem/77110035> 426556 2021-04-20 09:31:14 -0700 2021-04-23 02:46:11 -0700 Patch bug-224818-20210420093113.patch text/plain 11263 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjFlNTNiNDBjYjRkYjQw YTk2MWJlY2U0OWU5Y2ViNzdkMzQ4Mzc2Yy4uMGQzY2NlZjQxN2JjZjgyMTE3YTAxNjczMjgwM2Fm YTA2YWJmY2RjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA0LTIwICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbTWVkaWFdIEFs bG93IGFjY2VzcyB0byBNZWRpYUVsZW1lbnQgaWQgZnJvbSBNZWRpYVBsYXllclByaXZhdGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDgxOAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgbmV3IG1ldGhv ZCBpcyBhZGRlZCBpbiB0aGUgTWVkaWFQbGF5ZXIgYWxsb3dpbmcgdG8gcXVlcnkgdGhlIGNsaWVu dCBtZWRpYSBlbGVtZW50IGZvciBpdHMKKyAgICAgICAgaWRlbnRpZmllci4gVGhhdCBjb3VsZCBi ZSB1c2VmdWwgZm9yIGFjY3VyYXRlIG5hbWluZyBvZiB0aGUgaW50ZXJuYWwgcGxheWVyL3BpcGVs aW5lIGluIHRoZQorICAgICAgICBNZWRpYVBsYXllclByaXZhdGUuIElmIG5vIHNwZWNpZmljIGlk IHdhcyBzZXQgb24gdGhlIG1lZGlhIGVsZW1lbnQgdGhlbiB0aGUgaWQgaXMgZW1wdHkKKyAgICAg ICAgc3RyaW5nIGFuZCB0aGUgTWVkaWFQbGF5ZXJQcml2YXRlIG5lZWRzIHRvIGhhbmRsZSB0aGF0 IGJ5IGZvcmdpbmcgYSB1bmlxdWUgaWQuCisKKyAgICAgICAgVGhpcyBhbHNvIGxlYWQgbWUgdG8g c2ltcGxpZnkgcGlwZWxpbmUtcmVsYXRlZCBjb2RlIGluIHRoZSBHU3RyZWFtZXIgcGxheWVyLiBU aGUgcGxheWVyIGNhbgorICAgICAgICBoYW5kbGUgb25seSBvbmUgcGlwZWxpbmUgaW4gaXRzIGVu dGlyZSBsaWZlLXRpbWUgc28gdGhlIGNvZGUgaGFuZGxpbmcgcGlwZWxpbmUgInJlLWxvYWRpbmci CisgICAgICAgIHdhcyBhY3R1YWxseSBuZXZlciBoaXQuCisKKyAgICAgICAgKiBodG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGFy c2VBdHRyaWJ1dGUpOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyOjplbGVtZW50SWQgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllckNsaWVudDo6 bWVkaWFQbGF5ZXJFbGVtZW50SWQgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlR1NUUGxheUJpbik6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWRGdWxsKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0 UGlwZWxpbmUpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoKKwogMjAyMS0wNC0yMCAgS2ltbW8gS2lu bnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEF1ZGlvU291cmNlUHJvdmlk ZXJBVkZPYmpDIHVzZXMgYXRvbWljIHZhcmlhYmxlcyBidXQgYWxzbyBsb2NrcyB3aXRoIG11dGV4 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCAzMjU4ZWZkZjQx ZmJiNzZmYWY4ODk3ZjA0YmZlMWE3Y2JmYjg2NzcyLi5jNzM5ZTI2MTU0NzQyYWQ1OGUyMzlmYjQ1 NTk1MGI3MzI0NDdkOWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKQEAgLTcxMiw2ICs3MTIsOSBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmlzSW50ZXJhY3Rp dmVDb250ZW50KCkgY29uc3QKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpwYXJzZUF0dHJpYnV0 ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tU3RyaW5nJiB2YWx1ZSkKIHsK KyAgICBpZiAobmFtZSA9PSBpZEF0dHIpCisgICAgICAgIG1faWQgPSB2YWx1ZTsKKwogICAgIGlm IChuYW1lID09IHNyY0F0dHIpIHsKICAgICAgICAgLy8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdn Lm9yZy9tdWx0aXBhZ2UvZW1iZWRkZWQtY29udGVudC5odG1sI2xvY2F0aW9uLW9mLXRoZS1tZWRp YS1yZXNvdXJjZQogICAgICAgICAvLyBMb2NhdGlvbiBvZiB0aGUgTWVkaWEgUmVzb3VyY2UKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXggNjQ3MjRlYmI5NGViYjc2NTE4 YzdmNDA2OTI1ZjkyMWY2MTE3Mzg1OS4uODU4OWJhMjY3MTk0MWE5NmU4MmQyMDQ5ODA3OTNmZDE1 ZjI2NThmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKQEAgLTcyNiw2 ICs3MjYsOCBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtZWRpYVBsYXllclNvdXJjZUFwcGxpY2F0 aW9uSWRlbnRpZmllcigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHNvdXJjZUFwcGxpY2F0aW9u SWRlbnRpZmllcigpOyB9CiAgICAgVmVjdG9yPFN0cmluZz4gbWVkaWFQbGF5ZXJQcmVmZXJyZWRB dWRpb0NoYXJhY3RlcmlzdGljcygpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgU3RyaW5nIG1lZGlh UGxheWVyRWxlbWVudElkKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9pZDsgfQorCiAjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBTdHJpbmcgbWVkaWFQbGF5ZXJOZXR3b3JrSW50ZXJm YWNlTmFtZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgbWVkaWFQbGF5ZXJHZXRSYXdDb29r aWVzKGNvbnN0IFVSTCYsIE1lZGlhUGxheWVyQ2xpZW50OjpHZXRSYXdDb29raWVzQ2FsbGJhY2sm JikgY29uc3QgZmluYWw7CkBAIC0xMTk2LDYgKzExOTgsNyBAQCBwcml2YXRlOgogI2lmIEVOQUJM RShNRURJQV9TVFJFQU0pCiAgICAgU3RyaW5nIG1fYXVkaW9PdXRwdXRIYXNoZWREZXZpY2VJZDsK ICNlbmRpZgorICAgIFN0cmluZyBtX2lkOwogfTsKIAogU3RyaW5nIGNvbnZlcnRFbnVtZXJhdGlv blRvU3RyaW5nKEhUTUxNZWRpYUVsZW1lbnQ6OkF1dG9wbGF5RXZlbnRQbGF5YmFja1N0YXRlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApp bmRleCAzZjRiYzBkNThkNmExNDc2ZmM0MDBmNGIwM2U0ZWFkMmRjYmZhY2QyLi4yMzA2ZGY2YzU1 ZjFmZWVlN2U1NGU0Mjk4YmU1Zjk1MDA0MzBjZDliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCkBAIC0xNjY5LDYgKzE2NjksMTEgQEAg TWVkaWFQbGF5ZXJJZGVudGlmaWVyIE1lZGlhUGxheWVyOjppZGVudGlmaWVyKCkgY29uc3QKICAg ICByZXR1cm4gbV9wcml2YXRlLT5pZGVudGlmaWVyKCk7CiB9CiAKK1N0cmluZyBNZWRpYVBsYXll cjo6ZWxlbWVudElkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gY2xpZW50KCkubWVkaWFQbGF5ZXJF bGVtZW50SWQoKTsKK30KKwogI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogY29uc3QgTG9nZ2Vy JiBNZWRpYVBsYXllcjo6bWVkaWFQbGF5ZXJMb2dnZXIoKQogewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKaW5kZXggZWIyMzFlNmM3ODJkMmYzMGM4 Y2RlZGE4YjIyMTU0YjlkZmI2ZTdiMi4uMTA4NjkyODEyODRjZDJjMGQwMDJjNjRhZDUyY2Y2ODFj MTcwODc3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVk aWFQbGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5oCkBAIC0yNTgsNiArMjU4LDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBTdHJpbmcg bWVkaWFQbGF5ZXJTb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBl bXB0eVN0cmluZygpOyB9CiAKKyAgICB2aXJ0dWFsIFN0cmluZyBtZWRpYVBsYXllckVsZW1lbnRJ ZCgpIGNvbnN0IHsgcmV0dXJuIGVtcHR5U3RyaW5nKCk7IH0KKwogICAgIHZpcnR1YWwgdm9pZCBt ZWRpYVBsYXllckVuZ2luZUZhaWxlZFRvTG9hZCgpIGNvbnN0IHsgfQogCiAgICAgdmlydHVhbCBk b3VibGUgbWVkaWFQbGF5ZXJSZXF1ZXN0ZWRQbGF5YmFja1JhdGUoKSBjb25zdCB7IHJldHVybiAw OyB9CkBAIC01NDksNiArNTUxLDggQEAgcHVibGljOgogICAgIFN0cmluZyBlbmdpbmVEZXNjcmlw dGlvbigpIGNvbnN0OwogICAgIGxvbmcgcGxhdGZvcm1FcnJvckNvZGUoKSBjb25zdDsKIAorICAg IFN0cmluZyBlbGVtZW50SWQoKSBjb25zdDsKKwogICAgIENhY2hlZFJlc291cmNlTG9hZGVyKiBj YWNoZWRSZXNvdXJjZUxvYWRlcigpOwogICAgIFJlZlB0cjxQbGF0Zm9ybU1lZGlhUmVzb3VyY2VM b2FkZXI+IGNyZWF0ZVJlc291cmNlTG9hZGVyKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggNDIzYmY4NTY1YjNlZDJmOGY3YTY2NDFh Zjg2ZmNkNmRjZmNlMGM2OC4uNzI1NGM5NGE1N2M1ZTkzNWZkZjJhNzVkOTg2Y2Q0MDExMmVjMTgy ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK QEAgLTMwMiw3ICszMDIsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cmVn aXN0ZXJNZWRpYUVuZ2luZShNZWRpYUVuZ2luZVJlZ2lzdHJhciByZWdpcwogICAgIHJlZ2lzdHJh cihtYWtlVW5pcXVlPE1lZGlhUGxheWVyRmFjdG9yeUdTdHJlYW1lcj4oKSk7CiB9CiAKLXZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkRnVsbChjb25zdCBTdHJpbmcmIHVybFN0 cmluZywgY29uc3QgU3RyaW5nJiBwaXBlbGluZU5hbWUpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6bG9hZChjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKICAgICBVUkwgdXJs KFVSTCgpLCB1cmxTdHJpbmcpOwogICAgIGlmICh1cmwucHJvdG9jb2xJc0Fib3V0KCkpIHsKQEAg LTMxOCw3ICszMTgsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZEZ1 bGwoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZwogICAgIHJlZ2lzdGVyV2Vi S2l0R1N0cmVhbWVyRWxlbWVudHMoKTsKIAogICAgIGlmICghbV9waXBlbGluZSkKLSAgICAgICAg Y3JlYXRlR1NUUGxheUJpbih1cmwsIHBpcGVsaW5lTmFtZSk7CisgICAgICAgIGNyZWF0ZUdTVFBs YXlCaW4odXJsKTsKICAgICBzeW5jT25DbG9jayh0cnVlKTsKICAgICBpZiAobV9maWxsVGltZXIu aXNBY3RpdmUoKSkKICAgICAgICAgbV9maWxsVGltZXIuc3RvcCgpOwpAQCAtMzQ2LDExICszNDYs NiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZEZ1bGwoY29uc3QgU3Ry aW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZwogICAgICAgICBjb21taXRMb2FkKCk7CiB9CiAK LXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJs U3RyaW5nKQotewotICAgIGxvYWRGdWxsKHVybFN0cmluZywgU3RyaW5nKCkpOwotfQotCiAjaWYg RU5BQkxFKE1FRElBX1NPVVJDRSkKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjps b2FkKGNvbnN0IFVSTCYsIGNvbnN0IENvbnRlbnRUeXBlJiwgTWVkaWFTb3VyY2VQcml2YXRlQ2xp ZW50KikKIHsKQEAgLTM2NCwxMCArMzU5LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OmxvYWQoY29uc3QgVVJMJiwgY29uc3QgQ29udGVudFR5cGUmLCBNZWRpYVNvdXIKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKE1lZGlhU3RyZWFtUHJpdmF0ZSYg c3RyZWFtKQogewogICAgIG1fc3RyZWFtUHJpdmF0ZSA9ICZzdHJlYW07Ci0gICAgc3RhdGljIEF0 b21pYzx1aW50MzJfdD4gcGlwZWxpbmVJZDsKLSAgICBhdXRvIHBpcGVsaW5lTmFtZSA9IG1ha2VT dHJpbmcoIm1lZGlhc3RyZWFtLSIsIHBpcGVsaW5lSWQuZXhjaGFuZ2VBZGQoMSkpOwotCi0gICAg bG9hZEZ1bGwoU3RyaW5nKCJtZWRpYXN0cmVhbTovLyIpICsgc3RyZWFtLmlkKCksIHBpcGVsaW5l TmFtZSk7CisgICAgbG9hZChTdHJpbmcoIm1lZGlhc3RyZWFtOi8vIikgKyBzdHJlYW0uaWQoKSk7 CiAgICAgc3luY09uQ2xvY2soZmFsc2UpOwogCiAgICAgbV9wbGF5ZXItPnBsYXkoKTsKQEAgLTE1 NDMsMTcgKzE1MzUsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dmlkZW9D aGFuZ2VkQ2FsbGJhY2soTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbQogICAgIH0pOwogfQogCi12 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UGlwZWxpbmUoR3N0RWxlbWVudCog cGlwZWxpbmUpCi17Ci0gICAgaWYgKCFwaXBlbGluZSkgewotICAgICAgICBHU1RfV0FSTklORygi UGxheWJpbiBub3QgZm91bmQsIG1ha2Ugc3VyZSB0byBpbnN0YWxsIGdzdC1wbHVnaW5zLWJhc2Ui KTsKLSAgICAgICAgbG9hZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpGb3Jt YXRFcnJvciwgTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGU6OkhhdmVOb3RoaW5nLCB0cnVlKTsKLSAg ICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG1fcGlwZWxpbmUgPSBwaXBlbGluZTsKLX0KLQog dm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZVN0cmVhbUNvbGxlY3Rpb25N ZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiB7CiAgICAgaWYgKG1faXNMZWdhY3lQbGF5Ymlu KQpAQCAtMjY5NSw3ICsyNjc2LDcgQEAgc3RhdGljIHZvaWQgc2V0UGxheWJhY2tGbGFncyhHc3RF bGVtZW50KiBwaXBlbGluZSkKICAgICBHU1RfREVCVUdfT0JKRUNUKHBpcGVsaW5lLCAiY3VycmVu dCBwaXBlbGluZSBmbGFncyAleCIsIGZsYWdzKTsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OmNyZWF0ZUdTVFBsYXlCaW4oY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmlu ZyYgcGlwZWxpbmVOYW1lKQordm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0 ZUdTVFBsYXlCaW4oY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgR1NUX0lORk8oIkNyZWF0aW5nIHBp cGVsaW5lIGZvciAlcyBwbGF5ZXIiLCBtX3BsYXllci0+aXNWaWRlb1BsYXllcigpID8gInZpZGVv IiA6ICJhdWRpbyIpOwogICAgIGNvbnN0IGNoYXIqIHBsYXliaW5OYW1lID0gInBsYXliaW4iOwpA QCAtMjcwNywyNSArMjY4OCwyNSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 Y3JlYXRlR1NUUGxheUJpbihjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJgogICAgIGlmICgo IWlzTWVkaWFTb3VyY2UoKSAmJiB1c2VQbGF5YmluMyAmJiBlcXVhbCh1c2VQbGF5YmluMywgIjEi KSkgfHwgdXJsLnByb3RvY29sSXMoIm1lZGlhc3RyZWFtIikpCiAgICAgICAgIHBsYXliaW5OYW1l ID0gInBsYXliaW4zIjsKIAotICAgIGlmIChtX3BpcGVsaW5lKSB7Ci0gICAgICAgIGlmICghZ19z dHJjbXAwKEdTVF9PQkpFQ1RfTkFNRShnc3RfZWxlbWVudF9nZXRfZmFjdG9yeShtX3BpcGVsaW5l LmdldCgpKSksIHBsYXliaW5OYW1lKSkgewotICAgICAgICAgICAgR1NUX0lORk9fT0JKRUNUKHBp cGVsaW5lKCksICJBbHJlYWR5IHVzaW5nICVzIiwgcGxheWJpbk5hbWUpOwotICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9CisgICAgQVNTRVJUKCFtX3BpcGVsaW5lKTsKIAotICAgICAgICBH U1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIlRlYXJpbmcgZG93biBhcyB3ZSBuZWVkIHRvIHVz ZSAlcyBub3cuIiwgcGxheWJpbk5hbWUpOwotICAgICAgICBjaGFuZ2VQaXBlbGluZVN0YXRlKEdT VF9TVEFURV9OVUxMKTsKLSAgICAgICAgbV9waXBlbGluZSA9IG51bGxwdHI7Ci0gICAgICAgIG1f YXVkaW9TaW5rID0gbnVsbHB0cjsKLSAgICB9CisgICAgYXV0byBlbGVtZW50SWQgPSBtX3BsYXll ci0+ZWxlbWVudElkKCk7CisgICAgaWYgKGVsZW1lbnRJZC5pc0VtcHR5KCkpCisgICAgICAgIGVs ZW1lbnRJZCA9ICJtZWRpYS1wbGF5ZXIiOwogCi0gICAgQVNTRVJUKCFtX3BpcGVsaW5lKTsKKyAg ICBjb25zdCBjaGFyKiB0eXBlID0gaXNNZWRpYVNvdXJjZSgpID8gIk1TRS0iIDogdXJsLnByb3Rv Y29sSXMoIm1lZGlhc3RyZWFtIikgPyAibWVkaWFzdHJlYW0tIiA6ICIiOwogCiAgICAgbV9pc0xl Z2FjeVBsYXliaW4gPSAhZ19zdHJjbXAwKHBsYXliaW5OYW1lLCAicGxheWJpbiIpOwogCiAgICAg c3RhdGljIEF0b21pYzx1aW50MzJfdD4gcGlwZWxpbmVJZDsKLSAgICBzZXRQaXBlbGluZShnc3Rf ZWxlbWVudF9mYWN0b3J5X21ha2UocGxheWJpbk5hbWUsCi0gICAgICAgIChwaXBlbGluZU5hbWUu aXNFbXB0eSgpID8gbWFrZVN0cmluZygibWVkaWEtcGxheWVyLSIsIHBpcGVsaW5lSWQuZXhjaGFu Z2VBZGQoMSkpIDogcGlwZWxpbmVOYW1lKS51dGY4KCkuZGF0YSgpKSk7CisKKyAgICBtX3BpcGVs aW5lID0gYWRvcHRHUmVmKGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZShwbGF5YmluTmFtZSwgbWFr ZVN0cmluZyh0eXBlLCBlbGVtZW50SWQsICctJywgcGlwZWxpbmVJZC5leGNoYW5nZUFkZCgxKSku YXNjaWkoKS5kYXRhKCkpKTsKKyAgICBpZiAoIW1fcGlwZWxpbmUpIHsKKyAgICAgICAgR1NUX1dB Uk5JTkcoIiVzIG5vdCBmb3VuZCwgbWFrZSBzdXJlIHRvIGluc3RhbGwgZ3N0LXBsdWdpbnMtYmFz ZSIsIHBsYXliaW5OYW1lKTsKKyAgICAgICAgbG9hZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0 d29ya1N0YXRlOjpGb3JtYXRFcnJvciwgTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGU6OkhhdmVOb3Ro aW5nLCB0cnVlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIHNldFN0cmVhbVZvbHVt ZUVsZW1lbnQoR1NUX1NUUkVBTV9WT0xVTUUobV9waXBlbGluZS5nZXQoKSkpOwogCiAgICAgR1NU X0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJVc2luZyBsZWdhY3kgcGxheWJpbiBlbGVtZW50OiAl cyIsIGJvb2xGb3JQcmludGluZyhtX2lzTGVnYWN5UGxheWJpbikpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IGZkN2ZmNDE2ZWRiNjFmZmQ2MjQ4 MDU3Mzc3Mjk2MTcyMzgyMGE2MDUuLmQ0MjFlYzc0MWE2ZGVkZDg4YWI3N2U0ZTdiN2QxYzNhNTY0 NTMzYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgK QEAgLTI4MCw3ICsyODAsNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIHNldFN0cmVhbVZvbHVt ZUVsZW1lbnQoR3N0U3RyZWFtVm9sdW1lKik7CiAKLSAgICB2b2lkIHNldFBpcGVsaW5lKEdzdEVs ZW1lbnQqKTsKICAgICBHc3RFbGVtZW50KiBwaXBlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGlw ZWxpbmUuZ2V0KCk7IH0KIAogICAgIHZvaWQgcmVwYWludCgpOwpAQCAtNDExLDcgKzQxMCw3IEBA IHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlcygpOwogICAgIHZpcnR1YWwg dm9pZCBhc3luY1N0YXRlQ2hhbmdlRG9uZSgpOwogCi0gICAgdm9pZCBjcmVhdGVHU1RQbGF5Qmlu KGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYgcGlwZWxpbmVOYW1lKTsKKyAgICB2b2lkIGNyZWF0 ZUdTVFBsYXlCaW4oY29uc3QgVVJMJik7CiAKICAgICBib29sIGxvYWROZXh0TG9jYXRpb24oKTsK ICAgICB2b2lkIG1lZGlhTG9jYXRpb25DaGFuZ2VkKEdzdE1lc3NhZ2UqKTsKQEAgLTQ0Myw3ICs0 NDIsNiBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRvd25sb2FkQnVmZmVyRmlsZUNyZWF0 ZWRDYWxsYmFjayhNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIqKTsKIAogICAgIHZvaWQgc2V0 UGxheWJpblVSTChjb25zdCBVUkwmIHVybFN0cmluZyk7Ci0gICAgdm9pZCBsb2FkRnVsbChjb25z dCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBwaXBlbGluZU5hbWUpOwogCiAgICAgdm9pZCB1 cGRhdGVUcmFja3MoY29uc3QgR1JlZlB0cjxHc3RTdHJlYW1Db2xsZWN0aW9uPiYpOwogICAgIHZv aWQgdmlkZW9TaW5rQ2Fwc0NoYW5nZWQoR3N0UGFkKik7Cg==