45694 2010-09-13 11:51:24 -0700 'seeking' event should always fire 2011-01-24 12:17:44 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 51249 1 eric.carlson eric.carlson ademar oldest_to_newest 278355 0 eric.carlson 2010-09-13 11:51:24 -0700 In r5219 the spec was changed to require the 'seeking' event to always fire. 278385 1 67449 eric.carlson 2010-09-13 12:15:55 -0700 Created attachment 67449 Proposed patch. 283678 2 68527 eric.carlson 2010-09-23 09:00:25 -0700 Created attachment 68527 Revised patch 283798 3 67449 simon.fraser 2010-09-23 11:39:34 -0700 Comment on attachment 67449 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=67449&action=review > WebCore/ChangeLog:6 > + 'seeking' event should always fire > + https://bugs.webkit.org/show_bug.cgi?id=45694 Is this just a change to the spec that we're following? If so, the changelog should say. > WebCore/html/HTMLMediaElement.cpp:1099 > + // 2 - If the element's seeking IDL attribute is true, then another instance of this algorithm is > + // already running. Abort that other instance of the algorithm without waiting for the step that > + // it is running to complete. I don't understand how "another instance of the algorithm" can be running on the same element. Can the comment clarify this? 283856 4 eric.carlson 2010-09-23 12:38:20 -0700 http://trac.webkit.org/changeset/68181 339176 5 ademar 2011-01-24 12:17:44 -0800 Revision r68181 cherry-picked into qtwebkit-2.2 with commit d7a0127 <http://gitorious.org/webkit/qtwebkit/commit/d7a0127> 67449 2010-09-13 12:15:55 -0700 2010-09-23 11:39:34 -0700 Proposed patch. patch_3.txt text/plain 6827 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NzQwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMTMgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgJ3NlZWtpbmcnIGV2ZW50IHNob3VsZCBhbHdheXMgZmlyZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU2OTQKKworICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpz ZXRSZWFkeVN0YXRlKTogRG9uJ3QgbmVlZCB0byBmaXJlICdzZWVraW5nJyBldmVudCBoZXJlLgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2Vlayk6IEFsd2F5cyBmaXJlICdz ZWVraW5nJy4gVXBkYXRlIGNvbW1lbnRzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxl bWVudDo6ZmluaXNoU2Vlayk6IFVwZGF0ZSBjb21tZW50cy4KKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyVGltZUNoYW5nZWQpOiBEaXR0by4KKwogMjEwLTA5 LTEzICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZp c2lvbiA2NzQwMikKKysrIFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtOTYyLDIyICs5NjIsMTYgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRS ZWFkeVN0YXRlKE1lZAogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV9zZWVraW5nKSB7Ci0g ICAgICAgIC8vIDQuOC4xMC4xMCwgc3RlcCA4CisgICAgICAgIC8vIDQuOC4xMC45LCBzdGVwIDEx CiAgICAgICAgIGlmICh3YXNQb3RlbnRpYWxseVBsYXlpbmcgJiYgbV9yZWFkeVN0YXRlIDwgSEFW RV9GVVRVUkVfREFUQSkKICAgICAgICAgICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLndh aXRpbmdFdmVudCk7CiAKLSAgICAgICAgLy8gNC44LjEwLjEwLCBzdGVwIDkKLSAgICAgICAgaWYg KG1fcmVhZHlTdGF0ZSA8IEhBVkVfQ1VSUkVOVF9EQVRBKSB7Ci0gICAgICAgICAgICBpZiAob2xk U3RhdGUgPj0gSEFWRV9DVVJSRU5UX0RBVEEpCi0gICAgICAgICAgICAgICAgc2NoZWR1bGVFdmVu dChldmVudE5hbWVzKCkuc2Vla2luZ0V2ZW50KTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIC8vIDQuOC4xMC4xMCBzdGVwIDEyICYgMTMuCisgICAgICAgIC8vIDQuOC4xMC4xMCBzdGVw IDE0ICYgMTUuCisgICAgICAgIGlmIChtX3JlYWR5U3RhdGUgPj0gSEFWRV9DVVJSRU5UX0RBVEEp CiAgICAgICAgICAgICBmaW5pc2hTZWVrKCk7Ci0gICAgICAgIH0KLQogICAgIH0gZWxzZSB7CiAg ICAgICAgIGlmICh3YXNQb3RlbnRpYWxseVBsYXlpbmcgJiYgbV9yZWFkeVN0YXRlIDwgSEFWRV9G VVRVUkVfREFUQSkgewotICAgICAgICAgICAgLy8gNC44LjEwLjkKKyAgICAgICAgICAgIC8vIDQu OC4xMC44CiAgICAgICAgICAgICBzY2hlZHVsZVRpbWV1cGRhdGVFdmVudChmYWxzZSk7CiAgICAg ICAgICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS53YWl0aW5nRXZlbnQpOwogICAgICAg ICB9CkBAIC0xMTAwLDI3ICsxMDk0LDM3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2Vlayhm bG9hdCB0aW1lLCAKICAgICAvLyBHZXQgdGhlIGN1cnJlbnQgdGltZSBiZWZvcmUgc2V0dGluZyBt X3NlZWtpbmcsIG1fbGFzdFNlZWtUaW1lIGlzIHJldHVybmVkIG9uY2UgaXQgaXMgc2V0LgogICAg IGZsb2F0IG5vdyA9IGN1cnJlbnRUaW1lKCk7CiAKKyAgICAvLyAyIC0gSWYgdGhlIGVsZW1lbnQn cyBzZWVraW5nIElETCBhdHRyaWJ1dGUgaXMgdHJ1ZSwgdGhlbiBhbm90aGVyIGluc3RhbmNlIG9m IHRoaXMgYWxnb3JpdGhtIGlzCisgICAgLy8gYWxyZWFkeSBydW5uaW5nLiBBYm9ydCB0aGF0IG90 aGVyIGluc3RhbmNlIG9mIHRoZSBhbGdvcml0aG0gd2l0aG91dCB3YWl0aW5nIGZvciB0aGUgc3Rl cCB0aGF0CisgICAgLy8gaXQgaXMgcnVubmluZyB0byBjb21wbGV0ZS4KKyAgICAvLyBOb3RoaW5n IHNwZWNpZmljIHRvIGJlIGRvbmUgaGVyZS4KKwogICAgIC8vIDMgLSBTZXQgdGhlIHNlZWtpbmcg SURMIGF0dHJpYnV0ZSB0byB0cnVlLgogICAgIC8vIFRoZSBmbGFnIHdpbGwgYmUgY2xlYXJlZCB3 aGVuIHRoZSBlbmdpbmUgdGVsbHMgaXMgdGhlIHRpbWUgaGFzIGFjdHVhbGx5IGNoYW5nZWQKICAg ICBtX3NlZWtpbmcgPSB0cnVlOwogCi0gICAgLy8gNCAtIFF1ZXVlIGEgdGFzayB0byBmaXJlIGEg c2ltcGxlIGV2ZW50IG5hbWVkIHRpbWV1cGRhdGUgYXQgdGhlIGVsZW1lbnQuCi0gICAgc2NoZWR1 bGVUaW1ldXBkYXRlRXZlbnQoZmFsc2UpOwotCi0gICAgLy8gNiAtIElmIHRoZSBuZXcgcGxheWJh Y2sgcG9zaXRpb24gaXMgbGF0ZXIgdGhhbiB0aGUgZW5kIG9mIHRoZSBtZWRpYSByZXNvdXJjZSwg dGhlbiBsZXQgaXQgYmUgdGhlIGVuZCAKKyAgICAvLyA1IC0gSWYgdGhlIG5ldyBwbGF5YmFjayBw b3NpdGlvbiBpcyBsYXRlciB0aGFuIHRoZSBlbmQgb2YgdGhlIG1lZGlhIHJlc291cmNlLCB0aGVu IGxldCBpdCBiZSB0aGUgZW5kIAogICAgIC8vIG9mIHRoZSBtZWRpYSByZXNvdXJjZSBpbnN0ZWFk LgogICAgIHRpbWUgPSBtaW4odGltZSwgZHVyYXRpb24oKSk7CiAKLSAgICAvLyA3IC0gSWYgdGhl IG5ldyBwbGF5YmFjayBwb3NpdGlvbiBpcyBsZXNzIHRoYW4gdGhlIGVhcmxpZXN0IHBvc3NpYmxl IHBvc2l0aW9uLCBsZXQgaXQgYmUgdGhhdCBwb3NpdGlvbiBpbnN0ZWFkLgorICAgIC8vIDYgLSBJ ZiB0aGUgbmV3IHBsYXliYWNrIHBvc2l0aW9uIGlzIGxlc3MgdGhhbiB0aGUgZWFybGllc3QgcG9z c2libGUgcG9zaXRpb24sIGxldCBpdCBiZSB0aGF0IHBvc2l0aW9uIGluc3RlYWQuCiAgICAgZmxv YXQgZWFybGllc3RUaW1lID0gbV9wbGF5ZXItPnN0YXJ0VGltZSgpOwogICAgIHRpbWUgPSBtYXgo dGltZSwgZWFybGllc3RUaW1lKTsKIAotICAgIC8vIDggLSBJZiB0aGUgKHBvc3NpYmx5IG5vdyBj aGFuZ2VkKSBuZXcgcGxheWJhY2sgcG9zaXRpb24gaXMgbm90IGluIG9uZSBvZiB0aGUgcmFuZ2Vz IGdpdmVuIGluIHRoZSAKKyAgICAvLyA3IC0gSWYgdGhlIChwb3NzaWJseSBub3cgY2hhbmdlZCkg bmV3IHBsYXliYWNrIHBvc2l0aW9uIGlzIG5vdCBpbiBvbmUgb2YgdGhlIHJhbmdlcyBnaXZlbiBp biB0aGUgCiAgICAgLy8gc2Vla2FibGUgYXR0cmlidXRlLCB0aGVuIGxldCBpdCBiZSB0aGUgcG9z aXRpb24gaW4gb25lIG9mIHRoZSByYW5nZXMgZ2l2ZW4gaW4gdGhlIHNlZWthYmxlIGF0dHJpYnV0 ZSAKICAgICAvLyB0aGF0IGlzIHRoZSBuZWFyZXN0IHRvIHRoZSBuZXcgcGxheWJhY2sgcG9zaXRp b24uIC4uLiBJZiB0aGVyZSBhcmUgbm8gcmFuZ2VzIGdpdmVuIGluIHRoZSBzZWVrYWJsZQogICAg IC8vIGF0dHJpYnV0ZSB0aGVuIHNldCB0aGUgc2Vla2luZyBJREwgYXR0cmlidXRlIHRvIGZhbHNl IGFuZCBhYm9ydCB0aGVzZSBzdGVwcy4KICAgICBSZWZQdHI8VGltZVJhbmdlcz4gc2Vla2FibGVS YW5nZXMgPSBzZWVrYWJsZSgpOwogICAgIGlmICghc2Vla2FibGVSYW5nZXMtPmxlbmd0aCgpIHx8 IHRpbWUgPT0gbm93KSB7CisKKyAgICAgICAgLy8gU2hvcnQgY2lyY3VpdCBzZWVraW5nIHRvIHRo ZSBjdXJyZW50IHRpbWUgYnkganVzdCBmaXJpbmcgdGhlIGV2ZW50cywgbm8gbmVlZCB0bworICAg ICAgICAvLyBjYWxsIHRoZSBtZWRpYSBlbmdpbmUgYXQgYWxsLgorICAgICAgICBpZiAodGltZSA9 PSBub3cpIHsKKyAgICAgICAgICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLnNlZWtpbmdF dmVudCk7CisgICAgICAgICAgICBzY2hlZHVsZVRpbWV1cGRhdGVFdmVudChmYWxzZSk7CisgICAg ICAgICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS5zZWVrZWRFdmVudCk7CisgICAgICAg IH0KICAgICAgICAgbV9zZWVraW5nID0gZmFsc2U7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC0xMTMzLDIwICsxMTM3LDI2IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2VlayhmbG9hdCB0 aW1lLCAKICAgICBtX2xhc3RTZWVrVGltZSA9IHRpbWU7CiAgICAgbV9zZW50RW5kRXZlbnQgPSBm YWxzZTsKIAotICAgIC8vIDkgLSBTZXQgdGhlIGN1cnJlbnQgcGxheWJhY2sgcG9zaXRpb24gdG8g dGhlIGdpdmVuIG5ldyBwbGF5YmFjayBwb3NpdGlvbgorICAgIC8vIDggLSBTZXQgdGhlIGN1cnJl bnQgcGxheWJhY2sgcG9zaXRpb24gdG8gdGhlIGdpdmVuIG5ldyBwbGF5YmFjayBwb3NpdGlvbgog ICAgIG1fcGxheWVyLT5zZWVrKHRpbWUpOwogCi0gICAgLy8gMTAtMTUgYXJlIGhhbmRsZWQsIGlm IG5lY2Vzc2FyeSwgd2hlbiB0aGUgZW5naW5lIHNpZ25hbHMgYSByZWFkeXN0YXRlIGNoYW5nZS4K KyAgICAvLyA5IC0gUXVldWUgYSB0YXNrIHRvIGZpcmUgYSBzaW1wbGUgZXZlbnQgbmFtZWQgc2Vl a2luZyBhdCB0aGUgZWxlbWVudC4KKyAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS5zZWVr aW5nRXZlbnQpOworCisgICAgLy8gMTAgLSBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhIHNpbXBsZSBl dmVudCBuYW1lZCB0aW1ldXBkYXRlIGF0IHRoZSBlbGVtZW50LgorICAgIHNjaGVkdWxlVGltZXVw ZGF0ZUV2ZW50KGZhbHNlKTsKKworICAgIC8vIDExLTE1IGFyZSBoYW5kbGVkLCBpZiBuZWNlc3Nh cnksIHdoZW4gdGhlIGVuZ2luZSBzaWduYWxzIGEgcmVhZHlzdGF0ZSBjaGFuZ2UuCiB9CiAKIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6ZmluaXNoU2VlaygpCiB7CiAgICAgTE9HKE1lZGlhLCAiSFRN TE1lZGlhRWxlbWVudDo6ZmluaXNoU2VlayIpOwogCi0gICAgLy8gNC44LjEwLjEwIFNlZWtpbmcg c3RlcCAxMgorICAgIC8vIDQuOC4xMC45IFNlZWtpbmcgc3RlcCAxNAogICAgIG1fc2Vla2luZyA9 IGZhbHNlOwogCi0gICAgLy8gNC44LjEwLjEwIFNlZWtpbmcgc3RlcCAxMworICAgIC8vIDQuOC4x MC45IFNlZWtpbmcgc3RlcCAxNQogICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLnNlZWtl ZEV2ZW50KTsKIAogICAgIHNldERpc3BsYXlNb2RlKFZpZGVvKTsKQEAgLTE2NTksOCArMTY2OSw4 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJUaW1lQ2gKICAgICAvLyBtb3Zp ZSB0aW1lLgogICAgIHNjaGVkdWxlVGltZXVwZGF0ZUV2ZW50KGZhbHNlKTsKIAotICAgIC8vIDQu OC4xMC4xMCBzdGVwIDEyICYgMTMuICBOZWVkZWQgaWYgbm8gUmVhZHlTdGF0ZSBjaGFuZ2UgaXMg YXNzb2NpYXRlZCB3aXRoIHRoZSBzZWVrLgotICAgIGlmIChtX3JlYWR5U3RhdGUgPj0gSEFWRV9D VVJSRU5UX0RBVEEgJiYgbV9zZWVraW5nKQorICAgIC8vIDQuOC4xMC45IHN0ZXAgMTQgJiAxNS4g IE5lZWRlZCBpZiBubyBSZWFkeVN0YXRlIGNoYW5nZSBpcyBhc3NvY2lhdGVkIHdpdGggdGhlIHNl ZWsuCisgICAgaWYgKG1fc2Vla2luZyAmJiBtX3JlYWR5U3RhdGUgPj0gSEFWRV9DVVJSRU5UX0RB VEEpCiAgICAgICAgIGZpbmlzaFNlZWsoKTsKICAgICAKICAgICBmbG9hdCBub3cgPSBjdXJyZW50 VGltZSgpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNjc0MDEpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAxMC0wOS0xMyAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAnc2Vla2luZycgZXZlbnQgc2hvdWxkIGFsd2F5cyBmaXJl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTY5NAor CisgICAgICAgICogbWVkaWEvZXZlbnQtYXR0cmlidXRlcy1leHBlY3RlZC50eHQ6IFVwZGF0ZSBm b3IgY2hhbmdlcy4KKwogMjAxMC0wOS0xMyAgQWRhbSBMYW5nbGV5ICA8YWdsQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLiBMYXlvdXQgdGVzdCByZS1iYXNlbGluZS4KSW5kZXg6 IExheW91dFRlc3RzL21lZGlhL2V2ZW50LWF0dHJpYnV0ZXMtZXhwZWN0ZWQudHh0Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL21lZGlhL2V2ZW50LWF0dHJpYnV0ZXMtZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiA2NzExNikKKysrIExheW91dFRlc3RzL21lZGlhL2V2ZW50LWF0dHJpYnV0ZXMtZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBAIEVWRU5UKHBhdXNlKQog CiAqKiogc2Vla2luZwogUlVOKHZpZGVvLmN1cnJlbnRUaW1lID0gNS42KQorRVZFTlQoc2Vla2lu ZykKIEVWRU5UKHNlZWtlZCkKIAogKioqIGJlZ2lubmluZyBwbGF5YmFjawo= 68527 2010-09-23 09:00:25 -0700 2010-09-23 11:40:09 -0700 Revised patch patch_4.txt text/plain 7041 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODEzMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMjMgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgJ3NlZWtpbmcnIGV2ZW50IHNob3VsZCBhbHdheXMgZmlyZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU2OTQKKworICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpz ZXRSZWFkeVN0YXRlKTogRG9uJ3QgbmVlZCB0byBmaXJlICdzZWVraW5nJyBldmVudCBoZXJlLgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2Vlayk6IEFsd2F5cyBmaXJlICdz ZWVraW5nJy4gVXBkYXRlIGNvbW1lbnRzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxl bWVudDo6ZmluaXNoU2Vlayk6IFVwZGF0ZSBjb21tZW50cy4KKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyVGltZUNoYW5nZWQpOiBEaXR0by4KKwogMjAxMC0w OS0yMyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQ2hyaXMgRmxlaXphY2guCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZp c2lvbiA2Nzk3NSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtOTYzLDIyICs5NjMsMTYgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRS ZWFkeVN0YXRlKE1lZAogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV9zZWVraW5nKSB7Ci0g ICAgICAgIC8vIDQuOC4xMC4xMCwgc3RlcCA4CisgICAgICAgIC8vIDQuOC4xMC45LCBzdGVwIDEx CiAgICAgICAgIGlmICh3YXNQb3RlbnRpYWxseVBsYXlpbmcgJiYgbV9yZWFkeVN0YXRlIDwgSEFW RV9GVVRVUkVfREFUQSkKICAgICAgICAgICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLndh aXRpbmdFdmVudCk7CiAKLSAgICAgICAgLy8gNC44LjEwLjEwLCBzdGVwIDkKLSAgICAgICAgaWYg KG1fcmVhZHlTdGF0ZSA8IEhBVkVfQ1VSUkVOVF9EQVRBKSB7Ci0gICAgICAgICAgICBpZiAob2xk U3RhdGUgPj0gSEFWRV9DVVJSRU5UX0RBVEEpCi0gICAgICAgICAgICAgICAgc2NoZWR1bGVFdmVu dChldmVudE5hbWVzKCkuc2Vla2luZ0V2ZW50KTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIC8vIDQuOC4xMC4xMCBzdGVwIDEyICYgMTMuCisgICAgICAgIC8vIDQuOC4xMC4xMCBzdGVw IDE0ICYgMTUuCisgICAgICAgIGlmIChtX3JlYWR5U3RhdGUgPj0gSEFWRV9DVVJSRU5UX0RBVEEp CiAgICAgICAgICAgICBmaW5pc2hTZWVrKCk7Ci0gICAgICAgIH0KLQogICAgIH0gZWxzZSB7CiAg ICAgICAgIGlmICh3YXNQb3RlbnRpYWxseVBsYXlpbmcgJiYgbV9yZWFkeVN0YXRlIDwgSEFWRV9G VVRVUkVfREFUQSkgewotICAgICAgICAgICAgLy8gNC44LjEwLjkKKyAgICAgICAgICAgIC8vIDQu OC4xMC44CiAgICAgICAgICAgICBzY2hlZHVsZVRpbWV1cGRhdGVFdmVudChmYWxzZSk7CiAgICAg ICAgICAgICBzY2hlZHVsZUV2ZW50KGV2ZW50TmFtZXMoKS53YWl0aW5nRXZlbnQpOwogICAgICAg ICB9CkBAIC0xMTAxLDI3ICsxMDk1LDM5IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2Vlayhm bG9hdCB0aW1lLCAKICAgICAvLyBHZXQgdGhlIGN1cnJlbnQgdGltZSBiZWZvcmUgc2V0dGluZyBt X3NlZWtpbmcsIG1fbGFzdFNlZWtUaW1lIGlzIHJldHVybmVkIG9uY2UgaXQgaXMgc2V0LgogICAg IGZsb2F0IG5vdyA9IGN1cnJlbnRUaW1lKCk7CiAKKyAgICAvLyAyIC0gSWYgdGhlIGVsZW1lbnQn cyBzZWVraW5nIElETCBhdHRyaWJ1dGUgaXMgdHJ1ZSwgdGhlbiBhbm90aGVyIGluc3RhbmNlIG9m IHRoaXMgYWxnb3JpdGhtIGlzCisgICAgLy8gYWxyZWFkeSBydW5uaW5nLiBBYm9ydCB0aGF0IG90 aGVyIGluc3RhbmNlIG9mIHRoZSBhbGdvcml0aG0gd2l0aG91dCB3YWl0aW5nIGZvciB0aGUgc3Rl cCB0aGF0CisgICAgLy8gaXQgaXMgcnVubmluZyB0byBjb21wbGV0ZS4KKyAgICAvLyBOb3RoaW5n IHNwZWNpZmljIHRvIGJlIGRvbmUgaGVyZS4KKwogICAgIC8vIDMgLSBTZXQgdGhlIHNlZWtpbmcg SURMIGF0dHJpYnV0ZSB0byB0cnVlLgogICAgIC8vIFRoZSBmbGFnIHdpbGwgYmUgY2xlYXJlZCB3 aGVuIHRoZSBlbmdpbmUgdGVsbHMgaXMgdGhlIHRpbWUgaGFzIGFjdHVhbGx5IGNoYW5nZWQKICAg ICBtX3NlZWtpbmcgPSB0cnVlOwogCi0gICAgLy8gNCAtIFF1ZXVlIGEgdGFzayB0byBmaXJlIGEg c2ltcGxlIGV2ZW50IG5hbWVkIHRpbWV1cGRhdGUgYXQgdGhlIGVsZW1lbnQuCi0gICAgc2NoZWR1 bGVUaW1ldXBkYXRlRXZlbnQoZmFsc2UpOwotCi0gICAgLy8gNiAtIElmIHRoZSBuZXcgcGxheWJh Y2sgcG9zaXRpb24gaXMgbGF0ZXIgdGhhbiB0aGUgZW5kIG9mIHRoZSBtZWRpYSByZXNvdXJjZSwg dGhlbiBsZXQgaXQgYmUgdGhlIGVuZCAKKyAgICAvLyA1IC0gSWYgdGhlIG5ldyBwbGF5YmFjayBw b3NpdGlvbiBpcyBsYXRlciB0aGFuIHRoZSBlbmQgb2YgdGhlIG1lZGlhIHJlc291cmNlLCB0aGVu IGxldCBpdCBiZSB0aGUgZW5kIAogICAgIC8vIG9mIHRoZSBtZWRpYSByZXNvdXJjZSBpbnN0ZWFk LgogICAgIHRpbWUgPSBtaW4odGltZSwgZHVyYXRpb24oKSk7CiAKLSAgICAvLyA3IC0gSWYgdGhl IG5ldyBwbGF5YmFjayBwb3NpdGlvbiBpcyBsZXNzIHRoYW4gdGhlIGVhcmxpZXN0IHBvc3NpYmxl IHBvc2l0aW9uLCBsZXQgaXQgYmUgdGhhdCBwb3NpdGlvbiBpbnN0ZWFkLgorICAgIC8vIDYgLSBJ ZiB0aGUgbmV3IHBsYXliYWNrIHBvc2l0aW9uIGlzIGxlc3MgdGhhbiB0aGUgZWFybGllc3QgcG9z c2libGUgcG9zaXRpb24sIGxldCBpdCBiZSB0aGF0IHBvc2l0aW9uIGluc3RlYWQuCiAgICAgZmxv YXQgZWFybGllc3RUaW1lID0gbV9wbGF5ZXItPnN0YXJ0VGltZSgpOwogICAgIHRpbWUgPSBtYXgo dGltZSwgZWFybGllc3RUaW1lKTsKIAotICAgIC8vIDggLSBJZiB0aGUgKHBvc3NpYmx5IG5vdyBj aGFuZ2VkKSBuZXcgcGxheWJhY2sgcG9zaXRpb24gaXMgbm90IGluIG9uZSBvZiB0aGUgcmFuZ2Vz IGdpdmVuIGluIHRoZSAKKyAgICAvLyA3IC0gSWYgdGhlIChwb3NzaWJseSBub3cgY2hhbmdlZCkg bmV3IHBsYXliYWNrIHBvc2l0aW9uIGlzIG5vdCBpbiBvbmUgb2YgdGhlIHJhbmdlcyBnaXZlbiBp biB0aGUgCiAgICAgLy8gc2Vla2FibGUgYXR0cmlidXRlLCB0aGVuIGxldCBpdCBiZSB0aGUgcG9z aXRpb24gaW4gb25lIG9mIHRoZSByYW5nZXMgZ2l2ZW4gaW4gdGhlIHNlZWthYmxlIGF0dHJpYnV0 ZSAKICAgICAvLyB0aGF0IGlzIHRoZSBuZWFyZXN0IHRvIHRoZSBuZXcgcGxheWJhY2sgcG9zaXRp b24uIC4uLiBJZiB0aGVyZSBhcmUgbm8gcmFuZ2VzIGdpdmVuIGluIHRoZSBzZWVrYWJsZQogICAg IC8vIGF0dHJpYnV0ZSB0aGVuIHNldCB0aGUgc2Vla2luZyBJREwgYXR0cmlidXRlIHRvIGZhbHNl IGFuZCBhYm9ydCB0aGVzZSBzdGVwcy4KICAgICBSZWZQdHI8VGltZVJhbmdlcz4gc2Vla2FibGVS YW5nZXMgPSBzZWVrYWJsZSgpOwotICAgIGlmICghc2Vla2FibGVSYW5nZXMtPmxlbmd0aCgpIHx8 IHRpbWUgPT0gbm93KSB7CisKKyAgICAvLyBTaG9ydCBjaXJjdWl0IHNlZWtpbmcgdG8gdGhlIGN1 cnJlbnQgdGltZSBieSBqdXN0IGZpcmluZyB0aGUgZXZlbnRzIGlmIG5vIHNlZWsgaXMgcmVxdWly ZWQuCisgICAgLy8gRG9uJ3Qgc2tpcCBjYWxsaW5nIHRoZSBtZWRpYSBlbmdpbmUgaWYgd2UgYXJl IGluIHBvc3RlciBtb2RlIGJlY2F1c2UgYSBzZWVrIHNob3VsZCBhbHdheXMgCisgICAgLy8gY2Fu Y2VsIHBvc3RlciBkaXNwbGF5LgorICAgIGJvb2wgbm9TZWVrUmVxdWlyZWQgPSAhc2Vla2FibGVS YW5nZXMtPmxlbmd0aCgpIHx8ICh0aW1lID09IG5vdyAmJiBkaXNwbGF5TW9kZSgpICE9IFBvc3Rl cik7CisgICAgaWYgKG5vU2Vla1JlcXVpcmVkKSB7CisgICAgICAgIGlmICh0aW1lID09IG5vdykg eworICAgICAgICAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCkuc2Vla2luZ0V2ZW50KTsK KyAgICAgICAgICAgIHNjaGVkdWxlVGltZXVwZGF0ZUV2ZW50KGZhbHNlKTsKKyAgICAgICAgICAg IHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLnNlZWtlZEV2ZW50KTsKKyAgICAgICAgfQogICAg ICAgICBtX3NlZWtpbmcgPSBmYWxzZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTExMzQs MjAgKzExNDAsMjYgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZWVrKGZsb2F0IHRpbWUsIAog ICAgIG1fbGFzdFNlZWtUaW1lID0gdGltZTsKICAgICBtX3NlbnRFbmRFdmVudCA9IGZhbHNlOwog Ci0gICAgLy8gOSAtIFNldCB0aGUgY3VycmVudCBwbGF5YmFjayBwb3NpdGlvbiB0byB0aGUgZ2l2 ZW4gbmV3IHBsYXliYWNrIHBvc2l0aW9uCisgICAgLy8gOCAtIFNldCB0aGUgY3VycmVudCBwbGF5 YmFjayBwb3NpdGlvbiB0byB0aGUgZ2l2ZW4gbmV3IHBsYXliYWNrIHBvc2l0aW9uCiAgICAgbV9w bGF5ZXItPnNlZWsodGltZSk7CiAKLSAgICAvLyAxMC0xNSBhcmUgaGFuZGxlZCwgaWYgbmVjZXNz YXJ5LCB3aGVuIHRoZSBlbmdpbmUgc2lnbmFscyBhIHJlYWR5c3RhdGUgY2hhbmdlLgorICAgIC8v IDkgLSBRdWV1ZSBhIHRhc2sgdG8gZmlyZSBhIHNpbXBsZSBldmVudCBuYW1lZCBzZWVraW5nIGF0 IHRoZSBlbGVtZW50LgorICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLnNlZWtpbmdFdmVu dCk7CisKKyAgICAvLyAxMCAtIFF1ZXVlIGEgdGFzayB0byBmaXJlIGEgc2ltcGxlIGV2ZW50IG5h bWVkIHRpbWV1cGRhdGUgYXQgdGhlIGVsZW1lbnQuCisgICAgc2NoZWR1bGVUaW1ldXBkYXRlRXZl bnQoZmFsc2UpOworCisgICAgLy8gMTEtMTUgYXJlIGhhbmRsZWQsIGlmIG5lY2Vzc2FyeSwgd2hl biB0aGUgZW5naW5lIHNpZ25hbHMgYSByZWFkeXN0YXRlIGNoYW5nZS4KIH0KIAogdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpmaW5pc2hTZWVrKCkKIHsKICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFF bGVtZW50OjpmaW5pc2hTZWVrIik7CiAKLSAgICAvLyA0LjguMTAuMTAgU2Vla2luZyBzdGVwIDEy CisgICAgLy8gNC44LjEwLjkgU2Vla2luZyBzdGVwIDE0CiAgICAgbV9zZWVraW5nID0gZmFsc2U7 CiAKLSAgICAvLyA0LjguMTAuMTAgU2Vla2luZyBzdGVwIDEzCisgICAgLy8gNC44LjEwLjkgU2Vl a2luZyBzdGVwIDE1CiAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCkuc2Vla2VkRXZlbnQp OwogCiAgICAgc2V0RGlzcGxheU1vZGUoVmlkZW8pOwpAQCAtMTY2MCw4ICsxNjcyLDggQEAgdm9p ZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclRpbWVDaAogICAgIC8vIG1vdmllIHRpbWUu CiAgICAgc2NoZWR1bGVUaW1ldXBkYXRlRXZlbnQoZmFsc2UpOwogCi0gICAgLy8gNC44LjEwLjEw IHN0ZXAgMTIgJiAxMy4gIE5lZWRlZCBpZiBubyBSZWFkeVN0YXRlIGNoYW5nZSBpcyBhc3NvY2lh dGVkIHdpdGggdGhlIHNlZWsuCi0gICAgaWYgKG1fcmVhZHlTdGF0ZSA+PSBIQVZFX0NVUlJFTlRf REFUQSAmJiBtX3NlZWtpbmcpCisgICAgLy8gNC44LjEwLjkgc3RlcCAxNCAmIDE1LiAgTmVlZGVk IGlmIG5vIFJlYWR5U3RhdGUgY2hhbmdlIGlzIGFzc29jaWF0ZWQgd2l0aCB0aGUgc2Vlay4KKyAg ICBpZiAobV9zZWVraW5nICYmIG1fcmVhZHlTdGF0ZSA+PSBIQVZFX0NVUlJFTlRfREFUQSkKICAg ICAgICAgZmluaXNoU2VlaygpOwogICAgIAogICAgIGZsb2F0IG5vdyA9IGN1cnJlbnRUaW1lKCk7 CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCShyZXZpc2lvbiA2ODEzMykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEwLTA5LTIzICBFcmljIENhcmxzb24gIDxl cmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICdzZWVraW5nJyBldmVudCBzaG91bGQgYWx3YXlzIGZpcmUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1Njk0CisKKyAgICAg ICAgKiBtZWRpYS9ldmVudC1hdHRyaWJ1dGVzLWV4cGVjdGVkLnR4dDogVXBkYXRlIGZvciBjaGFu Z2VzLgorCiAyMDEwLTA5LTIzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUnViYmVyLXN0YW1wZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBMYXlvdXRUZXN0cy9t ZWRpYS9ldmVudC1hdHRyaWJ1dGVzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9tZWRpYS9ldmVudC1hdHRyaWJ1dGVzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gNjc5NzUp CisrKyBMYXlvdXRUZXN0cy9tZWRpYS9ldmVudC1hdHRyaWJ1dGVzLWV4cGVjdGVkLnR4dAkod29y a2luZyBjb3B5KQpAQCAtMjUsNiArMjUsNyBAQCBFVkVOVChwYXVzZSkKIAogKioqIHNlZWtpbmcK IFJVTih2aWRlby5jdXJyZW50VGltZSA9IDUuNikKK0VWRU5UKHNlZWtpbmcpCiBFVkVOVChzZWVr ZWQpCiAKICoqKiBiZWdpbm5pbmcgcGxheWJhY2sK