145325 2015-05-22 15:52:18 -0700 MediaPlayer doesn't need isPlayingToWirelessPlaybackTarget and isCurrentPlaybackTargetWireless 2015-05-22 19:13:04 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson bfulgham oldest_to_newest 1096981 0 eric.carlson 2015-05-22 15:52:18 -0700 Both methods return the same state, so get rid of 1096987 1 253614 eric.carlson 2015-05-22 16:16:47 -0700 Created attachment 253614 Proposed patch. 1096988 2 bfulgham 2015-05-22 16:19:55 -0700 (In reply to comment #0) > Both methods return the same state, so get rid of Get rid of ... get rid of what!?! Don't keep me in suspense! 1096989 3 253614 bfulgham 2015-05-22 16:22:31 -0700 Comment on attachment 253614 Proposed patch. Nice cleanup! r=me. 1097028 4 eric.carlson 2015-05-22 19:12:47 -0700 Committed r184814: https://trac.webkit.org/r184814 253614 2015-05-22 16:16:47 -0700 2015-05-22 19:13:04 -0700 Proposed patch. consolidate_patch_2.txt text/plain 10308 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NDc5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE1LTA1LTIyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1lZGlhUGxheWVyIGRv ZXNuJ3QgbmVlZCBpc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQgYW5kIGlzQ3VycmVu dFBsYXliYWNrVGFyZ2V0V2lyZWxlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NTMyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OndlYmtpdEN1cnJlbnRQbGF5YmFja1RhcmdldElzV2ly ZWxlc3MpOiBDYWxsIGlzQ3VycmVudFBsYXliYWNrVGFyZ2V0V2lyZWxlc3MKKyAgICAgICAgZGly ZWN0bHkuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp3aXJlbGVzc1JvdXRl c0F2YWlsYWJsZURpZENoYW5nZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlh RWxlbWVudDo6aXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlKTogRGl0dG8uCisKKyAg ICAgICAgKiBodG1sL0hUTUxNZWRpYVNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TE1lZGlhU2Vzc2lvbjo6Y3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcyk6IERlbGV0ZWQu CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFTZXNzaW9uLmg6CisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll cjo6aXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KTogRGVsZXRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oOgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVJbnRlcmZhY2U6OmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCk6 IERlbGV0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmg6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakM6OmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCk6IERlbGV0ZWQuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1l bnQubW06CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudDo6dXBk YXRlRm9yRXZlbnROYW1lKTogQ2FsbCB3ZWJraXRDdXJyZW50UGxheWJhY2tUYXJnZXRJc1dpcmVs ZXNzLgorCiAyMDE1LTA1LTIyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5j b20+CiAKICAgICAgICAgW0NvY29hXSBVc2UgQ1RGb250RHJhd0dseXBocygpIGluc3RlYWQgb2Yg Q0dDb250ZXh0U2hvd0dseXBoc1dpdGhBZHZhbmNlcygpL0NHQ29udGV4dFNob3dHbHlwaHNBdFBv c2l0aW9ucygpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJ KHJldmlzaW9uIDE4NDc4OCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5MTgsNyArNDkxOCw3IEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6d2Via2l0U2hvd1BsYXliYWMKIAogYm9vbCBIVE1MTWVkaWFFbGVtZW50Ojp3ZWJr aXRDdXJyZW50UGxheWJhY2tUYXJnZXRJc1dpcmVsZXNzKCkgY29uc3QKIHsKLSAgICByZXR1cm4g bV9tZWRpYVNlc3Npb24tPmN1cnJlbnRQbGF5YmFja1RhcmdldElzV2lyZWxlc3MoKnRoaXMpOwor ICAgIHJldHVybiBtX3BsYXllciAmJiBtX3BsYXllci0+aXNDdXJyZW50UGxheWJhY2tUYXJnZXRX aXJlbGVzcygpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OndpcmVsZXNzUm91dGVzQXZh aWxhYmxlRGlkQ2hhbmdlKCkKQEAgLTUwMTAsNyArNTAxMCw3IEBAIGJvb2wgSFRNTE1lZGlhRWxl bWVudDo6Y2FuUGxheVRvV2lyZWxlc3MKIAogYm9vbCBIVE1MTWVkaWFFbGVtZW50Ojppc1BsYXlp bmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSBjb25zdAogewotICAgIGJvb2wgaXNQbGF5aW5n ID0gbV9wbGF5ZXIgJiYgbV9wbGF5ZXItPmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1Rhcmdl dCgpOworICAgIGJvb2wgaXNQbGF5aW5nID0gbV9wbGF5ZXIgJiYgbV9wbGF5ZXItPmlzQ3VycmVu dFBsYXliYWNrVGFyZ2V0V2lyZWxlc3MoKTsKIAogICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVs ZW1lbnQ6OmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCglcCkgLSByZXR1cm5pbmcg JXMiLCB0aGlzLCBib29sU3RyaW5nKGlzUGxheWluZykpOwogICAgIApAQCAtNjI3OCw3ICs2Mjc4 LDcgQEAgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIEhUTUxNZWRpYQogICAgIGJvb2wg aGFzQWN0aXZlVmlkZW8gPSBpc1ZpZGVvKCkgJiYgaGFzVmlkZW8oKTsKICAgICBib29sIGhhc0F1 ZGlvID0gdGhpcy0+aGFzQXVkaW8oKTsKICNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFS R0VUKQotICAgIGlmIChpc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSkKKyAgICBp ZiAobV9wbGF5ZXIgJiYgbV9wbGF5ZXItPmlzQ3VycmVudFBsYXliYWNrVGFyZ2V0V2lyZWxlc3Mo KSkKICAgICAgICAgc3RhdGUgfD0gSXNQbGF5aW5nVG9FeHRlcm5hbERldmljZTsKIAogICAgIGlm ICghbV9tZWRpYVNlc3Npb24tPndpcmVsZXNzVmlkZW9QbGF5YmFja0Rpc2FibGVkKCp0aGlzKSAm JiBtX2hhc1BsYXliYWNrVGFyZ2V0QXZhaWxhYmlsaXR5TGlzdGVuZXJzICYmIG1fcGxheWVyLT5j YW5QbGF5VG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYVNlc3Npb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhU2Vzc2lvbi5jcHAJKHJldmlzaW9uIDE4NDcxNSkKKysrIFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhU2Vzc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3NSwyMCAr MTc1LDYgQEAgYm9vbCBIVE1MTWVkaWFTZXNzaW9uOjpwYWdlQWxsb3dzUGxheWJhYwogfQogCiAj aWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKLWJvb2wgSFRNTE1lZGlhU2Vzc2lv bjo6Y3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcyhjb25zdCBIVE1MTWVkaWFFbGVtZW50 JiBlbGVtZW50KSBjb25zdAotewotICAgIE1lZGlhUGxheWVyKiBwbGF5ZXIgPSBlbGVtZW50LnBs YXllcigpOwotICAgIGlmICghcGxheWVyKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIkhUTUxNZWRp YVNlc3Npb246OmN1cnJlbnRQbGF5YmFja1RhcmdldElzV2lyZWxlc3MgLSByZXR1cm5pbmcgRkFM U0UgYmVjYXVzZSBwbGF5ZXIgaXMgTlVMTCIpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg fQotCi0gICAgYm9vbCBpc1dpcmVsZXNzID0gcGxheWVyLT5pc0N1cnJlbnRQbGF5YmFja1Rhcmdl dFdpcmVsZXNzKCk7Ci0gICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhU2Vzc2lvbjo6Y3VycmVudFBs YXliYWNrVGFyZ2V0SXNXaXJlbGVzcyAtIHJldHVybmluZyAlcyIsIGlzV2lyZWxlc3MgPyAiVFJV RSIgOiAiRkFMU0UiKTsKLQotICAgIHJldHVybiBpc1dpcmVsZXNzOwotfQotCiB2b2lkIEhUTUxN ZWRpYVNlc3Npb246OnNob3dQbGF5YmFja1RhcmdldFBpY2tlcihjb25zdCBIVE1MTWVkaWFFbGVt ZW50JiBlbGVtZW50KQogewogICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYVNlc3Npb246OnNob3dQ bGF5YmFja1RhcmdldFBpY2tlciIpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFTZXNzaW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFT ZXNzaW9uLmgJKHJldmlzaW9uIDE4NDcxNSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l ZGlhU2Vzc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw3ICs1NSw2IEBAIHB1YmxpYzoKIAog I2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCiAgICAgdm9pZCBzaG93UGxheWJh Y2tUYXJnZXRQaWNrZXIoY29uc3QgSFRNTE1lZGlhRWxlbWVudCYpOwotICAgIGJvb2wgY3VycmVu dFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcyhjb25zdCBIVE1MTWVkaWFFbGVtZW50JikgY29uc3Q7 CiAgICAgYm9vbCBoYXNXaXJlbGVzc1BsYXliYWNrVGFyZ2V0cyhjb25zdCBIVE1MTWVkaWFFbGVt ZW50JikgY29uc3Q7CiAKICAgICBib29sIHdpcmVsZXNzVmlkZW9QbGF5YmFja0Rpc2FibGVkKGNv bnN0IEhUTUxNZWRpYUVsZW1lbnQmKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAJKHJldmlzaW9uIDE4NDcxNSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtODczLDExICs4NzMsNiBAQCBib29sIE1lZGlhUGxheWVyOjpjYW5QbGF5VG9X aXJlbGVzc1BsYXliCiAgICAgcmV0dXJuIG1fcHJpdmF0ZS0+Y2FuUGxheVRvV2lyZWxlc3NQbGF5 YmFja1RhcmdldCgpOwogfQogCi1ib29sIE1lZGlhUGxheWVyOjppc1BsYXlpbmdUb1dpcmVsZXNz UGxheWJhY2tUYXJnZXQoKSBjb25zdAotewotICAgIHJldHVybiBtX3ByaXZhdGUtPmlzUGxheWlu Z1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgpOwotfQotCiB2b2lkIE1lZGlhUGxheWVyOjpzZXRX aXJlbGVzc1BsYXliYWNrVGFyZ2V0KFJlZjxNZWRpYVBsYXliYWNrVGFyZ2V0PiYmIGRldmljZSkK IHsKICAgICBtX3ByaXZhdGUtPnNldFdpcmVsZXNzUGxheWJhY2tUYXJnZXQoV1RGOjptb3ZlKGRl dmljZSkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5 ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRp YVBsYXllci5oCShyZXZpc2lvbiAxODQ3MTUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9NZWRpYVBsYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC00NjQsOCArNDY0LDYgQEAg cHVibGljOgogI2VuZGlmCiAKICNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VUKQot ICAgIGJvb2wgaXNDdXJyZW50UGxheWJhY2tUYXJnZXRXaXJlbGVzcygpIGNvbnN0OwotCiAgICAg ZW51bSBXaXJlbGVzc1BsYXliYWNrVGFyZ2V0VHlwZSB7IFRhcmdldFR5cGVOb25lLCBUYXJnZXRU eXBlQWlyUGxheSwgVGFyZ2V0VHlwZVRWT3V0IH07CiAgICAgV2lyZWxlc3NQbGF5YmFja1Rhcmdl dFR5cGUgd2lyZWxlc3NQbGF5YmFja1RhcmdldFR5cGUoKSBjb25zdDsKIApAQCAtNDc3LDggKzQ3 NSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGN1cnJlbnRQbGF5YmFja1RhcmdldElzV2lyZWxlc3ND aGFuZ2VkKCk7CiAgICAgdm9pZCBwbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUNoYW5nZWQoKTsK IAorICAgIGJvb2wgaXNDdXJyZW50UGxheWJhY2tUYXJnZXRXaXJlbGVzcygpIGNvbnN0OwogICAg IGJvb2wgY2FuUGxheVRvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgpIGNvbnN0OwotICAgIGJvb2wg aXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkgY29uc3Q7CiAgICAgdm9pZCBzZXRX aXJlbGVzc1BsYXliYWNrVGFyZ2V0KFJlZjxNZWRpYVBsYXliYWNrVGFyZ2V0PiYmKTsKIAogICAg IHZvaWQgc2V0U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQoYm9vbCk7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUu aAkocmV2aXNpb24gMTg0NzE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXJQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw3ICsxNjAsNiBAQCBw dWJsaWM6CiAjZW5kaWYKIAogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCi0g ICAgdmlydHVhbCBib29sIGlzQ3VycmVudFBsYXliYWNrVGFyZ2V0V2lyZWxlc3MoKSBjb25zdCB7 IHJldHVybiBmYWxzZTsgfQogCiAgICAgdmlydHVhbCBTdHJpbmcgd2lyZWxlc3NQbGF5YmFja1Rh cmdldE5hbWUoKSBjb25zdCB7IHJldHVybiBlbXB0eVN0cmluZygpOyB9CiAgICAgdmlydHVhbCBN ZWRpYVBsYXllcjo6V2lyZWxlc3NQbGF5YmFja1RhcmdldFR5cGUgd2lyZWxlc3NQbGF5YmFja1Rh cmdldFR5cGUoKSBjb25zdCB7IHJldHVybiBNZWRpYVBsYXllcjo6VGFyZ2V0VHlwZU5vbmU7IH0K QEAgLTE2OSw3ICsxNjgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFdpcmVsZXNz VmlkZW9QbGF5YmFja0Rpc2FibGVkKGJvb2wpIHsgfQogCiAgICAgdmlydHVhbCBib29sIGNhblBs YXlUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAg IHZpcnR1YWwgYm9vbCBpc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSB7IHJldHVy biBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBpc0N1cnJlbnRQbGF5YmFja1RhcmdldFdpcmVs ZXNzKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0V2lyZWxl c3NQbGF5YmFja1RhcmdldChSZWY8TWVkaWFQbGF5YmFja1RhcmdldD4mJikgeyB9CiAKICAgICB2 aXJ0dWFsIHZvaWQgc2V0U2hvdWxkUGxheVRvUGxheWJhY2tUYXJnZXQoYm9vbCkgeyB9CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQy5oCShyZXZpc2lvbiAxODQ3MTUpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4Niw3ICsyODYsNiBAQCBwcml2 YXRlOgogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpICYmICFQTEFURk9STShJ T1MpCiAgICAgdmlydHVhbCB2b2lkIHNldFdpcmVsZXNzUGxheWJhY2tUYXJnZXQoUmVmPE1lZGlh UGxheWJhY2tUYXJnZXQ+JiYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTaG91bGRQ bGF5VG9QbGF5YmFja1RhcmdldChib29sKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIGJvb2wgaXNQ bGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCk7CiAjZW5kaWYKIAogICAgIHZpcnR1YWwg ZG91YmxlIG1heEZhc3RGb3J3YXJkUmF0ZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fY2Fj aGVkQ2FuUGxheUZhc3RGb3J3YXJkID8gc3RkOjpudW1lcmljX2xpbWl0czxkb3VibGU+OjppbmZp bml0eSgpIDogMi4wOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0JKHJldmlzaW9uIDE4 NDc4OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0JKHdvcmtpbmcgY29weSkK QEAgLTI4MjIsMTUgKzI4MjIsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakM6CiAgICAgbV9hdlBsYXllci5nZXQoKS5vdXRwdXRDb250ZXh0ID0gbmV3Q29udGV4dDsK ICAgICBzZXREZWxheUNhbGxiYWNrcyhmYWxzZSk7CiB9Ci0KLWJvb2wgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6aXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkK LXsKLSAgICBpZiAoIW1fYXZQbGF5ZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFJl dGFpblB0cjxBVk91dHB1dENvbnRleHQ+IGN1cnJlbnRDb250ZXh0ID0gbV9hdlBsYXllci5nZXQo KS5vdXRwdXRDb250ZXh0OwotICAgIHJldHVybiBjdXJyZW50Q29udGV4dCAmJiBjdXJyZW50Q29u dGV4dC5nZXQoKS5kZXZpY2VOYW1lOwotfQogI2VuZGlmIC8vICFQTEFURk9STShJT1MpCiAKIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6dXBkYXRlRGlzYWJsZUV4dGVy bmFsUGxheWJhY2soKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudC5tbQko cmV2aXNpb24gMTg0NzE1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNyAr MTUxLDcgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudAogCiAgICAg aWYgKGFsbAogICAgICAgICB8fCBldmVudE5hbWUgPT0gZXZlbnROYW1lcygpLndlYmtpdGN1cnJl bnRwbGF5YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkRXZlbnQpIHsKLSAgICAgICAgYm9vbCBl bmFibGVkID0gbV92aWRlb0VsZW1lbnQtPm1lZGlhU2Vzc2lvbigpLmN1cnJlbnRQbGF5YmFja1Rh cmdldElzV2lyZWxlc3MoKm1fdmlkZW9FbGVtZW50KTsKKyAgICAgICAgYm9vbCBlbmFibGVkID0g bV92aWRlb0VsZW1lbnQtPndlYmtpdEN1cnJlbnRQbGF5YmFja1RhcmdldElzV2lyZWxlc3MoKTsK ICAgICAgICAgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlOjpFeHRlcm5hbFBsYXliYWNrVGFy Z2V0VHlwZSB0YXJnZXRUeXBlID0gV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlOjpUYXJnZXRU eXBlTm9uZTsKICAgICAgICAgU3RyaW5nIGxvY2FsaXplZERldmljZU5hbWU7CiAK