133138 2014-05-20 14:46:11 -0700 [Mac] DataCues do not work properly when rewinding video 2014-05-20 21:09:24 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 132715 1 bfulgham bfulgham bfulgham calvaris commit-queue eric.carlson esprehn+autocc gyuyoung.kim philipj webkit-bug-importer oldest_to_newest 1010636 0 bfulgham 2014-05-20 14:46:11 -0700 If you play a video that has embedded WebKitDataCue elements, the cues are displayed properly as you watch the video. However, if you rewind the video, the data cues are not re-displayed. 1010638 1 bfulgham 2014-05-20 14:49:39 -0700 This bug was introduced with Bug 132715 (Changeset <http://trac.webkit.org/changeset/168519>). 1. DataCue objects do not provide the correct startTimeVariance value for AVFoundation use. 2. The comparison in "hasEquivalentStartTime" should be "<=", rather than "<" to handle the case of zero startTimeVariance. 1010639 2 webkit-bug-importer 2014-05-20 14:52:00 -0700 <rdar://problem/16979086> 1010640 3 231796 bfulgham 2014-05-20 14:57:52 -0700 Created attachment 231796 Patch 1010656 4 231796 eric.carlson 2014-05-20 17:02:19 -0700 Comment on attachment 231796 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231796&action=review Did you mean to mark this r? If so, this looks good to me modulo the TextTrack.h change I don't understand. > Source/WebCore/html/track/TextTrack.h:162 > + virtual double startTimeVariance() const { return 0; } > + Why is this needed? 1010668 5 231804 bfulgham 2014-05-20 18:06:14 -0700 Created attachment 231804 Patch 1010678 6 231796 bfulgham 2014-05-20 19:21:21 -0700 Comment on attachment 231796 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231796&action=review >> Source/WebCore/html/track/TextTrack.h:162 >> + > > Why is this needed? This patch wasn't complete. Please check the current one. 1010696 7 bfulgham 2014-05-20 21:09:24 -0700 Committed r169146: <http://trac.webkit.org/changeset/169146> 231796 2014-05-20 14:57:52 -0700 2014-05-20 19:21:20 -0700 Patch bug-133138-20140520145729.patch text/plain 4666 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTEzNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA1LTIwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIERhdGFDdWVzIGRv IG5vdCB3b3JrIHByb3Blcmx5IHdoZW4gcmV3aW5kaW5nIHZpZGVvCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMxMzgKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE2OTc5MDg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1ha2UgdGhlIFRyYWNrUHJpdmF0ZUJhc2UgcmVzcG9uc2libGUgZm9yIGtub3dp bmcgaWYgYSB0eXBlIG9mIHRyYWNrIG5lZWRzIGEgbm9uLXplcm8KKyAgICAgICAgc3RhcnRUaW1l VmFyaWFuY2UgdmFsdWUuCisKKyAgICAgICAgKiBodG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2s6OnN0YXJ0VGltZVZhcmlhbmNl KTogQWRkZWQuCisgICAgICAgICogaHRtbC90cmFjay9JbmJhbmRUZXh0VHJhY2suaDoKKyAgICAg ICAgKiBodG1sL3RyYWNrL1RleHRUcmFjay5oOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFRyYWNr OjpzdGFydFRpbWVWYXJpYW5jZSk6IEFkZGVkLgorICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRy YWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0N1ZTo6aGFzRXF1aXZhbGVu dFN0YXJ0VGltZSk6IFRoaXMgZXF1YWxpdHkgc2hvdWxkIGhhdmUgYmVlbiBhCisgICAgICAgICI8 PSIgdG8gaGFuZGxlIHRoZSBjYXNlIG9mIHplcm8gc3RhcnRUaW1lVmFyaWFuY2UuCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvVHJhY2tQcml2YXRlQmFzZS5oOgorICAgICAgICAoV2ViQ29y ZTo6VHJhY2tQcml2YXRlQmFzZTo6c3RhcnRUaW1lVmFyaWFuY2UpOiBBZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFW Ri5oOgorCiAyMDE0LTA1LTIwICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTWFjXSBBbGxvdyBwb3B1cCBtZW51cyB0byBvdmVycmlkZSBkZWZhdWx0IGFwcGVhcmFu Y2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kVGV4dFRyYWNrLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5j cHAJKHJldmlzaW9uIDE2OTEyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5k VGV4dFRyYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjEzLDYgKzIxMywxNCBAQCB2b2lkIElu YmFuZFRleHRUcmFjazo6dXBkYXRlS2luZEZyb21Qcml2CiAgICAgfQogfQogCitkb3VibGUgSW5i YW5kVGV4dFRyYWNrOjpzdGFydFRpbWVWYXJpYW5jZSgpIGNvbnN0Cit7CisgICAgaWYgKCFtX3By aXZhdGUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAgICByZXR1cm4gbV9wcml2YXRl LT5zdGFydFRpbWVWYXJpYW5jZSgpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRUZXh0VHJhY2suaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5o CShyZXZpc2lvbiAxNjkxMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZFRl eHRUcmFjay5oCSh3b3JraW5nIGNvcHkpCkBAIC04Miw2ICs4Miw3IEBAIHByaXZhdGU6CiAgICAg dmlydHVhbCB2b2lkIHJlbW92ZUdlbmVyaWNDdWUoSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZSosIEdl bmVyaWNDdWVEYXRhKikgb3ZlcnJpZGUgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgfQogCiAgICAg dmlydHVhbCB2b2lkIHBhcnNlV2ViVlRUQ3VlRGF0YShJbmJhbmRUZXh0VHJhY2tQcml2YXRlKiwg Y29uc3QgY2hhciosIHVuc2lnbmVkKSBvdmVycmlkZSB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9 CisgICAgdmlydHVhbCBkb3VibGUgc3RhcnRUaW1lVmFyaWFuY2UoKSBjb25zdDsKIAogI2lmIFVT RShQTEFURk9STV9URVhUX1RSQUNLX01FTlUpCiAgICAgdmlydHVhbCBJbmJhbmRUZXh0VHJhY2tQ cml2YXRlKiBwcml2YXRlVHJhY2soKSBvdmVycmlkZSB7IHJldHVybiBtX3ByaXZhdGUuZ2V0KCk7 IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2suaAkocmV2aXNpb24gMTY5 MTI5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2suaAkod29ya2luZyBj b3B5KQpAQCAtMTU4LDYgKzE1OCw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBpc0lu YmFuZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKKyAgICB2aXJ0dWFsIGRvdWJsZSBzdGFy dFRpbWVWYXJpYW5jZSgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKwogICAgIHVzaW5nIFJlZkNvdW50 ZWQ8VHJhY2tCYXNlPjo6cmVmOwogICAgIHVzaW5nIFJlZkNvdW50ZWQ8VHJhY2tCYXNlPjo6ZGVy ZWY7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAJ KHJldmlzaW9uIDE2OTEyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNr Q3VlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE5LDcgKzIxOSw3IEBAIGJvb2wgVGV4dFRyYWNr Q3VlOjppc0VxdWFsKGNvbnN0IFRleHRUcmEKIAogYm9vbCBUZXh0VHJhY2tDdWU6Omhhc0VxdWl2 YWxlbnRTdGFydFRpbWUoY29uc3QgVGV4dFRyYWNrQ3VlJiBjdWUpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIHN0ZDo6YWJzKHN0ZDo6YWJzKHN0YXJ0VGltZSgpKSAtIHN0ZDo6YWJzKGN1ZS5zdGFydFRp bWUoKSkpIDwgc3RhcnRUaW1lVmFyaWFuY2UoKTsKKyAgICByZXR1cm4gc3RkOjphYnMoc3RkOjph YnMoc3RhcnRUaW1lKCkpIC0gc3RkOjphYnMoY3VlLnN0YXJ0VGltZSgpKSkgPD0gc3RhcnRUaW1l VmFyaWFuY2UoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVHJhY2tQcml2YXRlQmFzZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RyYWNrUHJpdmF0ZUJhc2UuaAkocmV2 aXNpb24gMTY5MTI5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVHJhY2tQ cml2YXRlQmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw4IEBAIHB1YmxpYzoKIAog ICAgIHZpcnR1YWwgaW50IHRyYWNrSW5kZXgoKSBjb25zdCB7IHJldHVybiAwOyB9CiAKKyAgICB2 aXJ0dWFsIGRvdWJsZSBzdGFydFRpbWVWYXJpYW5jZSgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAg ICAKICAgICB2b2lkIHdpbGxCZVJlbW92ZWQoKQogICAgIHsKICAgICAgICAgaWYgKFRyYWNrUHJp dmF0ZUJhc2VDbGllbnQqIGNsaWVudCA9IHRoaXMtPmNsaWVudCgpKQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1ByaXZh dGVBVkYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oCShyZXZpc2lvbiAxNjkxMjkp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5k VGV4dFRyYWNrUHJpdmF0ZUFWRi5oCSh3b3JraW5nIGNvcHkpCkBAIC02OSw2ICs2OSw4IEBAIHB1 YmxpYzoKICAgICB9OwogICAgIHZpcnR1YWwgQ2F0ZWdvcnkgdGV4dFRyYWNrQ2F0ZWdvcnkoKSBj b25zdCA9IDA7CiAgICAgCisgICAgdmlydHVhbCBkb3VibGUgc3RhcnRUaW1lVmFyaWFuY2UoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiAwLjI1OyB9CisgICAgCiBwcm90ZWN0ZWQ6CiAgICAgSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUFWRihBVkZJbmJhbmRUcmFja1BhcmVudCopOwogCg== 231804 2014-05-20 18:06:14 -0700 2014-05-20 20:44:00 -0700 Patch bug-133138-20140520180550.patch text/plain 9002 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTE0MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA1LTIwICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIERhdGFDdWVzIGRv IG5vdCB3b3JrIHByb3Blcmx5IHdoZW4gcmV3aW5kaW5nIHZpZGVvCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMxMzgKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE2OTc5MDg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1ha2UgdGhlIFRyYWNrUHJpdmF0ZUJhc2UgcmVzcG9uc2libGUgZm9yIGtub3dp bmcgaWYgYSB0eXBlIG9mIHRyYWNrIG5lZWRzIGEgbm9uLXplcm8KKyAgICAgICAgc3RhcnRUaW1l VmFyaWFuY2UgdmFsdWUuCisKKyAgICAgICAgQWxzbywgY29ycmVjdCBhIGJ1ZyBpbiB0aGUgZXF1 YWxpdHkgdGVzdCBmb3IgRGF0YUN1ZSBvYmplY3RzLgorCisgICAgICAgICogaHRtbC90cmFjay9E YXRhQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFDdWU6OmlzRXF1YWwpOiBIYW5kbGUg dGhlIEpTVmFsdWUgZGF0YSB0eXBlcyBjb25zaXN0ZW50bHksIHNvIHRoYXQgd2UgZG9uJ3QgYXR0 ZW1wdAorICAgICAgICB0byBjb21wYXJlIGEgSlNOdWxsIGFnYWluc3QgYSBkZWZhdWx0IEpTVmFs dWUgb2JqZWN0LgorICAgICAgICAqIGh0bWwvdHJhY2svSW5iYW5kVGV4dFRyYWNrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFjazo6c3RhcnRUaW1lVmFyaWFuY2UpOiBBZGRl ZC4KKyAgICAgICAgKiBodG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5oOgorICAgICAgICAqIGh0 bWwvdHJhY2svVGV4dFRyYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFjazo6aGFz Q3VlKTogVXNlIG5ldyBzdGFydFRpbWVWYXJpYW5jZSBtZXRob2QgbG9jYXRpb24uCisgICAgICAg ICogaHRtbC90cmFjay9UZXh0VHJhY2suaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFjazo6 c3RhcnRUaW1lVmFyaWFuY2UpOiBBZGRlZC4KKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFj a0N1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6Omhhc0VxdWl2YWxlbnRT dGFydFRpbWUpOiBVc2UgbmV3IHN0YXJ0VGltZVZhcmlhbmNlIGxvY2F0aW9uLgorICAgICAgICAq IGh0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmg6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tD dWU6OnN0YXJ0VGltZVZhcmlhbmNlKTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL3RyYWNrL1Rl eHRUcmFja0N1ZUdlbmVyaWMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9UcmFja1By aXZhdGVCYXNlLmg6CisgICAgICAgIChXZWJDb3JlOjpUcmFja1ByaXZhdGVCYXNlOjpzdGFydFRp bWVWYXJpYW5jZSk6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmg6CisKIDIwMTQtMDUtMjAgIE1hcmsgSGFo bmVuYmVyZyAgPG1oYWhuZW5iZXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXYXRjaGRvZyB0aW1l ciBzaG91bGQgYmUgbGF6aWx5IGFsbG9jYXRlZApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9EYXRhQ3VlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L0RhdGFDdWUuY3BwCShyZXZpc2lvbiAxNjkxMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3Ry YWNrL0RhdGFDdWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsMTAgKzE0NSwxMSBAQCBib29s IERhdGFDdWU6OmlzRXF1YWwoY29uc3QgVGV4dFRyYWNrQ3VlCiAgICAgaWYgKG1fcGxhdGZvcm1W YWx1ZSAmJiAhbV9wbGF0Zm9ybVZhbHVlLT5pc0VxdWFsKCpvdGhlclBsYXRmb3JtVmFsdWUuZ2V0 KCkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBKU0M6OkpTVmFsdWUgdGhpc1ZhbHVl ID0gdmFsdWUobnVsbHB0cik7CiAgICAgSlNDOjpKU1ZhbHVlIG90aGVyVmFsdWUgPSBkYXRhQ3Vl LT52YWx1ZShudWxscHRyKTsKLSAgICBpZiAoKG90aGVyVmFsdWUgJiYgIW1fdmFsdWUpIHx8ICgh b3RoZXJWYWx1ZSAmJiBtX3ZhbHVlKSkKKyAgICBpZiAoKG90aGVyVmFsdWUgJiYgIXRoaXNWYWx1 ZSkgfHwgKCFvdGhlclZhbHVlICYmIHRoaXNWYWx1ZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICBpZiAoIUpTQzo6SlNWYWx1ZTo6c3RyaWN0RXF1YWwobnVsbHB0ciwgbV92YWx1ZSA/IG1f dmFsdWUgOiBKU0M6OkpTVmFsdWUoKSwgb3RoZXJWYWx1ZSkpCisgICAgaWYgKCFKU0M6OkpTVmFs dWU6OnN0cmljdEVxdWFsKG51bGxwdHIsIHRoaXNWYWx1ZSwgb3RoZXJWYWx1ZSkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L0luYmFuZFRleHRUcmFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9JbmJhbmRUZXh0VHJhY2suY3BwCShyZXZpc2lvbiAxNjkxMjkpCisrKyBTb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIx Myw2ICsyMTMsMTQgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2s6OnVwZGF0ZUtpbmRGcm9tUHJpdgog ICAgIH0KIH0KIAorZG91YmxlIEluYmFuZFRleHRUcmFjazo6c3RhcnRUaW1lVmFyaWFuY2UoKSBj b25zdAoreworICAgIGlmICghbV9wcml2YXRlKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg CisgICAgcmV0dXJuIG1fcHJpdmF0ZS0+c3RhcnRUaW1lVmFyaWFuY2UoKTsKK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJh Y2svSW5iYW5kVGV4dFRyYWNrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9JbmJhbmRUZXh0VHJhY2suaAkocmV2aXNpb24gMTY5MTI5KQorKysgU291cmNlL1dlYkNv cmUvaHRtbC90cmFjay9JbmJhbmRUZXh0VHJhY2suaAkod29ya2luZyBjb3B5KQpAQCAtODIsNiAr ODIsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVHZW5lcmljQ3VlKEluYmFu ZFRleHRUcmFja1ByaXZhdGUqLCBHZW5lcmljQ3VlRGF0YSopIG92ZXJyaWRlIHsgQVNTRVJUX05P VF9SRUFDSEVEKCk7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBwYXJzZVdlYlZUVEN1ZURhdGEoSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZSosIGNvbnN0IGNoYXIqLCB1bnNpZ25lZCkgb3ZlcnJpZGUgeyBB U1NFUlRfTk9UX1JFQUNIRUQoKTsgfQorICAgIHZpcnR1YWwgZG91YmxlIHN0YXJ0VGltZVZhcmlh bmNlKCkgY29uc3Q7CiAKICNpZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQogICAgIHZp cnR1YWwgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZSogcHJpdmF0ZVRyYWNrKCkgb3ZlcnJpZGUgeyBy ZXR1cm4gbV9wcml2YXRlLmdldCgpOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L1RleHRUcmFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9U ZXh0VHJhY2suY3BwCShyZXZpc2lvbiAxNjkxMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3Ry YWNrL1RleHRUcmFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxOSw3ICs1MTksNyBAQCBib29s IFRleHRUcmFjazo6aGFzQ3VlKFRleHRUcmFja0N1ZSogY3VlCiAgICAgICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAgIGV4aXN0aW5nQ3VlID0gbV9jdWVzLT5p dGVtKHNlYXJjaFN0YXJ0IC0gMSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFleGlzdGluZ0N1ZSB8 fCBjdWUtPnN0YXJ0VGltZSgpID4gKGV4aXN0aW5nQ3VlLT5zdGFydFRpbWUoKSArIGV4aXN0aW5n Q3VlLT5zdGFydFRpbWVWYXJpYW5jZSgpKSkKKyAgICAgICAgICAgICAgICBpZiAoIWV4aXN0aW5n Q3VlIHx8IGN1ZS0+c3RhcnRUaW1lKCkgPiAoZXhpc3RpbmdDdWUtPnN0YXJ0VGltZSgpICsgc3Rh cnRUaW1lVmFyaWFuY2UoKSkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgICAgICAgICAgICAgIGlmICghZXhpc3RpbmdDdWUtPmlzRXF1YWwoKmN1ZSwgbWF0Y2gpKQpA QCAtNTMxLDcgKzUzMSw3IEBAIGJvb2wgVGV4dFRyYWNrOjpoYXNDdWUoVGV4dFRyYWNrQ3VlKiBj dWUKICAgICAgICAgCiAgICAgICAgIHNpemVfdCBpbmRleCA9IChzZWFyY2hTdGFydCArIHNlYXJj aEVuZCkgLyAyOwogICAgICAgICBleGlzdGluZ0N1ZSA9IG1fY3Vlcy0+aXRlbShpbmRleCk7Ci0g ICAgICAgIGlmICgoY3VlLT5zdGFydFRpbWUoKSArIGV4aXN0aW5nQ3VlLT5zdGFydFRpbWVWYXJp YW5jZSgpKSA8IGV4aXN0aW5nQ3VlLT5zdGFydFRpbWUoKSB8fCAobWF0Y2ggIT0gVGV4dFRyYWNr Q3VlOjpJZ25vcmVEdXJhdGlvbiAmJiBjdWUtPmhhc0VxdWl2YWxlbnRTdGFydFRpbWUoKmV4aXN0 aW5nQ3VlKSAmJiBjdWUtPmVuZFRpbWUoKSA+IGV4aXN0aW5nQ3VlLT5lbmRUaW1lKCkpKQorICAg ICAgICBpZiAoKGN1ZS0+c3RhcnRUaW1lKCkgKyBzdGFydFRpbWVWYXJpYW5jZSgpKSA8IGV4aXN0 aW5nQ3VlLT5zdGFydFRpbWUoKSB8fCAobWF0Y2ggIT0gVGV4dFRyYWNrQ3VlOjpJZ25vcmVEdXJh dGlvbiAmJiBjdWUtPmhhc0VxdWl2YWxlbnRTdGFydFRpbWUoKmV4aXN0aW5nQ3VlKSAmJiBjdWUt PmVuZFRpbWUoKSA+IGV4aXN0aW5nQ3VlLT5lbmRUaW1lKCkpKQogICAgICAgICAgICAgc2VhcmNo RW5kID0gaW5kZXg7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHNlYXJjaFN0YXJ0ID0gaW5k ZXggKyAxOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2suaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5oCShyZXZpc2lv biAxNjkxMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMSBHb29n bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDEy LCAyMDEzIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTEsIDIwMTIsIDIwMTMsIDIwMTQgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTU4LDYgKzE1OCw4IEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgYm9vbCBpc0luYmFuZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CiAKKyAgICB2aXJ0dWFsIGRvdWJsZSBzdGFydFRpbWVWYXJpYW5jZSgpIGNvbnN0IHsgcmV0dXJu IDA7IH0KKwogICAgIHVzaW5nIFJlZkNvdW50ZWQ8VHJhY2tCYXNlPjo6cmVmOwogICAgIHVzaW5n IFJlZkNvdW50ZWQ8VHJhY2tCYXNlPjo6ZGVyZWY7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL3RyYWNrL1RleHRUcmFja0N1ZS5jcHAJKHJldmlzaW9uIDE2OTEyOSkKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE5 LDcgKzIxOSwxMyBAQCBib29sIFRleHRUcmFja0N1ZTo6aXNFcXVhbChjb25zdCBUZXh0VHJhCiAK IGJvb2wgVGV4dFRyYWNrQ3VlOjpoYXNFcXVpdmFsZW50U3RhcnRUaW1lKGNvbnN0IFRleHRUcmFj a0N1ZSYgY3VlKSBjb25zdAogewotICAgIHJldHVybiBzdGQ6OmFicyhzdGQ6OmFicyhzdGFydFRp bWUoKSkgLSBzdGQ6OmFicyhjdWUuc3RhcnRUaW1lKCkpKSA8IHN0YXJ0VGltZVZhcmlhbmNlKCk7 CisgICAgZG91YmxlIHN0YXJ0VGltZVZhcmlhbmNlID0gMDsKKyAgICBpZiAodHJhY2soKSkKKyAg ICAgICAgc3RhcnRUaW1lVmFyaWFuY2UgPSB0cmFjaygpLT5zdGFydFRpbWVWYXJpYW5jZSgpOwor ICAgIGVsc2UgaWYgKGN1ZS50cmFjaygpKQorICAgICAgICBzdGFydFRpbWVWYXJpYW5jZSA9IGN1 ZS50cmFjaygpLT5zdGFydFRpbWVWYXJpYW5jZSgpOworCisgICAgcmV0dXJuIHN0ZDo6YWJzKHN0 ZDo6YWJzKHN0YXJ0VGltZSgpKSAtIHN0ZDo6YWJzKGN1ZS5zdGFydFRpbWUoKSkpIDw9IHN0YXJ0 VGltZVZhcmlhbmNlOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgJKHJldmlzaW9uIDE2OTEyOSkKKysrIFNv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgJKHdvcmtpbmcgY29weSkKQEAg LTg0LDcgKzg0LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc09yZGVyZWRCZWZvcmUo Y29uc3QgVGV4dFRyYWNrQ3VlKikgY29uc3Q7CiAKICAgICBib29sIGhhc0VxdWl2YWxlbnRTdGFy dFRpbWUoY29uc3QgVGV4dFRyYWNrQ3VlJikgY29uc3Q7Ci0gICAgdmlydHVhbCBkb3VibGUgc3Rh cnRUaW1lVmFyaWFuY2UoKSBjb25zdCB7IHJldHVybiAwOyB9CiAKICAgICBlbnVtIEN1ZVR5cGUg ewogICAgICAgICBEYXRhLApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJh Y2tDdWVHZW5lcmljLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9U ZXh0VHJhY2tDdWVHZW5lcmljLmgJKHJldmlzaW9uIDE2OTEyOSkKKysrIFNvdXJjZS9XZWJDb3Jl L2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw3 ICs3OCw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaXNPcmRlcmVk QmVmb3JlKGNvbnN0IFRleHRUcmFja0N1ZSopIGNvbnN0IG92ZXJyaWRlOwotICAgIHZpcnR1YWwg ZG91YmxlIHN0YXJ0VGltZVZhcmlhbmNlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gMC4yNTsg fQogCiAgICAgVGV4dFRyYWNrQ3VlR2VuZXJpYyhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgZG91 YmxlIHN0YXJ0LCBkb3VibGUgZW5kLCBjb25zdCBTdHJpbmcmKTsKICAgICAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RyYWNrUHJpdmF0ZUJhc2UuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UcmFja1ByaXZhdGVCYXNlLmgJ KHJldmlzaW9uIDE2OTEyOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Ry YWNrUHJpdmF0ZUJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsOCBAQCBwdWJsaWM6 CiAKICAgICB2aXJ0dWFsIGludCB0cmFja0luZGV4KCkgY29uc3QgeyByZXR1cm4gMDsgfQogCisg ICAgdmlydHVhbCBkb3VibGUgc3RhcnRUaW1lVmFyaWFuY2UoKSBjb25zdCB7IHJldHVybiAwOyB9 CisgICAgCiAgICAgdm9pZCB3aWxsQmVSZW1vdmVkKCkKICAgICB7CiAgICAgICAgIGlmIChUcmFj a1ByaXZhdGVCYXNlQ2xpZW50KiBjbGllbnQgPSB0aGlzLT5jbGllbnQoKSkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQ cml2YXRlQVZGLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkYuaAkocmV2aXNpb24gMTY5 MTI5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0lu YmFuZFRleHRUcmFja1ByaXZhdGVBVkYuaAkod29ya2luZyBjb3B5KQpAQCAtNjksNiArNjksOCBA QCBwdWJsaWM6CiAgICAgfTsKICAgICB2aXJ0dWFsIENhdGVnb3J5IHRleHRUcmFja0NhdGVnb3J5 KCkgY29uc3QgPSAwOwogICAgIAorICAgIHZpcnR1YWwgZG91YmxlIHN0YXJ0VGltZVZhcmlhbmNl KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gMC4yNTsgfQorICAgIAogcHJvdGVjdGVkOgogICAg IEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYoQVZGSW5iYW5kVHJhY2tQYXJlbnQqKTsKIAo=