138153 2014-10-28 15:15:14 -0700 Remove MediaSessionClient::hasMediaCharacteristics() and MediaSessionClient::mediaStateDidChange() 2014-10-29 10:42:17 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 adachan adachan calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio oldest_to_newest 1044622 0 adachan 2014-10-28 15:15:14 -0700 After http://trac.webkit.org/changeset/175273, Document no longer keeps a set of MediaSessions and it doesn't need to query each MediaSession for its characteristics and play state. MediaSessionClient::hasMediaCharacteristics() is no longer needed and MediaSessionClient::mediaStateDidChange() can be removed if HTMLMediaElement calls Document::updateIsPlayingAudio() after m_playing has changed. 1044636 1 240576 adachan 2014-10-28 16:34:10 -0700 Created attachment 240576 Patch 1044771 2 240576 jer.noble 2014-10-29 10:17:33 -0700 Comment on attachment 240576 Patch r=me, with one nit: The comment you made above is really good, and I'd like to see it in the ChangeLog too. 1044776 3 adachan 2014-10-29 10:42:17 -0700 Thanks Jer. Committed: http://trac.webkit.org/changeset/175330 240576 2014-10-28 16:34:10 -0700 2014-10-29 10:17:33 -0700 Patch 0001-Remove-MediaSessionClient-hasMediaCharacteristics-an.patch text/plain 10493 adachan RnJvbSA2NjNjYzYxZjU1YTc4OTRjZjg2NDVjOGY5NjNlODJmZGMwYzM3YWRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGEgQ2hhbiA8YWRhY2hhbkBhcHBsZS5jb20+CkRhdGU6IFR1 ZSwgMjggT2N0IDIwMTQgMTY6MzM6NDQgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1vdmUgTWVk aWFTZXNzaW9uQ2xpZW50OjpoYXNNZWRpYUNoYXJhY3RlcmlzdGljcygpIGFuZAogTWVkaWFTZXNz aW9uQ2xpZW50OjptZWRpYVN0YXRlRGlkQ2hhbmdlKCkuCiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4MTUzCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCk5v IG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgoKKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwOgooV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKToKQ2FsbCBz ZXRQbGF5aW5nKCkgcmF0aGVyIHRoYW4gc2V0dGluZyBtX3BsYXlpbmcgZGlyZWN0bHkuCihXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRQbGF5aW5nKToKVXBkYXRlIG1fcGxheWluZy4gSWYg aXQgaGFzIGNoYW5nZWQsIGNhbGwgRG9jdW1lbnQ6OnVwZGF0ZUlzUGxheWluZ0F1ZGlvKCkuCihX ZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRQYXVzZWRJbnRlcm5hbCk6CkNhbGwgc2V0UGxh eWluZygpIHJhdGhlciB0aGFuIHNldHRpbmcgbV9wbGF5aW5nIGRpcmVjdGx5LgooV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6aXNQbGF5aW5nQXVkaW8pOgpDYWxsIGlzUGxheWluZygpIGRpcmVj dGx5IHJhdGhlciB0aGFuIGNoZWNraW5nIHRoZSBNZWRpYVNlc3Npb24ncyBzdGF0ZS4KKiBodG1s L0hUTUxNZWRpYUVsZW1lbnQuaDoKKiBwbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uY3BwOgoo V2ViQ29yZTo6TWVkaWFTZXNzaW9uOjpzZXRTdGF0ZSk6Ck1lZGlhU2Vzc2lvbkNsaWVudDo6bWVk aWFTdGF0ZURpZENoYW5nZSgpIGhhcyBiZWVuIHJlbW92ZWQuCihXZWJDb3JlOjpNZWRpYVNlc3Np b246Omhhc01lZGlhQ2hhcmFjdGVyaXN0aWNzKTogRGVsZXRlZC4KKiBwbGF0Zm9ybS9hdWRpby9N ZWRpYVNlc3Npb24uaDoKKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbkNsaWVudDo6bWVkaWFTdGF0ZURp ZENoYW5nZSk6IERlbGV0ZWQuCiogcGxhdGZvcm0vYXVkaW8vaW9zL0F1ZGlvRGVzdGluYXRpb25J T1MuaDoKKiBwbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9EZXN0aW5hdGlvbk1hYy5oOgotLS0KIFNv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMjggKysr KysrKysrKysrKysrKysKIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAg ICAgICAgICAgIHwgMzUgKysrKysrKystLS0tLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmggICAgICAgICAgICAgfCAgMyArLQogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uLmNwcCAgICAgfCAxMSAtLS0tLS0tCiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uaCAgICAgICB8IDExIC0tLS0tLS0K IC4uLi9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9EZXN0aW5hdGlvbklPUy5oICAgICAgIHwgIDEg LQogLi4uL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb0Rlc3RpbmF0aW9uTWFjLmggICAgICAgfCAg MSAtCiA3IGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQ4IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZDIwNTA3Li41NGMzYWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTQtMTAtMjggIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAgICAg UmVtb3ZlIE1lZGlhU2Vzc2lvbkNsaWVudDo6aGFzTWVkaWFDaGFyYWN0ZXJpc3RpY3MoKSBhbmQg TWVkaWFTZXNzaW9uQ2xpZW50OjptZWRpYVN0YXRlRGlkQ2hhbmdlKCkuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgxNTMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2 aW9yIGNoYW5nZS4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUpOgorICAgICAg ICBDYWxsIHNldFBsYXlpbmcoKSByYXRoZXIgdGhhbiBzZXR0aW5nIG1fcGxheWluZyBkaXJlY3Rs eS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldFBsYXlpbmcpOgorICAg ICAgICBVcGRhdGUgbV9wbGF5aW5nLiBJZiBpdCBoYXMgY2hhbmdlZCwgY2FsbCBEb2N1bWVudDo6 dXBkYXRlSXNQbGF5aW5nQXVkaW8oKS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6OnNldFBhdXNlZEludGVybmFsKToKKyAgICAgICAgQ2FsbCBzZXRQbGF5aW5nKCkgcmF0aGVy IHRoYW4gc2V0dGluZyBtX3BsYXlpbmcgZGlyZWN0bHkuCisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50Ojppc1BsYXlpbmdBdWRpbyk6CisgICAgICAgIENhbGwgaXNQbGF5aW5nKCkg ZGlyZWN0bHkgcmF0aGVyIHRoYW4gY2hlY2tpbmcgdGhlIE1lZGlhU2Vzc2lvbidzIHN0YXRlLgor ICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1 ZGlvL01lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb246OnNl dFN0YXRlKToKKyAgICAgICAgTWVkaWFTZXNzaW9uQ2xpZW50OjptZWRpYVN0YXRlRGlkQ2hhbmdl KCkgaGFzIGJlZW4gcmVtb3ZlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbjo6aGFz TWVkaWFDaGFyYWN0ZXJpc3RpY3MpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlv L01lZGlhU2Vzc2lvbi5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uQ2xpZW50Ojpt ZWRpYVN0YXRlRGlkQ2hhbmdlKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9p b3MvQXVkaW9EZXN0aW5hdGlvbklPUy5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL21hYy9B dWRpb0Rlc3RpbmF0aW9uTWFjLmg6CisKIDIwMTQtMTAtMjcgIEFkYSBDaGFuICA8YWRhY2hhbkBh cHBsZS5jb20+CiAKICAgICAgICAgSW50cm9kdWNlIGEgbmV3IGFic3RyYWN0IGNsYXNzIGNhbGxl ZCBBdWRpb1Byb2R1Y2VyIGFuZCBrZWVwIGEgc2V0IG9mIEF1ZGlvUHJvZHVjZXJzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA3MmQ1OTQ3Li44Mjc1MWIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTQ1MzEsMTUgKzQ1 MzEsMTQgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUoKQogICAgICAg ICAgICAgbV9hY3Rpdml0eVRva2VuID0gZG9jdW1lbnQoKS5wYWdlKCktPnBhZ2VUaHJvdHRsZXIo KS5tZWRpYUFjdGl2aXR5VG9rZW4oKTsKIAogICAgICAgICBzdGFydFBsYXliYWNrUHJvZ3Jlc3NU aW1lcigpOwotICAgICAgICBtX3BsYXlpbmcgPSB0cnVlOwotCisgICAgICAgIHNldFBsYXlpbmco dHJ1ZSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKCFwbGF5ZXJQYXVzZWQpCiAgICAgICAg ICAgICBtX3BsYXllci0+cGF1c2UoKTsKICAgICAgICAgcmVmcmVzaENhY2hlZFRpbWUoKTsKIAog ICAgICAgICBtX3BsYXliYWNrUHJvZ3Jlc3NUaW1lci5zdG9wKCk7Ci0gICAgICAgIG1fcGxheWlu ZyA9IGZhbHNlOworICAgICAgICBzZXRQbGF5aW5nKGZhbHNlKTsKICAgICAgICAgTWVkaWFUaW1l IHRpbWUgPSBjdXJyZW50TWVkaWFUaW1lKCk7CiAgICAgICAgIGlmICh0aW1lID4gbV9sYXN0U2Vl a1RpbWUpCiAgICAgICAgICAgICBhZGRQbGF5ZWRSYW5nZShtX2xhc3RTZWVrVGltZSwgdGltZSk7 CkBAIC00NTU4LDYgKzQ1NTcsMTUgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5 U3RhdGUoKQogICAgICAgICByZW5kZXJlcigpLT51cGRhdGVGcm9tRWxlbWVudCgpOwogfQogCit2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFBsYXlpbmcoYm9vbCBwbGF5aW5nKQoreworICAgIGlm IChtX3BsYXlpbmcgPT0gcGxheWluZykKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIG1fcGxh eWluZyA9IHBsYXlpbmc7CisgICAgZG9jdW1lbnQoKS51cGRhdGVJc1BsYXlpbmdBdWRpbygpOwor fQorCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFBhdXNlZEludGVybmFsKGJvb2wgYikKIHsK ICAgICBtX3BhdXNlZEludGVybmFsID0gYjsKQEAgLTQ2NzYsNyArNDY4NCw3IEBAIHZvaWQgSFRN TE1lZGlhRWxlbWVudDo6c3RvcCgpCiAgICAgbV9pbkFjdGl2ZURvY3VtZW50ID0gZmFsc2U7CiAK ICAgICAvLyBTdG9wIHRoZSBwbGF5YmFjayB3aXRob3V0IGdlbmVyYXRpbmcgZXZlbnRzCi0gICAg bV9wbGF5aW5nID0gZmFsc2U7CisgICAgc2V0UGxheWluZyhmYWxzZSk7CiAgICAgc2V0UGF1c2Vk SW50ZXJuYWwodHJ1ZSk7CiAgICAgbV9tZWRpYVNlc3Npb24tPmNsaWVudFdpbGxQYXVzZVBsYXli YWNrKCk7CiAKQEAgLTYwMDUsMjYgKzYwMTMsOSBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6Om92 ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oKSBjb25zdAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBIVE1MTWVkaWFFbGVtZW50OjpoYXNNZWRpYUNoYXJhY3RlcmlzdGlj cyhNZWRpYVNlc3Npb246Ok1lZGlhQ2hhcmFjdGVyaXN0aWNzIGNoYXJhY3RlcmlzdGljcykgY29u c3QKLXsKLSAgICBpZiAoKGNoYXJhY3RlcmlzdGljcyAmIE1lZGlhU2Vzc2lvbjo6TWVkaWFDaGFy YWN0ZXJpc3RpY0F1ZGlibGUpICYmICFoYXNBdWRpbygpKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgaWYgKChjaGFyYWN0ZXJpc3RpY3MgJiBNZWRpYVNlc3Npb246Ok1lZGlhQ2hhcmFjdGVy aXN0aWNWaXN1YWwpICYmICFoYXNWaWRlbygpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg aWYgKChjaGFyYWN0ZXJpc3RpY3MgJiBNZWRpYVNlc3Npb246Ok1lZGlhQ2hhcmFjdGVyaXN0aWNM ZWdpYmxlKSAmJiAhaGFzQ2xvc2VkQ2FwdGlvbnMoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLXZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdGF0 ZURpZENoYW5nZSgpCi17Ci0gICAgZG9jdW1lbnQoKS51cGRhdGVJc1BsYXlpbmdBdWRpbygpOwot fQotCiBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmlzUGxheWluZ0F1ZGlvKCkKIHsKLSAgICByZXR1 cm4gbV9tZWRpYVNlc3Npb24tPnN0YXRlKCkgPT0gTWVkaWFTZXNzaW9uOjpQbGF5aW5nICYmIGhh c0F1ZGlvKCk7CisgICAgcmV0dXJuIGlzUGxheWluZygpICYmIGhhc0F1ZGlvKCk7CiB9CiAKIGJv b2wgSFRNTE1lZGlhRWxlbWVudDo6ZG9lc0hhdmVBdHRyaWJ1dGUoY29uc3QgQXRvbWljU3RyaW5n JiBhdHRyaWJ1dGUsIEF0b21pY1N0cmluZyogdmFsdWUpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IGY0YzI1M2MuLmJkMDNmNDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCkBAIC02NDcsNiArNjQ3LDcgQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgdXBkYXRlVm9sdW1lKCk7CiAgICAgdm9pZCB1cGRhdGVQbGF5U3RhdGUoKTsKKyAg ICB2b2lkIHNldFBsYXlpbmcoYm9vbCk7CiAgICAgYm9vbCBwb3RlbnRpYWxseVBsYXlpbmcoKSBj b25zdDsKICAgICBib29sIGVuZGVkUGxheWJhY2soKSBjb25zdDsKICAgICBib29sIHN0b3BwZWRE dWVUb0Vycm9ycygpIGNvbnN0OwpAQCAtNzA1LDggKzcwNiw2IEBAIHByaXZhdGU6CiAgICAgdmly dHVhbCBib29sIGNhblJlY2VpdmVSZW1vdGVDb250cm9sQ29tbWFuZHMoKSBjb25zdCBvdmVycmlk ZSB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZW1vdGVDb250 cm9sQ29tbWFuZChNZWRpYVNlc3Npb246OlJlbW90ZUNvbnRyb2xDb21tYW5kVHlwZSkgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCBib29sIG92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rp b24oKSBjb25zdCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIGJvb2wgaGFzTWVkaWFDaGFyYWN0ZXJp c3RpY3MoTWVkaWFTZXNzaW9uOjpNZWRpYUNoYXJhY3RlcmlzdGljcykgY29uc3Qgb3ZlcnJpZGU7 Ci0gICAgdmlydHVhbCB2b2lkIG1lZGlhU3RhdGVEaWRDaGFuZ2UoKSBvdmVycmlkZTsKIAogICAg IC8vIEF1ZGlvUHJvZHVjZXIgb3ZlcnJpZGVzCiAgICAgdmlydHVhbCBib29sIGlzUGxheWluZ0F1 ZGlvKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9NZWRpYVNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFT ZXNzaW9uLmNwcAppbmRleCBjM2Q2ZDAwLi41MWZhN2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5jcHAKQEAgLTc2LDEzICs3Niw3IEBAIE1lZGlh U2Vzc2lvbjo6fk1lZGlhU2Vzc2lvbigpCiB2b2lkIE1lZGlhU2Vzc2lvbjo6c2V0U3RhdGUoU3Rh dGUgc3RhdGUpCiB7CiAgICAgTE9HKE1lZGlhLCAiTWVkaWFTZXNzaW9uOjpzZXRTdGF0ZSglcCkg LSAlcyIsIHRoaXMsIHN0YXRlTmFtZShzdGF0ZSkpOwotCi0gICAgaWYgKG1fc3RhdGUgPT0gc3Rh dGUpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fc3RhdGUgPSBzdGF0ZTsKLQotICAgIGNsaWVu dCgpLm1lZGlhU3RhdGVEaWRDaGFuZ2UoKTsKIH0KIAogdm9pZCBNZWRpYVNlc3Npb246OmJlZ2lu SW50ZXJydXB0aW9uKEludGVycnVwdGlvblR5cGUgdHlwZSkKQEAgLTExMywxMSArMTA3LDYgQEAg dm9pZCBNZWRpYVNlc3Npb246OmVuZEludGVycnVwdGlvbihFbmRJbnRlcnJ1cHRpb25GbGFncyBm bGFncykKICAgICB9CiB9CiAKLWJvb2wgTWVkaWFTZXNzaW9uOjpoYXNNZWRpYUNoYXJhY3Rlcmlz dGljcyhNZWRpYVNlc3Npb246Ok1lZGlhQ2hhcmFjdGVyaXN0aWNzIG1lZGlhQ2hhcmFjdGVyaXN0 aWNzKSBjb25zdAotewotICAgIHJldHVybiBjbGllbnQoKS5oYXNNZWRpYUNoYXJhY3RlcmlzdGlj cyhtZWRpYUNoYXJhY3RlcmlzdGljcyk7Ci19Ci0KIGJvb2wgTWVkaWFTZXNzaW9uOjpjbGllbnRX aWxsQmVnaW5QbGF5YmFjaygpCiB7CiAgICAgc2V0U3RhdGUoUGxheWluZyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5oCmluZGV4IDdkYWEwNmMuLmIwNmUw NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lv bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5oCkBA IC03MSwxNCArNzEsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBiZWdpbkludGVycnVwdGlvbihJbnRl cnJ1cHRpb25UeXBlKTsKICAgICB2b2lkIGVuZEludGVycnVwdGlvbihFbmRJbnRlcnJ1cHRpb25G bGFncyk7CiAKLSAgICBlbnVtIE1lZGlhQ2hhcmFjdGVyaXN0aWNGbGFncyB7Ci0gICAgICAgIE1l ZGlhQ2hhcmFjdGVyaXN0aWNBdWRpYmxlID0gMSwKLSAgICAgICAgTWVkaWFDaGFyYWN0ZXJpc3Rp Y1Zpc3VhbCA9IDEgPDwgMSwKLSAgICAgICAgTWVkaWFDaGFyYWN0ZXJpc3RpY0xlZ2libGUgPSAx IDw8IDIsCi0gICAgfTsKLSAgICB0eXBlZGVmIHVuc2lnbmVkIE1lZGlhQ2hhcmFjdGVyaXN0aWNz OwotICAgIGJvb2wgaGFzTWVkaWFDaGFyYWN0ZXJpc3RpY3MoTWVkaWFDaGFyYWN0ZXJpc3RpY3Mp IGNvbnN0OwotCiAgICAgdm9pZCBhcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQoKSBjb25z dDsKICAgICB2b2lkIGFwcGxpY2F0aW9uV2lsbEVudGVyQmFja2dyb3VuZCgpIGNvbnN0OwogCkBA IC0xNDcsOSArMTM5LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIG92ZXJyaWRlQmFj a2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oKSBjb25zdCA9IDA7CiAKLSAgICB2aXJ0dWFsIGJv b2wgaGFzTWVkaWFDaGFyYWN0ZXJpc3RpY3MoTWVkaWFTZXNzaW9uOjpNZWRpYUNoYXJhY3Rlcmlz dGljcykgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBtZWRpYVN0YXRlRGlkQ2hhbmdlKCkg eyB9Ci0KICAgICB2aXJ0dWFsIHZvaWQgd2lyZWxlc3NSb3V0ZXNBdmFpbGFibGVEaWRDaGFuZ2Uo KSB7IH0KIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vaW9zL0F1ZGlvRGVzdGluYXRpb25JT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2F1ZGlvL2lvcy9BdWRpb0Rlc3RpbmF0aW9uSU9TLmgKaW5kZXggM2ZkZWZmZS4uNzQ3ZTgwZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL0F1ZGlvRGVzdGlu YXRpb25JT1MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9E ZXN0aW5hdGlvbklPUy5oCkBAIC02Miw3ICs2Miw2IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBi b29sIG92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBwYXVzZVBsYXliYWNrKCkgb3ZlcnJpZGUgeyBz dG9wKCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVzdW1lUGxheWJhY2soKSBvdmVycmlkZSB7IHN0 YXJ0KCk7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaGFzTWVkaWFDaGFyYWN0ZXJpc3RpY3MoTWVkaWFT ZXNzaW9uOjpNZWRpYUNoYXJhY3RlcmlzdGljcyBjaGFyYWN0ZXJpc3RpY3MpIGNvbnN0IG92ZXJy aWRlIHsgcmV0dXJuIGNoYXJhY3RlcmlzdGljcyA9PSBNZWRpYVNlc3Npb246Ok1lZGlhQ2hhcmFj dGVyaXN0aWNBdWRpYmxlOyB9CiAKICAgICAvLyBEZWZhdWx0T3V0cHV0VW5pdCBjYWxsYmFjawog ICAgIHN0YXRpYyBPU1N0YXR1cyBpbnB1dFByb2Modm9pZCogdXNlckRhdGEsIEF1ZGlvVW5pdFJl bmRlckFjdGlvbkZsYWdzKiwgY29uc3QgQXVkaW9UaW1lU3RhbXAqLCBVSW50MzIgYnVzTnVtYmVy LCBVSW50MzIgbnVtYmVyT2ZGcmFtZXMsIEF1ZGlvQnVmZmVyTGlzdCogaW9EYXRhKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb0Rlc3RpbmF0aW9u TWFjLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9EZXN0aW5hdGlv bk1hYy5oCmluZGV4IDJiMDI4ZjIuLjFmY2Y5NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb0Rlc3RpbmF0aW9uTWFjLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvRGVzdGluYXRpb25NYWMuaApAQCAtNTcsNyAr NTcsNiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBjYW5SZWNlaXZlUmVtb3RlQ29udHJv bENvbW1hbmRzKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFs IHZvaWQgZGlkUmVjZWl2ZVJlbW90ZUNvbnRyb2xDb21tYW5kKE1lZGlhU2Vzc2lvbjo6UmVtb3Rl Q29udHJvbENvbW1hbmRUeXBlKSBvdmVycmlkZSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgb3ZlcnJp ZGVCYWNrZ3JvdW5kUGxheWJhY2tSZXN0cmljdGlvbigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJu IGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGhhc01lZGlhQ2hhcmFjdGVyaXN0aWNzKE1lZGlh U2Vzc2lvbjo6TWVkaWFDaGFyYWN0ZXJpc3RpY3MgY2hhcmFjdGVyaXN0aWNzKSBjb25zdCBvdmVy cmlkZSB7IHJldHVybiBjaGFyYWN0ZXJpc3RpY3MgPT0gTWVkaWFTZXNzaW9uOjpNZWRpYUNoYXJh Y3RlcmlzdGljQXVkaWJsZTsgfQogCiAgICAgdmlydHVhbCB2b2lkIHN0YXJ0KCkgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCB2b2lkIHN0b3AoKSBvdmVycmlkZTsKLS0gCjEuOS4zIChBcHBsZSBHaXQt NTApCgo=