137645 2014-10-11 21:28:44 -0700 [iOS] Refactor AirPlay monitoring code 2014-10-13 17:22:59 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson calvaris commit-queue esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio oldest_to_newest 1041183 0 eric.carlson 2014-10-11 21:28:44 -0700 HTMLMediaElement tells the media session manager to start and stop monitoring for AirPlay routes without considering other media elements. Refactor the AirPlay monitoring code in MediaSessionManageriOS so it works correctly when Safari has more than one tab with a media element. 1041184 1 eric.carlson 2014-10-11 21:29:18 -0700 <rdar://problem/18444817> 1041189 2 239700 eric.carlson 2014-10-11 22:08:50 -0700 Created attachment 239700 Proposed patch. 1041423 3 239700 commit-queue 2014-10-13 17:22:55 -0700 Comment on attachment 239700 Proposed patch. Clearing flags on attachment: 239700 Committed r174666: <http://trac.webkit.org/changeset/174666> 1041424 4 commit-queue 2014-10-13 17:22:59 -0700 All reviewed patches have been landed. Closing bug. 239700 2014-10-11 22:08:50 -0700 2014-10-13 17:22:55 -0700 Proposed patch. media_element_session_patch_5.txt text/plain 12743 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NDYzNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU2IEBACisyMDE0LTEwLTExICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFJlZmFjdG9y IEFpclBsYXkgbW9uaXRvcmluZyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzc2NDUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4NDQ0ODE3 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFj dG9yIEFpclBsYXkgcm91dGUgY2hhbmdlIG1vbml0b3JpbmcgY29kZToKKyAgICAgICAgKyBIYXZl IE1lZGlhU2Vzc2lvbk1hbmFnZXIgcmVnaXN0ZXIvdW5yZWdpc3RlciBmb3Igcm91dGUgY2hhbmdl cyBkZXBlbmRpbmcgb24gdGhlIHN0YXRlIG9mCisgICAgICAgICAgICBhbGwgc2Vzc2lvbnMgc28g aXQgZG9lcyB0aGUgcmlnaHQgdGhpbmcgd2hlbiB0aGVyZSBpcyBtb3JlIHRoYW4gb25lIG1lZGlh IGVsZW1lbnQuCisgICAgICAgICsgTWFrZSBIVE1MTWVkaWFFbGVtZW50IHVucmVnaXN0ZXIgd2l0 aCBNZWRpYVNlc3Npb24gYXMgc29vbiBhcyB0aGUgbWVkaWEgcGxheWVyIGlzIGNsZWFyZWQKKyAg ICAgICAgICAgIGJlY2F1c2UgdGhlcmUgY2FuIGJlIG5vIHdpcmVsZXNzIHBsYXliYWNrIHdpdGhv dXQgYSBwbGF5ZXIuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1lbnQpOiBDYWxs IG1lZGlhU2Vzc2lvbi0+c2V0SGFzUGxheWJhY2tUYXJnZXRBdmFpbGFiaWxpdHlMaXN0ZW5lcnMK KyAgICAgICAgICAgIHdoZW4gdGhlcmUgYXJlIHRhcmdldCBhdmFpbGFiaWxpdHkgY2hhbmdlZCBs aXN0ZW5lcnMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlh UGxheWVyKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp3aXJl bGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZSk6IE5ldywgbWVkaWEgc2Vzc2lvbiBjbGllbnQg bWV0aG9kLgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorCisgICAgICAgICog aHRtbC9IVE1MTWVkaWFTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYVNl c3Npb246OkhUTUxNZWRpYVNlc3Npb24pOiBJbml0aWFsaXplIG1faGFzUGxheWJhY2tUYXJnZXRB dmFpbGFiaWxpdHlMaXN0ZW5lcnMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFTZXNzaW9u OjpzZXRIYXNQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUxpc3RlbmVycyk6IFJlbWVtYmVyIHdo ZXRoZXIgb3Igbm90CisgICAgICAgICAgICB0aGUgY2xpZW50IGhhcyBhIHRhcmdldCBhdmFpbGFi aWxpdHkgbGlzdGVuZXIgYW5kIHRlbGwgdGhlIG1lZGlhIHNlc3Npb24gbWFuYWdlciB0byByZWNv bmZpZ3VyZQorICAgICAgICAgICAgaXRzZWxmIGluc3RlYWQgb2YgdGVsbGluZyBpdCB0byBzdGFy dCBvciBzdG9wIGxpc3RlbmluZyBmb3Igcm91dGUgY2hhbmdlcyBzbyBpdCBkb2VzIHRoZSAKKyAg ICAgICAgICAgIHJpZ2h0IHRoaW5nIHdoZW4gdGhlcmUgaXMgbW9yZSB0aGFuIG9uZSBtZWRpYSBl bGVtZW50LgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhU2Vzc2lvbi5oOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhU2Vzc2lvbjo6cmVxdWlyZXNQbGF5YmFja1RhcmdldFJvdXRlTW9uaXRv cmluZyk6IFJldHVybiB0cnVlIHdoZW4gdGhlIGNsaWVudCAKKyAgICAgICAgICAgIGhhcyBhIHRh cmdldCBhdmFpbGFiaWxpdHkgbGlzdGVuZXIsIGZhbHNlIG90aGVyd2lzZS4KKworICAgICAgICAq IHBsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVNlc3Npb246OndpcmVsZXNzUm91dGVzQXZhaWxhYmxlRGlkQ2hhbmdlKTogSW5mb3JtIHRoZSBj bGllbnQgdGhhdCByb3V0ZXMgaGF2ZSBjaGFuZ2VkLgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlv L01lZGlhU2Vzc2lvbi5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uOjpyZXF1aXJl c1BsYXliYWNrVGFyZ2V0Um91dGVNb25pdG9yaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh U2Vzc2lvbkNsaWVudDo6d2lyZWxlc3NSb3V0ZXNBdmFpbGFibGVEaWRDaGFuZ2UpOgorCisgICAg ICAgICogcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVNlc3Npb25NYW5hZ2VyOjp3aXJlbGVzc1JvdXRlc0F2YWlsYWJsZUNoYW5n ZWQpOiBJbXBsZW1lbnQgaXQuCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9u TWFuYWdlci5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlcjo6Y29uZmln dXJlV2lyZUxlc3NUYXJnZXRNb25pdG9yaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vz c2lvbk1hbmFnZXI6Omhhc1dpcmVsZXNzVGFyZ2V0c0F2YWlsYWJsZSk6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXNzaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVNlc3Npb25NYW5hZ2VyOjpzdGFydE1vbml0b3JpbmdBaXJQbGF5Um91dGVzKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1hbmFnZXI6OnN0b3BNb25pdG9yaW5n QWlyUGxheVJvdXRlcyk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9pb3Mv TWVkaWFTZXNzaW9uTWFuYWdlcklPUy5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2lvcy9N ZWRpYVNlc3Npb25NYW5hZ2VySU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9u TWFuYWdlcmlPUzo6Y29uZmlndXJlV2lyZUxlc3NUYXJnZXRNb25pdG9yaW5nKTogU3RhcnQgb3Ig c3RvcCBtb25pdG9yaW5nCisgICAgICAgICAgICBmb3Igcm91dGUgY2hhbmdlcyBkZXBlbmRpbmcg b24gY2xpZW50IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlcmlP Uzo6c3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRlcyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpNZWRpYVNlc3Npb25NYW5hZ2VyaU9TOjpzdG9wTW9uaXRvcmluZ0FpclBsYXlSb3V0ZXMp OiBEZWxldGVkLgorCiAyMDE0LTEwLTExICBLd2FuZ0h5dWsgS2ltICA8aHl1a2kua2ltQHNhbXN1 bmcuY29tPgogCiAgICAgICAgIFtFRkxdIEVuYWJsZSBXZWJQIHN1cHBvcnQuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDE3NDM4NSkKKysr IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM5Niw3ICszOTYsNyBAQCBIVE1MTWVkaWFFbGVtZW50Ojp+SFRNTE1lZGlhRWxlbWVudCgp CiAjZW5kaWYKIAogI2lmIEVOQUJMRShJT1NfQUlSUExBWSkKLSAgICBpZiAoIWhhc0V2ZW50TGlz dGVuZXJzKGV2ZW50TmFtZXMoKS53ZWJraXRwbGF5YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5n ZWRFdmVudCkpCisgICAgaWYgKGhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50TmFtZXMoKS53ZWJraXRw bGF5YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5nZWRFdmVudCkpCiAgICAgICAgIG1fbWVkaWFT ZXNzaW9uLT5zZXRIYXNQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUxpc3RlbmVycygqdGhpcywg ZmFsc2UpOwogI2VuZGlmCiAKQEAgLTQ2NDAsNiArNDY0MCwxMSBAQCB2b2lkIEhUTUxNZWRpYUVs ZW1lbnQ6OmNsZWFyTWVkaWFQbGF5ZXIoCiAgICAgY2xvc2VNZWRpYVNvdXJjZSgpOwogI2VuZGlm CiAKKyNpZiBFTkFCTEUoSU9TX0FJUlBMQVkpCisgICAgaWYgKGhhc0V2ZW50TGlzdGVuZXJzKGV2 ZW50TmFtZXMoKS53ZWJraXRwbGF5YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5nZWRFdmVudCkp CisgICAgICAgIG1fbWVkaWFTZXNzaW9uLT5zZXRIYXNQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0 eUxpc3RlbmVycygqdGhpcywgZmFsc2UpOworI2VuZGlmCisKICAgICBtX3BsYXllci5jbGVhcigp OwogCiAgICAgc3RvcFBlcmlvZGljVGltZXJzKCk7CkBAIC00Nzg2LDYgKzQ3OTEsMTEgQEAgYm9v bCBIVE1MTWVkaWFFbGVtZW50Ojp3ZWJraXRDdXJyZW50UGxheQogICAgIHJldHVybiBtX21lZGlh U2Vzc2lvbi0+Y3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcygqdGhpcyk7CiB9CiAKK3Zv aWQgSFRNTE1lZGlhRWxlbWVudDo6d2lyZWxlc3NSb3V0ZXNBdmFpbGFibGVEaWRDaGFuZ2UoKQor eworICAgIGVucXVldWVQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUNoYW5nZWRFdmVudCgpOwor fQorCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ3VycmVudFBsYXliYWNrVGFy Z2V0SXNXaXJlbGVzc0NoYW5nZWQoTWVkaWFQbGF5ZXIqKQogewogICAgIExPRyhNZWRpYSwgIkhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVz c0NoYW5nZWQoJXApIC0gd2Via2l0Q3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcyA9ICVz IiwgdGhpcywgYm9vbFN0cmluZyh3ZWJraXRDdXJyZW50UGxheWJhY2tUYXJnZXRJc1dpcmVsZXNz KCkpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCShyZXZpc2lv biAxNzQzODUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtMzczLDYgKzM3Myw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9v bCBhZGRFdmVudExpc3RlbmVyKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBQYXNzUmVm UHRyPEV2ZW50TGlzdGVuZXI+LCBib29sIHVzZUNhcHR1cmUpIG92ZXJyaWRlOwogICAgIHZpcnR1 YWwgYm9vbCByZW1vdmVFdmVudExpc3RlbmVyKGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBl LCBFdmVudExpc3RlbmVyKiwgYm9vbCB1c2VDYXB0dXJlKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFs IHZvaWQgd2lyZWxlc3NSb3V0ZXNBdmFpbGFibGVEaWRDaGFuZ2UoKSBvdmVycmlkZTsKIAogICAg IERFRklORV9BVFRSSUJVVEVfRVZFTlRfTElTVEVORVIod2Via2l0Y3VycmVudHBsYXliYWNrdGFy Z2V0aXN3aXJlbGVzc2NoYW5nZWQpOwogICAgIERFRklORV9BVFRSSUJVVEVfRVZFTlRfTElTVEVO RVIod2Via2l0cGxheWJhY2t0YXJnZXRhdmFpbGFiaWxpdHljaGFuZ2VkKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhU2Vzc2lvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFTZXNzaW9uLmNwcAkocmV2aXNpb24gMTc0Mzg1KQorKysg U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFTZXNzaW9uLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzcsNiArNzcsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8SFRNTE1lZGlhU2Vzc2lvbj4gSFRNTE1l CiBIVE1MTWVkaWFTZXNzaW9uOjpIVE1MTWVkaWFTZXNzaW9uKE1lZGlhU2Vzc2lvbkNsaWVudCYg Y2xpZW50KQogICAgIDogTWVkaWFTZXNzaW9uKGNsaWVudCkKICAgICAsIG1fcmVzdHJpY3Rpb25z KE5vUmVzdHJpY3Rpb25zKQorICAgICwgbV9oYXNQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUxp c3RlbmVycyhmYWxzZSkKIHsKIH0KIApAQCAtMjQ3LDEwICsyNDgsOCBAQCB2b2lkIEhUTUxNZWRp YVNlc3Npb246OnNldEhhc1BsYXliYWNrVGFyCiAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhU2Vz c2lvbjo6c2V0SGFzUGxheWJhY2tUYXJnZXRBdmFpbGFiaWxpdHlMaXN0ZW5lcnMgLSBoYXNMaXN0 ZW5lcnMgJXMiLCBoYXNMaXN0ZW5lcnMgPyAiVFJVRSIgOiAiRkFMU0UiKTsKICAgICBVTlVTRURf UEFSQU0oZWxlbWVudCk7CiAKLSAgICBpZiAoaGFzTGlzdGVuZXJzKQotICAgICAgICBNZWRpYVNl c3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkuc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRl cygpOwotICAgIGVsc2UKLSAgICAgICAgTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdl cigpLnN0b3BNb25pdG9yaW5nQWlyUGxheVJvdXRlcygpOworICAgIG1faGFzUGxheWJhY2tUYXJn ZXRBdmFpbGFiaWxpdHlMaXN0ZW5lcnMgPSBoYXNMaXN0ZW5lcnM7CisgICAgTWVkaWFTZXNzaW9u TWFuYWdlcjo6c2hhcmVkTWFuYWdlcigpLmNvbmZpZ3VyZVdpcmVMZXNzVGFyZ2V0TW9uaXRvcmlu ZygpOwogfQogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhU2Vz c2lvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhU2Vzc2lv bi5oCShyZXZpc2lvbiAxNzQzODUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYVNl c3Npb24uaAkod29ya2luZyBjb3B5KQpAQCAtODgsNyArODgsMTAgQEAgcHVibGljOgogI2VuZGlm CiAKIHByaXZhdGU6CisgICAgdmlydHVhbCBib29sIHJlcXVpcmVzUGxheWJhY2tUYXJnZXRSb3V0 ZU1vbml0b3JpbmcoKSBjb25zdCB7IHJldHVybiBtX2hhc1BsYXliYWNrVGFyZ2V0QXZhaWxhYmls aXR5TGlzdGVuZXJzOyB9CisKICAgICBCZWhhdmlvclJlc3RyaWN0aW9ucyBtX3Jlc3RyaWN0aW9u czsKKyAgICBib29sIG1faGFzUGxheWJhY2tUYXJnZXRBdmFpbGFiaWxpdHlMaXN0ZW5lcnM7CiB9 OwogCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vz c2lvbi5jcHAJKHJldmlzaW9uIDE3NDM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL01lZGlhU2Vzc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNSw2ICsyMDUsMTEgQEAg dm9pZCBNZWRpYVNlc3Npb246OnVwZGF0ZUNsaWVudERhdGFCdWZmZQogICAgIG1fY2xpZW50LnNl dFNob3VsZEJ1ZmZlckRhdGEoc2hvdWxkQnVmZmVyKTsKIH0KIAordm9pZCBNZWRpYVNlc3Npb246 OndpcmVsZXNzUm91dGVzQXZhaWxhYmxlRGlkQ2hhbmdlKCkgY29uc3QKK3sKKyAgICBtX2NsaWVu dC53aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZSgpOworfQorCiBTdHJpbmcgTWVkaWFT ZXNzaW9uQ2xpZW50OjptZWRpYVNlc3Npb25UaXRsZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIFN0 cmluZygpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9u LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNz aW9uLmgJKHJldmlzaW9uIDE3NDM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L01lZGlhU2Vzc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcsNiArMTA3LDkgQEAgcHVibGlj OgogICAgIGJvb2wgY2FuUmVjZWl2ZVJlbW90ZUNvbnRyb2xDb21tYW5kcygpIGNvbnN0OwogICAg IHZvaWQgZGlkUmVjZWl2ZVJlbW90ZUNvbnRyb2xDb21tYW5kKFJlbW90ZUNvbnRyb2xDb21tYW5k VHlwZSk7CiAKKyAgICB2aXJ0dWFsIGJvb2wgcmVxdWlyZXNQbGF5YmFja1RhcmdldFJvdXRlTW9u aXRvcmluZygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdm9pZCB3aXJlbGVzc1JvdXRl c0F2YWlsYWJsZURpZENoYW5nZSgpIGNvbnN0OworCiBwcm90ZWN0ZWQ6CiAgICAgTWVkaWFTZXNz aW9uQ2xpZW50JiBjbGllbnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudDsgfQogCkBAIC0xNDcs NiArMTUwLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYXNNZWRpYUNoYXJhY3Rlcmlz dGljcyhNZWRpYVNlc3Npb246Ok1lZGlhQ2hhcmFjdGVyaXN0aWNzKSBjb25zdCA9IDA7CiAgICAg dmlydHVhbCB2b2lkIG1lZGlhU3RhdGVEaWRDaGFuZ2UoKSB7IH0KIAorICAgIHZpcnR1YWwgdm9p ZCB3aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZSgpIHsgfQorCiBwcm90ZWN0ZWQ6CiAg ICAgdmlydHVhbCB+TWVkaWFTZXNzaW9uQ2xpZW50KCkgeyB9CiB9OwpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAJ KHJldmlzaW9uIDE3NDM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlh U2Vzc2lvbk1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODIsNyArMjgyLDEwIEBAIHZv aWQgTWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRpb25XaWwKIAogdm9pZCBNZWRpYVNlc3Np b25NYW5hZ2VyOjp3aXJlbGVzc1JvdXRlc0F2YWlsYWJsZUNoYW5nZWQoKQogewotICAgIG5vdElt cGxlbWVudGVkKCk7CisgICAgTE9HKE1lZGlhLCAiTWVkaWFTZXNzaW9uTWFuYWdlcjo6d2lyZWxl c3NSb3V0ZXNBdmFpbGFibGVDaGFuZ2VkIik7CisgICAgVmVjdG9yPE1lZGlhU2Vzc2lvbio+IHNl c3Npb25zID0gbV9zZXNzaW9uczsKKyAgICBmb3IgKGF1dG8qIHNlc3Npb24gOiBzZXNzaW9ucykK KyAgICAgICAgc2Vzc2lvbi0+d2lyZWxlc3NSb3V0ZXNBdmFpbGFibGVEaWRDaGFuZ2UoKTsKIH0K IAogI2lmICFQTEFURk9STShDT0NPQSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb25NYW5hZ2VyLmgJKHJldmlzaW9uIDE3NDM4NSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbk1hbmFnZXIuaAkod29y a2luZyBjb3B5KQpAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAgICAgICAgIEJhY2tncm91bmRQ bGF5YmFja05vdFBlcm1pdHRlZCA9IDEgPDwgNCwKICAgICB9OwogICAgIHR5cGVkZWYgdW5zaWdu ZWQgU2Vzc2lvblJlc3RyaWN0aW9uczsKLSAgICAKKwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg YWRkUmVzdHJpY3Rpb24oTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGUsIFNlc3Npb25SZXN0cmljdGlv bnMpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVtb3ZlUmVzdHJpY3Rpb24oTWVkaWFTZXNz aW9uOjpNZWRpYVR5cGUsIFNlc3Npb25SZXN0cmljdGlvbnMpOwogICAgIFdFQkNPUkVfRVhQT1JU IFNlc3Npb25SZXN0cmljdGlvbnMgcmVzdHJpY3Rpb25zKE1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBl KTsKQEAgLTczLDEzICs3MywxMyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgc2Vzc2lv bldpbGxCZWdpblBsYXliYWNrKE1lZGlhU2Vzc2lvbiYpOwogICAgIHZpcnR1YWwgdm9pZCBzZXNz aW9uV2lsbEVuZFBsYXliYWNrKE1lZGlhU2Vzc2lvbiYpOwotICAgIAorCiAgICAgYm9vbCBzZXNz aW9uUmVzdHJpY3RzSW5saW5lVmlkZW9QbGF5YmFjayhjb25zdCBNZWRpYVNlc3Npb24mKSBjb25z dDsKIAorICAgIHZpcnR1YWwgdm9pZCBjb25maWd1cmVXaXJlTGVzc1RhcmdldE1vbml0b3Jpbmco KSB7IH0KKwogI2lmIEVOQUJMRShJT1NfQUlSUExBWSkKICAgICB2aXJ0dWFsIGJvb2wgaGFzV2ly ZWxlc3NUYXJnZXRzQXZhaWxhYmxlKCkgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIHZv aWQgc3RhcnRNb25pdG9yaW5nQWlyUGxheVJvdXRlcygpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBz dG9wTW9uaXRvcmluZ0FpclBsYXlSb3V0ZXMoKSB7IH0KICNlbmRpZgogCiBwcm90ZWN0ZWQ6CkBA IC04OCwxMCArODgsMTIgQEAgcHJvdGVjdGVkOgogCiAgICAgdm9pZCBhZGRTZXNzaW9uKE1lZGlh U2Vzc2lvbiYpOwogICAgIHZvaWQgcmVtb3ZlU2Vzc2lvbihNZWRpYVNlc3Npb24mKTsKLSAgICAK KwogICAgIHZvaWQgc2V0Q3VycmVudFNlc3Npb24oTWVkaWFTZXNzaW9uJik7CiAgICAgTWVkaWFT ZXNzaW9uKiBjdXJyZW50U2Vzc2lvbigpOwotICAgIAorCisgICAgVmVjdG9yPE1lZGlhU2Vzc2lv bio+IHNlc3Npb25zKCkgeyByZXR1cm4gbV9zZXNzaW9uczsgfQorCiBwcml2YXRlOgogICAgIGZy aWVuZCBjbGFzcyBJbnRlcm5hbHM7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9TLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbk1hbmFnZXJJT1MuaAkocmV2aXNp b24gMTc0Mzg1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vz c2lvbk1hbmFnZXJJT1MuaAkod29ya2luZyBjb3B5KQpAQCAtNTcsOCArNTcsNyBAQCBwcml2YXRl OgogCiAjaWYgRU5BQkxFKElPU19BSVJQTEFZKQogICAgIHZpcnR1YWwgYm9vbCBoYXNXaXJlbGVz c1RhcmdldHNBdmFpbGFibGUoKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgc3RhcnRNb25p dG9yaW5nQWlyUGxheVJvdXRlcygpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBzdG9wTW9u aXRvcmluZ0FpclBsYXlSb3V0ZXMoKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgY29uZmln dXJlV2lyZUxlc3NUYXJnZXRNb25pdG9yaW5nKCkgb3ZlcnJpZGU7CiAjZW5kaWYKIAogICAgIE1l ZGlhU2Vzc2lvbk1hbmFnZXJpT1MoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9TLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9TLm1tCShyZXZp c2lvbiAxNzQzODUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFT ZXNzaW9uTWFuYWdlcklPUy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQ5LDIwICsxNDksMjcgQEAg dm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyaU9TOjpyZXNldFJlc3RyaQogfQogCiAjaWYgRU5BQkxF KElPU19BSVJQTEFZKQotCiBib29sIE1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6Omhhc1dpcmVsZXNz VGFyZ2V0c0F2YWlsYWJsZSgpCiB7CiAgICAgcmV0dXJuIFttX29iamNPYnNlcnZlciBoYXNXaXJl bGVzc1RhcmdldHNBdmFpbGFibGVdOwogfQogCi12b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6 OnN0YXJ0TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXMoKQordm9pZCBNZWRpYVNlc3Npb25NYW5hZ2Vy aU9TOjpjb25maWd1cmVXaXJlTGVzc1RhcmdldE1vbml0b3JpbmcoKQogewotICAgIFttX29iamNP YnNlcnZlciBzdGFydE1vbml0b3JpbmdBaXJQbGF5Um91dGVzXTsKLX0KKyAgICBWZWN0b3I8TWVk aWFTZXNzaW9uKj4gc2Vzc2lvbnMgPSB0aGlzLT5zZXNzaW9ucygpOworICAgIGJvb2wgcmVxdWly ZXNNb25pdG9yaW5nID0gZmFsc2U7CiAKLXZvaWQgTWVkaWFTZXNzaW9uTWFuYWdlcmlPUzo6c3Rv cE1vbml0b3JpbmdBaXJQbGF5Um91dGVzKCkKLXsKLSAgICBbbV9vYmpjT2JzZXJ2ZXIgc3RvcE1v bml0b3JpbmdBaXJQbGF5Um91dGVzXTsKKyAgICBmb3IgKGF1dG8qIHNlc3Npb24gOiBzZXNzaW9u cykgeworICAgICAgICBpZiAoc2Vzc2lvbi0+cmVxdWlyZXNQbGF5YmFja1RhcmdldFJvdXRlTW9u aXRvcmluZygpKSB7CisgICAgICAgICAgICByZXF1aXJlc01vbml0b3JpbmcgPSB0cnVlOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpZiAocmVxdWlyZXNNb25p dG9yaW5nKQorICAgICAgICBbbV9vYmpjT2JzZXJ2ZXIgc3RhcnRNb25pdG9yaW5nQWlyUGxheVJv dXRlc107CisgICAgZWxzZQorICAgICAgICBbbV9vYmpjT2JzZXJ2ZXIgc3RvcE1vbml0b3JpbmdB aXJQbGF5Um91dGVzXTsKIH0KICNlbmRpZgogICAgIAo=