60849 2011-05-14 18:42:57 -0700 HTTP video-on-demand streams frequently have live stream UI 2011-05-14 22:40:45 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 eric.carlson eric.carlson oldest_to_newest 404134 0 eric.carlson 2011-05-14 18:42:57 -0700 VOD streams are frequently identified as Live streams, so they get the media controls for a live stream. This is a serious regression because the live stream controls do not have a timeline scrubber, so it is impossible to seek. <rdar://problem/9440502> 404145 1 93574 eric.carlson 2011-05-14 22:20:00 -0700 Created attachment 93574 Proposed patch. 404146 2 eric.carlson 2011-05-14 22:40:45 -0700 trac.webkit.org/changeset/86501 93574 2011-05-14 22:20:00 -0700 2011-05-14 22:24:34 -0700 Proposed patch. patch_2.txt text/plain 13163 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NTAwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDUgQEAKKzIwMTEtMDUtMTQgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSFRUUCB2aWRlby1vbi1kZW1hbmQgc3RyZWFtcyBmcmVx dWVudGx5IGhhdmUgbGl2ZSBzdHJlYW0gVUkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYwODQ5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85NDQwNTAy PgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgd2UgZG9uJ3QgY3VycmVudGx5IGhhdmUgdGVzdHMg Zm9yIGh0dHAgbGl2ZSBzdHJlYW1zLiBDaGFuZ2VzIHZlcmlmaWVkIG1hbnVhbGx5LgorCisgICAg ICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxN ZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyRHVyYXRpb25DaGFuZ2VkKTogUmVzZXQgdGhlIG1lZGlh IGNvbnRyb2xzIHNvCisgICAgICAgICAgICBhIGR1cmF0aW9uIGNoYW5nZSB3aGljaCBpZGVudGlm aWVzIGEgZm9ybWF0IHdpbGwgYmUgcGlja2VkIHVwLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJDaGFyYWN0ZXJpc3RpY0NoYW5nZWQpOiBOZXcsIHJlc2V0 IG1lZGlhIGNvbnRyb2xzCisgICAgICAgICAgICBzbyB0aGV5IGNhbiBiZSByZWNvbmZpZ3VyZWQg Zm9yIHRoZSBtZWRpYSBmaWxlIGNoYXJhY3RlcmlzdGljcy4KKyAgICAgICAgKiBodG1sL0hUTUxN ZWRpYUVsZW1lbnQuaDoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpjaGFyYWN0ZXJpc3RpY0NoYW5n ZWQpOiBOZXcsIHBhc3MgdGhyb3VnaCB0byB0aGUgZWxlbWVudC4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJD bGllbnQ6Om1lZGlhUGxheWVyQ2hhcmFjdGVyaXN0aWNDaGFuZ2VkKToKKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u OjpzZXRIYXNWaWRlbyk6IENhbGwgY2hhcmFjdGVyaXN0aWNDaGFuZ2VkIHdoZW4KKyAgICAgICAg ICAgIHNldHRpbmcgY2hhbmdlcy4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbjo6c2V0SGFzQXVkaW8pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0SGFzQ2xvc2VkQ2FwdGlvbnMpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6bG9h ZGVkVGltZVJhbmdlc0NoYW5nZWQpOiBNb3ZlIHRoZSBkdXJhdGlvbgorICAgICAgICAgICAgY2hh bmdlIG5vdGlmaWNhdGlvbiBsb2dpYyB0byBpbnZhbGlkYXRlQ2FjaGVkRHVyYXRpb24uCisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmludmFsaWRhdGVD YWNoZWREdXJhdGlvbik6IE5ldywgaW52YWxpZGF0ZQorICAgICAgICAgICAgdGhlIGNhY2hlZCBk dXJhdGlvbiBhbmQgbm90aWZ5IHRoZSBlbGVtZW50IHdoZW4gaXQgY2hhbmdlcy4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6ZGlzcGF0Y2hOb3RpZmlj YXRpb24pOiBDYWxsIGludmFsaWRhdGVDYWNoZWREdXJhdGlvbgorICAgICAgICAgICAgZm9yIHRo ZSBEdXJhdGlvbkNoYW5nZWQgbm90aWZpY2F0aW9uLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaDogRGVmaW5l IER1cmF0aW9uQ2hhbmdlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6cGxhdGZvcm1EdXJhdGlv bik6IERvbid0IGNoZWNrIGFzc2V0IG9yCisgICAgICAgICAgICBpdGVtIGR1cmF0aW9uIHVudGls IHRoZXkgaGF2ZSBiZWVuIGxvYWRlZC4KKyAgICAgICAgKFdlYkNvcmU6Oml0ZW1LVk9Qcm9wZXJ0 aWVzKTogTGlzdGVuIGZvciBkdXJhdGlvbiBjaGFuZ2UuCisgICAgICAgICgtW1dlYkNvcmVBVkZN b3ZpZU9ic2VydmVyIG9ic2VydmVWYWx1ZUZvcktleVBhdGg6b2ZPYmplY3Q6Y2hhbmdlOmNvbnRl eHQ6XSk6IERlYWwgd2l0aAorICAgICAgICAgICAgZHVyYXRpb24gY2hhbmdlIG5vdGlmaWNhdGlv bi4KKwogMjAxMS0wNS0xNCAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDg2NDUxKQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTkzMiwx NCArMTkzMiwxMyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyTXV0ZUNoCiAg ICAgZW5kUHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKIH0KIAotdm9pZCBIVE1MTWVk aWFFbGVtZW50OjptZWRpYVBsYXllckR1cmF0aW9uQ2hhbmdlZChNZWRpYVBsYXllciopCit2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyRHVyYXRpb25DaGFuZ2VkKE1lZGlhUGxheWVy KiBwbGF5ZXIpCiB7CiAgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5 ZXJEdXJhdGlvbkNoYW5nZWQiKTsKIAogICAgIGJlZ2luUHJvY2Vzc2luZ01lZGlhUGxheWVyQ2Fs bGJhY2soKTsKICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS5kdXJhdGlvbmNoYW5nZUV2 ZW50KTsKLSAgICBpZiAocmVuZGVyZXIoKSkKLSAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlRnJv bUVsZW1lbnQoKTsKKyAgICBtZWRpYVBsYXllckNoYXJhY3RlcmlzdGljQ2hhbmdlZChwbGF5ZXIp OwogICAgIGVuZFByb2Nlc3NpbmdNZWRpYVBsYXllckNhbGxiYWNrKCk7CiB9CiAKQEAgLTIwNDcs NiArMjA0NiwxOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyRmlyc3RWCiAg ICAgZW5kUHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKIH0KIAordm9pZCBIVE1MTWVk aWFFbGVtZW50OjptZWRpYVBsYXllckNoYXJhY3RlcmlzdGljQ2hhbmdlZChNZWRpYVBsYXllciop Cit7CisgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJDaGFyYWN0 ZXJpc3RpY0NoYW5nZWQiKTsKKyAgICAKKyAgICBiZWdpblByb2Nlc3NpbmdNZWRpYVBsYXllckNh bGxiYWNrKCk7CisgICAgaWYgKGhhc01lZGlhQ29udHJvbHMoKSkKKyAgICAgICAgbWVkaWFDb250 cm9scygpLT5yZXNldCgpOworICAgIGlmIChyZW5kZXJlcigpKQorICAgICAgICByZW5kZXJlcigp LT51cGRhdGVGcm9tRWxlbWVudCgpOworICAgIGVuZFByb2Nlc3NpbmdNZWRpYVBsYXllckNhbGxi YWNrKCk7Cit9CisKIFBhc3NSZWZQdHI8VGltZVJhbmdlcz4gSFRNTE1lZGlhRWxlbWVudDo6YnVm ZmVyZWQoKSBjb25zdAogewogICAgIGlmICghbV9wbGF5ZXIpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gODY0NTEpCisrKyBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjU5LDcgKzI1OSw5 IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIG1lZGlhUGxheWVyUmVuZGVyaW5nTW9kZUNo YW5nZWQoTWVkaWFQbGF5ZXIqKTsKICNlbmRpZgogICAgIHZpcnR1YWwgdm9pZCBtZWRpYVBsYXll ckVuZ2luZVVwZGF0ZWQoTWVkaWFQbGF5ZXIqKTsKKyAgICAKICAgICB2aXJ0dWFsIHZvaWQgbWVk aWFQbGF5ZXJGaXJzdFZpZGVvRnJhbWVBdmFpbGFibGUoTWVkaWFQbGF5ZXIqKTsKKyAgICB2aXJ0 dWFsIHZvaWQgbWVkaWFQbGF5ZXJDaGFyYWN0ZXJpc3RpY0NoYW5nZWQoTWVkaWFQbGF5ZXIqKTsK IAogICAgIHZvaWQgbG9hZFRpbWVyRmlyZWQoVGltZXI8SFRNTE1lZGlhRWxlbWVudD4qKTsKICAg ICB2b2lkIGFzeW5jRXZlbnRUaW1lckZpcmVkKFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+Kik7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIu Y3BwCShyZXZpc2lvbiA4NjQ1MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODU5LDYgKzg1OSwxMiBAQCB2b2lk IE1lZGlhUGxheWVyOjpmaXJzdFZpZGVvRnJhbWVBdmFpbGFiCiAgICAgICAgIG1fbWVkaWFQbGF5 ZXJDbGllbnQtPm1lZGlhUGxheWVyRmlyc3RWaWRlb0ZyYW1lQXZhaWxhYmxlKHRoaXMpOwogfQog Cit2b2lkIE1lZGlhUGxheWVyOjpjaGFyYWN0ZXJpc3RpY0NoYW5nZWQoKQoreworICAgIGlmICht X21lZGlhUGxheWVyQ2xpZW50KQorICAgICAgICBtX21lZGlhUGxheWVyQ2xpZW50LT5tZWRpYVBs YXllckNoYXJhY3RlcmlzdGljQ2hhbmdlZCh0aGlzKTsKK30KKwogfQogCiAjZW5kaWYKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAkocmV2 aXNpb24gODY0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcsNiArMTQ3LDkgQEAgcHVibGljOgogICAgIC8v IGZpcnN0IGZyYW1lIGlzIG5vdCBhdmFpbGFibGUgaW1tZWRpYXRlbHkgd2hlbiBwcmVwYXJlRm9y UmVuZGVyaW5nIGlzIGNhbGxlZC4KICAgICB2aXJ0dWFsIHZvaWQgbWVkaWFQbGF5ZXJGaXJzdFZp ZGVvRnJhbWVBdmFpbGFibGUoTWVkaWFQbGF5ZXIqKSB7IH0KIAorICAgIC8vIEEgY2hhcmFjdGVy aXN0aWMgb2YgdGhlIG1lZGlhIGZpbGUsIGVnLiB2aWRlbywgYXVkaW8sIGNsb3NlZCBjYXB0aW9u cywgZXRjLCBoYXMgY2hhbmdlZC4KKyAgICB2aXJ0dWFsIHZvaWQgbWVkaWFQbGF5ZXJDaGFyYWN0 ZXJpc3RpY0NoYW5nZWQoTWVkaWFQbGF5ZXIqKSB7IH0KKyAgICAKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiAgICAgLy8gd2hldGhlciB0aGUgcmVuZGVyaW5nIHN5c3RlbSBjYW4g YWNjZWxlcmF0ZSB0aGUgZGlzcGxheSBvZiB0aGlzIE1lZGlhUGxheWVyLgogICAgIHZpcnR1YWwg Ym9vbCBtZWRpYVBsYXllclJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQoTWVkaWFQbGF5ZXIqKSB7 IHJldHVybiBmYWxzZTsgfQpAQCAtMjYyLDYgKzI2NSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHBs YXliYWNrU3RhdGVDaGFuZ2VkKCk7CiAgICAgdm9pZCBkdXJhdGlvbkNoYW5nZWQoKTsKICAgICB2 b2lkIGZpcnN0VmlkZW9GcmFtZUF2YWlsYWJsZSgpOworICAgIHZvaWQgY2hhcmFjdGVyaXN0aWND aGFuZ2VkKCk7CisKIAogICAgIHZvaWQgcmVwYWludCgpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAkocmV2aXNp b24gODY0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzEzLDYgKzMxMywzMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0 CiAgICAgICAgIG1fcGxheWVyLT5zaXplQ2hhbmdlZCgpOwogfQogCit2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbjo6c2V0SGFzVmlkZW8oYm9vbCBiKQoreworICAgIGlmIChtX2Nh Y2hlZEhhc1ZpZGVvICE9IGIpIHsKKyAgICAgICAgbV9jYWNoZWRIYXNWaWRlbyA9IGI7CisgICAg ICAgIG1fcGxheWVyLT5jaGFyYWN0ZXJpc3RpY0NoYW5nZWQoKTsKKyAgICB9Cit9CisKK3ZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpzZXRIYXNBdWRpbyhib29sIGIpCit7Cisg ICAgaWYgKG1fY2FjaGVkSGFzQXVkaW8gIT0gYikgeworICAgICAgICBtX2NhY2hlZEhhc0F1ZGlv ID0gYjsKKyAgICAgICAgbV9wbGF5ZXItPmNoYXJhY3RlcmlzdGljQ2hhbmdlZCgpOworICAgIH0K K30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnNldEhhc0Nsb3NlZENh cHRpb25zKGJvb2wgYikKK3sKKyAgICBpZiAobV9jYWNoZWRIYXNDYXB0aW9ucyAhPSBiKSB7Cisg ICAgICAgIG1fY2FjaGVkSGFzQ2FwdGlvbnMgPSBiOworICAgICAgICBtX3BsYXllci0+Y2hhcmFj dGVyaXN0aWNDaGFuZ2VkKCk7CisgICAgfQorfQorCiBQYXNzUmVmUHRyPFRpbWVSYW5nZXM+IE1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6YnVmZmVyZWQoKSBjb25zdAogewogICAgIGlm ICghbV9jYWNoZWRMb2FkZWRUaW1lUmFuZ2VzKQpAQCAtNTE2LDE1ICs1NDAsNyBAQCB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6bG9hCiB7CiAgICAgbV9jYWNoZWRMb2FkZWRU aW1lUmFuZ2VzID0gMDsKICAgICBtX2NhY2hlZE1heFRpbWVMb2FkZWQgPSAwOwotCi0gICAgLy8g Rm9yIHNvbWUgbWVkaWEgZmlsZXMsIHJlcG9ydGVkIGR1cmF0aW9uIGlzIGVzdGltYXRlZCBhbmQg dXBkYXRlZCBhcyBtZWRpYSBpcyBsb2FkZWQKLSAgICAvLyBzbyByZXBvcnQgZHVyYXRpb24gY2hh bmdlZCB3aGVuIHRoZSBlc3RpbWF0ZSBpcyB1cGF0ZWQuCi0gICAgZmxvYXQgZHVyID0gZHVyYXRp b24oKTsKLSAgICBpZiAoZHVyICE9IG1fcmVwb3J0ZWREdXJhdGlvbikgewotICAgICAgICBpZiAo bV9yZXBvcnRlZER1cmF0aW9uICE9IGludmFsaWRUaW1lKCkpCi0gICAgICAgICAgICBtX3BsYXll ci0+ZHVyYXRpb25DaGFuZ2VkKCk7Ci0gICAgICAgIG1fcmVwb3J0ZWREdXJhdGlvbiA9IGR1cjsK LSAgICB9CisgICAgaW52YWxpZGF0ZUNhY2hlZER1cmF0aW9uKCk7CiB9CiAKIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpzZWVrYWJsZVRpbWVSYW5nZXNDaGFuZ2VkKCkKQEAg LTU3Miw2ICs1ODgsMjMgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmRp ZAogICAgIG1fcGxheWVyLT50aW1lQ2hhbmdlZCgpOwogfQogCit2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbjo6aW52YWxpZGF0ZUNhY2hlZER1cmF0aW9uKCkKK3sKKyAgICBMT0co TWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmludmFsaWRhdGVDYWNoZWRE dXJhdGlvbiglcCkiLCB0aGlzKTsKKyAgICAKKyAgICBtX2NhY2hlZER1cmF0aW9uID0gaW52YWxp ZFRpbWUoKTsKKworICAgIC8vIEZvciBzb21lIG1lZGlhIGZpbGVzLCByZXBvcnRlZCBkdXJhdGlv biBpcyBlc3RpbWF0ZWQgYW5kIHVwZGF0ZWQgYXMgbWVkaWEgaXMgbG9hZGVkCisgICAgLy8gc28g cmVwb3J0IGR1cmF0aW9uIGNoYW5nZWQgd2hlbiB0aGUgZXN0aW1hdGUgaXMgdXBhdGVkLgorICAg IGZsb2F0IGR1cmF0aW9uID0gdGhpcy0+ZHVyYXRpb24oKTsKKyAgICBpZiAoZHVyYXRpb24gIT0g bV9yZXBvcnRlZER1cmF0aW9uKSB7CisgICAgICAgIGlmIChtX3JlcG9ydGVkRHVyYXRpb24gIT0g aW52YWxpZFRpbWUoKSkKKyAgICAgICAgICAgIG1fcGxheWVyLT5kdXJhdGlvbkNoYW5nZWQoKTsK KyAgICAgICAgbV9yZXBvcnRlZER1cmF0aW9uID0gZHVyYXRpb247CisgICAgfQorICAgIAorfQor CiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6cmVwYWludCgpCiB7CiAgICAg bV9wbGF5ZXItPnJlcGFpbnQoKTsKQEAgLTc2MSw2ICs3OTQsMTAgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb246OmRpcwogICAgICAgICB1cGRhdGVTdGF0ZXMoKTsKICAgICAg ICAgcGxheWFiaWxpdHlLbm93bigpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIE5vdGlmaWNh dGlvbjo6RHVyYXRpb25DaGFuZ2VkOgorICAgICAgICBpbnZhbGlkYXRlQ2FjaGVkRHVyYXRpb24o KTsKKyAgICAgICAgYnJlYWs7CisKICAgICBjYXNlIE5vdGlmaWNhdGlvbjo6Tm9uZToKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIGJyZWFrOwpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAkocmV2aXNp b24gODY0NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTY4 LDYgKzY4LDcgQEAgcHVibGljOgogICAgICAgICAgICAgUGxheWVyUmF0ZUNoYW5nZWQsCiAgICAg ICAgICAgICBQbGF5ZXJUaW1lQ2hhbmdlZCwKICAgICAgICAgICAgIFNlZWtDb21wbGV0ZWQsCisg ICAgICAgICAgICBEdXJhdGlvbkNoYW5nZWQsCiAgICAgICAgIH07CiAgICAgICAgIAogICAgICAg ICBOb3RpZmljYXRpb24oKQpAQCAtMjE3LDkgKzIxOCw5IEBAIHByb3RlY3RlZDoKIHByb3RlY3Rl ZDoKICAgICB2b2lkIHVwZGF0ZVN0YXRlcygpOwogCi0gICAgdm9pZCBzZXRIYXNWaWRlbyhib29s IGIpIHsgbV9jYWNoZWRIYXNWaWRlbyA9IGI7IH07Ci0gICAgdm9pZCBzZXRIYXNBdWRpbyhib29s IGIpIHsgbV9jYWNoZWRIYXNBdWRpbyA9IGI7IH0KLSAgICB2b2lkIHNldEhhc0Nsb3NlZENhcHRp b25zKGJvb2wgYikgeyBtX2NhY2hlZEhhc0NhcHRpb25zID0gYjsgfQorICAgIHZvaWQgc2V0SGFz VmlkZW8oYm9vbCk7CisgICAgdm9pZCBzZXRIYXNBdWRpbyhib29sKTsKKyAgICB2b2lkIHNldEhh c0Nsb3NlZENhcHRpb25zKGJvb2wpOwogICAgIHZvaWQgc2V0RGVsYXlDYWxsYmFja3MoYm9vbCk7 CiAgICAgdm9pZCBzZXRJZ25vcmVMb2FkU3RhdGVDaGFuZ2VzKGJvb2wgZGVsYXkpIHsgbV9pZ25v cmVMb2FkU3RhdGVDaGFuZ2VzID0gZGVsYXk7IH0KICAgICB2b2lkIHNldE5hdHVyYWxTaXplKElu dFNpemUpOwpAQCAtMjQwLDYgKzI0MSw3IEBAIHByb3RlY3RlZDoKICAgICBzdGF0aWMgdm9pZCBt YWluVGhyZWFkQ2FsbGJhY2sodm9pZCopOwogICAgIAogICAgIGZsb2F0IGludmFsaWRUaW1lKCkg Y29uc3QgeyByZXR1cm4gLTEuMGY7IH0KKyAgICB2b2lkIGludmFsaWRhdGVDYWNoZWREdXJhdGlv bigpOwogCiBwcml2YXRlOgogICAgIE1lZGlhUGxheWVyKiBtX3BsYXllcjsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLm1tCShyZXZpc2lvbiA4NjQ1MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC00MTQsMTMgKzQxNCwxNSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakM6CiAKIGZsb2F0IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakM6OnBsYXRmb3JtRHVyYXRpb24oKSBjb25zdAogewotICAgIGlmICghbV9hdkFzc2V0KQot ICAgICAgICByZXR1cm4gaW52YWxpZFRpbWUoKTsKKyAgICAvLyBEbyBub3QgYXNrIHRoZSBhc3Nl dCBmb3IgZHVyYXRpb24gYmVmb3JlIGl0IGhhcyBiZWVuIGxvYWRlZCBvciBpdCB3aWxsIGZldGNo IHRoZQorICAgIC8vIGFuc3dlciBzeW5jaHJvbm91c2x5LgorICAgIGlmICghbV9hdkFzc2V0IHx8 IGFzc2V0U3RhdHVzKCkgPCBNZWRpYVBsYXllckFWQXNzZXRTdGF0dXNMb2FkZWQpCisgICAgICAg ICByZXR1cm4gaW52YWxpZFRpbWUoKTsKICAgICAKICAgICBDTVRpbWUgY21EdXJhdGlvbjsKICAg ICAKLSAgICAvLyBDaGVjayB0aGUgQVZJdGVtIGlmIHdlIGhhdmUgb25lLCBzb21lIGFzc2V0cyBu ZXZlciByZXBvcnQgZHVyYXRpb24uCi0gICAgaWYgKG1fYXZQbGF5ZXJJdGVtKQorICAgIC8vIENo ZWNrIHRoZSBBVkl0ZW0gaWYgd2UgaGF2ZSBvbmUgYW5kIGl0IGhhcyBsb2FkZWQgZHVyYXRpb24s IHNvbWUgYXNzZXRzIG5ldmVyIHJlcG9ydCBkdXJhdGlvbi4KKyAgICBpZiAobV9hdlBsYXllckl0 ZW0gJiYgcGxheWVySXRlbVN0YXR1cygpID49IE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVtU3RhdHVz UmVhZHlUb1BsYXkpCiAgICAgICAgIGNtRHVyYXRpb24gPSBbbV9hdlBsYXllckl0ZW0uZ2V0KCkg ZHVyYXRpb25dOwogICAgIGVsc2UKICAgICAgICAgY21EdXJhdGlvbj0gW21fYXZBc3NldC5nZXQo KSBkdXJhdGlvbl07CkBAIC00MzEsNyArNDMzLDcgQEAgZmxvYXQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQwogICAgIGlmIChDTVRJTUVfSVNfSU5ERUZJTklURShjbUR1cmF0aW9u KSkKICAgICAgICAgcmV0dXJuIG51bWVyaWNfbGltaXRzPGZsb2F0Pjo6aW5maW5pdHkoKTsKIAot ICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmR1cmF0 aW9uKCVwKSAtIGludmFsaWQgZHVyYXRpb24sIHJldHVybmluZyAlLjBmIiwgdGhpcywgaW52YWxp ZFRpbWUoKSk7CisgICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQzo6cGxhdGZvcm1EdXJhdGlvbiglcCkgLSBpbnZhbGlkIGR1cmF0aW9uLCByZXR1cm5pbmcg JS4wZiIsIHRoaXMsIGludmFsaWRUaW1lKCkpOwogICAgIHJldHVybiBpbnZhbGlkVGltZSgpOwog fQogCkBAIC03OTYsNiArNzk4LDcgQEAgTlNBcnJheSogaXRlbUtWT1Byb3BlcnRpZXMoKQogICAg ICAgICAgICAgICAgIEAicGxheWJhY2tMaWtlbHlUb0tlZXBVcCIsCiAgICAgICAgICAgICAgICAg QCJwbGF5YmFja0J1ZmZlckZ1bGwiLAogICAgICAgICAgICAgICAgIEAicGxheWJhY2tCdWZmZXJF bXB0eSIsCisgICAgICAgICAgICAgICAgQCJkdXJhdGlvbiIsCiAgICAgICAgICAgICAgICAgbmls XTsKICAgICB9CiAgICAgcmV0dXJuIGtleXM7CkBAIC04ODYsNiArODg5LDggQEAgLSAodm9pZClv YnNlcnZlVmFsdWVGb3JLZXlQYXRoOmtleVBhdGggbwogICAgICAgICAgICAgbV9jYWxsYmFjay0+ c2NoZWR1bGVNYWluVGhyZWFkTm90aWZpY2F0aW9uKE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbjo6Tm90aWZpY2F0aW9uOjpJdGVtVHJhY2tzQ2hhbmdlZCk7CiAgICAgICAgIGVsc2UgaWYg KFtrZXlQYXRoIGlzRXF1YWxUb1N0cmluZzpAInByZXNlbnRhdGlvblNpemUiXSkKICAgICAgICAg ICAgIG1fY2FsbGJhY2stPnNjaGVkdWxlTWFpblRocmVhZE5vdGlmaWNhdGlvbihNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb246Ok5vdGlmaWNhdGlvbjo6SXRlbVByZXNlbnRhdGlvblNpemVD aGFuZ2VkKTsKKyAgICAgICAgZWxzZSBpZiAoW2tleVBhdGggaXNFcXVhbFRvU3RyaW5nOkAiZHVy YXRpb24iXSkKKyAgICAgICAgICAgIG1fY2FsbGJhY2stPnNjaGVkdWxlTWFpblRocmVhZE5vdGlm aWNhdGlvbihNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246Ok5vdGlmaWNhdGlvbjo6RHVy YXRpb25DaGFuZ2VkKTsKIAogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtODk0LDcgKzg5OSw3 IEBAIC0gKHZvaWQpb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0aDprZXlQYXRoIG8KICAgICAgICAgLy8g QSB2YWx1ZSBjaGFuZ2VkIGZvciBhbiBBVlBsYXllci4KICAgICAgICAgaWYgKFtrZXlQYXRoIGlz RXF1YWxUb1N0cmluZzpAInJhdGUiXSkKICAgICAgICAgICAgIG1fY2FsbGJhY2stPnNjaGVkdWxl TWFpblRocmVhZE5vdGlmaWNhdGlvbihNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246Ok5v dGlmaWNhdGlvbjo6UGxheWVyUmF0ZUNoYW5nZWQpOwotfQorICAgIH0KIH0KIAogQGVuZAo=