31002 2009-11-01 19:40:59 -0800 Web Inspector: Add support for window events to Timeline. 2009-11-03 09:41:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 knorton webkit-unassigned bweinstein eric joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 159716 0 knorton 2009-11-01 19:40:59 -0800 Good to see things like onresize on the timeline. patch coming. 159719 1 42291 knorton 2009-11-01 19:54:16 -0800 Created attachment 42291 Proposed change. 159724 2 42292 knorton 2009-11-01 20:32:34 -0800 Created attachment 42292 Merged window and dom events to the same callbacks. 159726 3 42292 timothy 2009-11-01 20:39:23 -0800 Comment on attachment 42292 Merged window and dom events to the same callbacks. You need to update localizableStrings.js for the DOM Event => Event string change. Otherwise r+. 159727 4 42294 knorton 2009-11-01 20:43:08 -0800 Created attachment 42294 Adds missing change to localizedStrings.js 159728 5 42294 timothy 2009-11-01 20:49:59 -0800 Comment on attachment 42294 Adds missing change to localizedStrings.js Need to binary diff for localizableStrings.js. 159729 6 42295 knorton 2009-11-01 20:53:05 -0800 Created attachment 42295 w/ binary diff. 159743 7 42295 commit-queue 2009-11-01 22:18:06 -0800 Comment on attachment 42295 w/ binary diff. Rejecting patch 42295 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Timothy Hatcher', '--force']" exit_code: 2 Last 500 characters of output: ile WebCore/ChangeLog patch: **** Only garbage was found in the patch input. patching file WebCore/dom/Node.cpp patching file WebCore/inspector/InspectorTimelineAgent.cpp patching file WebCore/inspector/InspectorTimelineAgent.h patching file WebCore/inspector/TimelineRecordFactory.cpp patching file WebCore/inspector/TimelineRecordFactory.h patching file WebCore/inspector/front-end/TimelineAgent.js patching file WebCore/inspector/front-end/TimelinePanel.js patching file WebCore/page/DOMWindow.cpp 159761 8 pfeldman 2009-11-02 01:37:51 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/dom/Node.cpp M WebCore/inspector/InspectorTimelineAgent.cpp M WebCore/inspector/InspectorTimelineAgent.h M WebCore/inspector/TimelineRecordFactory.cpp M WebCore/inspector/TimelineRecordFactory.h M WebCore/inspector/front-end/TimelineAgent.js M WebCore/inspector/front-end/TimelinePanel.js M WebCore/page/DOMWindow.cpp Committed r50407 160090 9 eric 2009-11-03 09:41:39 -0800 I believe you hit bug 26830. 42291 2009-11-01 19:54:16 -0800 2009-11-01 20:32:34 -0800 Proposed change. Timeline-window-events.diff text/plain 8549 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjM0NzFkMi4uYjhmOWJkOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNSBAQAogMjAwOS0xMS0wMSAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHMgd2luZG93IGV2ZW50IGRpc3BhdGNoZXMgdG8gSW5zcGVjdG9y VGltZWxpbmVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMxMDAyCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRGlz cGF0Y2hET01FdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50 Ojp3aWxsRGlzcGF0Y2hXaW5kb3dFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWREaXNwYXRjaFdpbmRvd0V2ZW50KToKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oOgorICAgICAgICAoV2ViQ29yZTo6KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZlbnREaXNwYXRjaFJlY29yZCk6IFJl bmFtZWQuCisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qczoKKyAgICAgICAgKiBw YWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmRpc3BhdGNo RXZlbnQpOgorCisyMDA5LTExLTAxICBLZWxseSBOb3J0b24gIDxrbm9ydG9uQGdvb2dsZS5jb20+ CisKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgogCiAgICAgICAgIERvZXMg bm90IHNlbmQgRE9NIGRpc3BhdGNoZXMgdG8gdGhlIEluc3BlY3RvclRpbWVsaW5lQWdlbnQgaWYg dGhlcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKaW5k ZXggNGY3YjczNi4uOGYzN2JjZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5jcHAKQEAgLTUzLDcgKzUzLDggQEAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 fkluc3BlY3RvclRpbWVsaW5lQWdlbnQoKQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OndpbGxEaXNwYXRjaERPTUV2ZW50KGNvbnN0IEV2ZW50JiBldmVudCkKIHsKLSAgICBwdXNoQ3Vy cmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZURPTURpc3BhdGNoUmVjb3Jk KG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgZXZlbnQpLCBET01EaXNw YXRjaFRpbWVsaW5lUmVjb3JkVHlwZSk7CisgICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmVudERpc3BhdGNoUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJl bnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgZXZlbnQpLAorICAgICAgICBET01EaXNwYXRjaFRpbWVs aW5lUmVjb3JkVHlwZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRGlz cGF0Y2hET01FdmVudCgpCkBAIC02MSw2ICs2MiwxNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZERpc3BhdGNoRE9NRXZlbnQoKQogICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29y ZChET01EaXNwYXRjaFRpbWVsaW5lUmVjb3JkVHlwZSk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNoV2luZG93RXZlbnQoY29uc3QgRXZlbnQmIGV2ZW50KQor eworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZl bnREaXNwYXRjaFJlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCks IGV2ZW50KSwKKyAgICAgICAgV2luZG93RGlzcGF0Y2hUaW1lbGluZVJlY29yZFR5cGUpOworfQor Cit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZERpc3BhdGNoV2luZG93RXZlbnQoKQor eworICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChXaW5kb3dEaXNwYXRjaFRpbWVsaW5lUmVj b3JkVHlwZSk7Cit9CisKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbExheW91dCgp CiB7CiAgICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVH ZW5lcmljUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSksIExh eW91dFRpbWVsaW5lUmVjb3JkVHlwZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmgKaW5kZXggMDQwMTk3Ny4uMDRhMWUwNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaApAQCAtNTQsNiArNTQsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2VSZWNvcmRUeXBlID0gOCwKICAgICAg ICAgWEhSTG9hZFJlY29yZFR5cGUgPSA5LAogICAgICAgICBFdmFsdWF0ZVNjcmlwdFRhZ1RpbWVs aW5lUmVjb3JkVHlwZSA9IDEwLAorICAgICAgICBXaW5kb3dEaXNwYXRjaFRpbWVsaW5lUmVjb3Jk VHlwZSA9IDExLAogICAgIH07CiAKICAgICBjbGFzcyBJbnNwZWN0b3JUaW1lbGluZUFnZW50IHsK QEAgLTY4LDYgKzY5LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHdpbGxE aXNwYXRjaERPTUV2ZW50KGNvbnN0IEV2ZW50Jik7CiAgICAgICAgIHZvaWQgZGlkRGlzcGF0Y2hE T01FdmVudCgpOwogCisgICAgICAgIHZvaWQgd2lsbERpc3BhdGNoV2luZG93RXZlbnQoY29uc3Qg RXZlbnQmKTsKKyAgICAgICAgdm9pZCBkaWREaXNwYXRjaFdpbmRvd0V2ZW50KCk7CisKICAgICAg ICAgdm9pZCB3aWxsTGF5b3V0KCk7CiAgICAgICAgIHZvaWQgZGlkTGF5b3V0KCk7CiAKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAgYi9XZWJD b3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCmluZGV4IDA4NWJjZDkuLjlm OWFkOWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9y eS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcApA QCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgIlNjcmlwdE9iamVjdC5oIgogbmFtZXNwYWNlIFdl YkNvcmUgewogCi0vLyBzdGF0aWMKIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZUdlbmVyaWNSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUg c3RhcnRUaW1lKQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBmcm9udGVuZC0+bmV3U2Ny aXB0T2JqZWN0KCk7CkBAIC00Nyw4ICs0Niw3IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29y ZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250CiAg ICAgcmV0dXJuIHJlY29yZDsKIH0KIAotLy8gc3RhdGljCi1TY3JpcHRPYmplY3QgVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVET01EaXNwYXRjaFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCog ZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IEV2ZW50JiBldmVudCkKK1NjcmlwdE9i amVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2ZW50RGlzcGF0Y2hSZWNvcmQoSW5z cGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBFdmVudCYg ZXZlbnQpCiB7CiAgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQo ZnJvbnRlbmQsIHN0YXJ0VGltZSk7CiAgICAgU2NyaXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+ bmV3U2NyaXB0T2JqZWN0KCk7CkBAIC01Nyw3ICs1NSw2IEBAIFNjcmlwdE9iamVjdCBUaW1lbGlu ZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZURPTURpc3BhdGNoUmVjb3JkKEluc3BlY3RvckZyb250ZW5k KiBmCiAgICAgcmV0dXJuIHJlY29yZDsKIH0KIAotLy8gc3RhdGljCiBTY3JpcHRPYmplY3QgVGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljVGltZXJSZWNvcmQoSW5zcGVjdG9yRnJv bnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBpbnQgdGltZXJJZCkKIHsKICAgICBT Y3JpcHRPYmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRU aW1lKTsKQEAgLTY3LDcgKzY0LDYgQEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9y eTo6Y3JlYXRlR2VuZXJpY1RpbWVyUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKgogICAgIHJldHVy biByZWNvcmQ7CiB9CiAKLS8vIHN0YXRpYwogU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlVGltZXJJbnN0YWxsUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVu ZCwgZG91YmxlIHN0YXJ0VGltZSwgaW50IHRpbWVySWQsIGludCB0aW1lb3V0LCBib29sIHNpbmds ZVNob3QpCiB7CiAgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQo ZnJvbnRlbmQsIHN0YXJ0VGltZSk7CkBAIC03OSw3ICs3NSw2IEBAIFNjcmlwdE9iamVjdCBUaW1l bGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbFJlY29yZChJbnNwZWN0b3JGcm9u dGVuZCoKICAgICByZXR1cm4gcmVjb3JkOwogfQogCi0vLyBzdGF0aWMKIFNjcmlwdE9iamVjdCBU aW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUlJlYWR5U3RhdGVDaGFuZ2VUaW1lbGluZVJl Y29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0 IFN0cmluZyYgdXJsLCBpbnQgcmVhZHlTdGF0ZSkKIHsKICAgICBTY3JpcHRPYmplY3QgcmVjb3Jk ID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKQEAgLTkwLDcgKzg1 LDYgQEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSUmVhZHlT dGF0ZUNoYW5nZVRpbWVsaW5lUmVjb3JkKEluc3AKICAgICByZXR1cm4gcmVjb3JkOwogfQogCi0v LyBzdGF0aWMKIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUkxv YWRUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFy dFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsKQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBj cmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwpAQCAtMTAwLDcgKzk0LDYg QEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9hZFRpbWVs aW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW4KICAgICByZXR1cm4gcmVjb3JkOwogfQogCi0vLyBz dGF0aWMKIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRl U2NyaXB0VGFnVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3Vi bGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGxpbmVOdW1iZXIpIAogewog ICAgIFNjcmlwdE9iamVjdCBpdGVtID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3Rh cnRUaW1lKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFj dG9yeS5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKaW5kZXgg M2QzNjY0OS4uZGE5ZGE2NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVS ZWNvcmRGYWN0b3J5LmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0 b3J5LmgKQEAgLTQzLDcgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHB1YmxpYzoK ICAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVHZW5lcmljUmVjb3JkKEluc3BlY3Rv ckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSk7CiAKLSAgICAgICAgc3RhdGljIFNjcmlwdE9i amVjdCBjcmVhdGVET01EaXNwYXRjaFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBz dGFydFRpbWUsIGNvbnN0IEV2ZW50Jik7CisgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3Jl YXRlRXZlbnREaXNwYXRjaFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRp bWUsIGNvbnN0IEV2ZW50Jik7CiAKICAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVH ZW5lcmljVGltZXJSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBp bnQgdGltZXJJZCk7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZUFnZW50LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdl bnQuanMKaW5kZXggY2JiYjczNi4uZjI3ZTc2MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKQEAgLTQ0LDcgKzQ0LDggQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lQWdlbnQuUmVjb3JkVHlwZSA9IHsKICAgICBUaW1lckZpcmUgICAgICAgICAgIDogNywK ICAgICBYSFJSZWFkeVN0YXRlQ2hhbmdlIDogOCwKICAgICBYSFJMb2FkICAgICAgICAgICAgIDog OSwKLSAgICBFdmFsdWF0ZVNjcmlwdFRhZyAgIDogMTAKKyAgICBFdmFsdWF0ZVNjcmlwdFRhZyAg IDogMTAsCisgICAgV2luZG93RGlzcGF0Y2ggICAgICA6IDExLAogfTsKIAogV2ViSW5zcGVjdG9y LmFkZFJlY29yZFRvVGltZWxpbmUgPSBmdW5jdGlvbihyZWNvcmQpIHsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKaW5k ZXggMmMxYmEyYi4uNWQxMzQ1MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5j cHAKKysrIGIvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTUzLDYgKzUzLDcgQEAKICNp bmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKICNpbmNsdWRlICJIaXN0b3J5LmgiCiAj aW5jbHVkZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgorI2luY2x1ZGUgIkluc3BlY3RvclRpbWVs aW5lQWdlbnQuaCIKICNpbmNsdWRlICJMb2NhdGlvbi5oIgogI2luY2x1ZGUgIk1lZGlhLmgiCiAj aW5jbHVkZSAiTWVzc2FnZUV2ZW50LmgiCkBAIC0xMzEwLDcgKzEzMTEsMjMgQEAgYm9vbCBET01X aW5kb3c6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4gcHJwRXZlbnQsIFBhc3NSZWZQ dHI8RXZlbnRUYXJnZXQKICAgICBldmVudC0+c2V0Q3VycmVudFRhcmdldCh0aGlzKTsKICAgICBl dmVudC0+c2V0RXZlbnRQaGFzZShFdmVudDo6QVRfVEFSR0VUKTsKIAotICAgIHJldHVybiBmaXJl RXZlbnRMaXN0ZW5lcnMoZXZlbnQuZ2V0KCkpOworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAg SW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IDA7CisgICAgaWYgKGZyYW1l KCkgJiYgZnJhbWUoKS0+cGFnZSgpKQorICAgICAgICB0aW1lbGluZUFnZW50ID0gZnJhbWUoKS0+ cGFnZSgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CisgICAgYm9vbCB0aW1lbGluZUFnZW50 SXNBY3RpdmUgPSB0aW1lbGluZUFnZW50ICYmIGhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50LT50eXBl KCkpOworICAgIGlmICh0aW1lbGluZUFnZW50SXNBY3RpdmUpCisgICAgICAgIHRpbWVsaW5lQWdl bnQtPndpbGxEaXNwYXRjaFdpbmRvd0V2ZW50KCpldmVudCk7CisjZW5kaWYKKworICAgIGJvb2wg cmVzdWx0ID0gZmlyZUV2ZW50TGlzdGVuZXJzKGV2ZW50LmdldCgpKTsKKworI2lmIEVOQUJMRShJ TlNQRUNUT1IpCisgICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkKKyAgICAgICAgdGltZWxp bmVBZ2VudC0+ZGlkRGlzcGF0Y2hXaW5kb3dFdmVudCgpOworI2VuZGlmCisKKyAgICByZXR1cm4g cmVzdWx0OwogfQogCiB2b2lkIERPTVdpbmRvdzo6cmVtb3ZlQWxsRXZlbnRMaXN0ZW5lcnMoKQo= 42292 2009-11-01 20:32:34 -0800 2009-11-01 20:43:08 -0800 Merged window and dom events to the same callbacks. Timeline-window-events.diff text/plain 11327 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjM0NzFkMi4uM2JjMTFkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAwOS0xMS0wMSAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHMgd2luZG93IGV2ZW50IGRpc3BhdGNoZXMgdG8gSW5zcGVjdG9y VGltZWxpbmVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMxMDAyCisKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6IFVwZGF0ZWQgY2FsbCBzaXRl IHRvIHdpbGxEaXNwYXRjaEV2ZW50IGFuZCBkaWREaXNwYXRjaEV2ZW50LgorICAgICAgICAoV2Vi Q29yZTo6Tm9kZTo6ZGlzcGF0Y2hHZW5lcmljRXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OndpbGxEaXNwYXRjaEV2ZW50KTogUmVuYW1lZC4KKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZERpc3BhdGNoRXZlbnQpOiBSZW5hbWVkLgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAgIChX ZWJDb3JlOjopOgorICAgICAgICAqIGluc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmVudERp c3BhdGNoUmVjb3JkKTogUmVuYW1lZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNv cmRGYWN0b3J5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50 LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fZm9ybWF0UmVjb3Jk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fZ2V0UmVj b3JkRGV0YWlscyk6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RE9NV2luZG93OjpkaXNwYXRjaEV2ZW50KToKKworMjAwOS0xMS0wMSAgS2VsbHkgTm9y dG9uICA8a25vcnRvbkBnb29nbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KIAogICAgICAgICBEb2VzIG5vdCBzZW5kIERPTSBkaXNwYXRjaGVzIHRvIHRoZSBJ bnNwZWN0b3JUaW1lbGluZUFnZW50IGlmIHRoZXJlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9O b2RlLmNwcCBiL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDhiNTQ5NGYuLmUxNzgyODcgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL05vZGUuY3BwCisrKyBiL1dlYkNvcmUvZG9tL05vZGUuY3Bw CkBAIC0yNDc5LDcgKzI0NzksNyBAQCBib29sIE5vZGU6OmRpc3BhdGNoR2VuZXJpY0V2ZW50KFBh c3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50KQogICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRp bWVsaW5lQWdlbnQgPSBkb2N1bWVudCgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CiAgICAg Ym9vbCB0aW1lbGluZUFnZW50SXNBY3RpdmUgPSB0aW1lbGluZUFnZW50ICYmIGV2ZW50SGFzTGlz dGVuZXJzKGV2ZW50LT50eXBlKCksIHRoaXMsIGFuY2VzdG9ycyk7ICAgIAogICAgIGlmICh0aW1l bGluZUFnZW50SXNBY3RpdmUpCi0gICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRjaERP TUV2ZW50KCpldmVudCk7CisgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRjaEV2ZW50 KCpldmVudCk7CiAjZW5kaWYKIAogICAgIC8vIFNldCB1cCBhIHBvaW50ZXIgdG8gaW5kaWNhdGUg d2hldGhlciAvIHdoZXJlIHRvIGRpc3BhdGNoIHdpbmRvdyBldmVudHMuCkBAIC0yNTc0LDcgKzI1 NzQsNyBAQCBkb25lRGlzcGF0Y2hpbmc6CiBkb25lV2l0aERlZmF1bHQ6CiAjaWYgRU5BQkxFKElO U1BFQ1RPUikKICAgICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZlKQotICAgICAgICB0aW1lbGlu ZUFnZW50LT5kaWREaXNwYXRjaERPTUV2ZW50KCk7CisgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRp ZERpc3BhdGNoRXZlbnQoKTsKICNlbmRpZgogCiAgICAgRG9jdW1lbnQ6OnVwZGF0ZVN0eWxlRm9y QWxsRG9jdW1lbnRzKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuY3BwCmluZGV4IDRmN2I3MzYuLmI0YzE3ODYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC01MSwxNCArNTEsMTUgQEAgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6fkluc3BlY3RvclRpbWVsaW5lQWdlbnQoKQogewogfQogCi12b2lkIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OndpbGxEaXNwYXRjaERPTUV2ZW50KGNvbnN0IEV2ZW50JiBldmVu dCkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNoRXZlbnQoY29uc3Qg RXZlbnQmIGV2ZW50KQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlRE9NRGlzcGF0Y2hSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1p bGxpc2Vjb25kcygpLCBldmVudCksIERPTURpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAg ICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2ZW50RGlz cGF0Y2hSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCBldmVu dCksCisgICAgICAgIEV2ZW50RGlzcGF0Y2hUaW1lbGluZVJlY29yZFR5cGUpOwogfQogCi12b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZERpc3BhdGNoRE9NRXZlbnQoKQordm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWREaXNwYXRjaEV2ZW50KCkKIHsKLSAgICBkaWRDb21wbGV0 ZUN1cnJlbnRSZWNvcmQoRE9NRGlzcGF0Y2hUaW1lbGluZVJlY29yZFR5cGUpOworICAgIGRpZENv bXBsZXRlQ3VycmVudFJlY29yZChFdmVudERpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlKTsKIH0K IAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTGF5b3V0KCkKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaCBiL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCAwNDAxOTc3Li4wZTE0ZGUyIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCkBAIC00Myw3ICs0 Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIC8vIE11c3QgYmUga2VwdCBpbiBzeW5j IHdpdGggVGltZWxpbmVBZ2VudC5qcwogICAgIGVudW0gVGltZWxpbmVSZWNvcmRUeXBlIHsKLSAg ICAgICAgRE9NRGlzcGF0Y2hUaW1lbGluZVJlY29yZFR5cGUgPSAwLAorICAgICAgICBFdmVudERp c3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlID0gMCwKICAgICAgICAgTGF5b3V0VGltZWxpbmVSZWNv cmRUeXBlID0gMSwKICAgICAgICAgUmVjYWxjdWxhdGVTdHlsZXNUaW1lbGluZVJlY29yZFR5cGUg PSAyLAogICAgICAgICBQYWludFRpbWVsaW5lUmVjb3JkVHlwZSA9IDMsCkBAIC02NSw4ICs2NSw4 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCByZXNldEZyb250ZW5kUHJveHlP YmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqKTsKIAogICAgICAgICAvLyBNZXRob2RzIGNhbGxlZCBm cm9tIFdlYkNvcmUuCi0gICAgICAgIHZvaWQgd2lsbERpc3BhdGNoRE9NRXZlbnQoY29uc3QgRXZl bnQmKTsKLSAgICAgICAgdm9pZCBkaWREaXNwYXRjaERPTUV2ZW50KCk7CisgICAgICAgIHZvaWQg d2lsbERpc3BhdGNoRXZlbnQoY29uc3QgRXZlbnQmKTsKKyAgICAgICAgdm9pZCBkaWREaXNwYXRj aEV2ZW50KCk7CiAKICAgICAgICAgdm9pZCB3aWxsTGF5b3V0KCk7CiAgICAgICAgIHZvaWQgZGlk TGF5b3V0KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZh Y3RvcnkuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcApp bmRleCAwODViY2Q5Li45ZjlhZDlkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1l bGluZVJlY29yZEZhY3RvcnkuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVj b3JkRmFjdG9yeS5jcHAKQEAgLTM5LDcgKzM5LDYgQEAKICNpbmNsdWRlICJTY3JpcHRPYmplY3Qu aCIKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gc3RhdGljCiBTY3JpcHRPYmplY3QgVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBm cm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSkKIHsKICAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0g ZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwpAQCAtNDcsOCArNDYsNyBAQCBTY3JpcHRPYmpl Y3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKEluc3BlY3RvckZy b250ZW5kKiBmcm9udAogICAgIHJldHVybiByZWNvcmQ7CiB9CiAKLS8vIHN0YXRpYwotU2NyaXB0 T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRE9NRGlzcGF0Y2hSZWNvcmQoSW5z cGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBFdmVudCYg ZXZlbnQpCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmVudERp c3BhdGNoUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGlt ZSwgY29uc3QgRXZlbnQmIGV2ZW50KQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVh dGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwogICAgIFNjcmlwdE9iamVjdCBk YXRhID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwpAQCAtNTcsNyArNTUsNiBAQCBTY3Jp cHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVET01EaXNwYXRjaFJlY29yZChJ bnNwZWN0b3JGcm9udGVuZCogZgogICAgIHJldHVybiByZWNvcmQ7CiB9CiAKLS8vIHN0YXRpYwog U2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyUmVj b3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgaW50IHRp bWVySWQpCiB7CiAgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQo ZnJvbnRlbmQsIHN0YXJ0VGltZSk7CkBAIC02Nyw3ICs2NCw2IEBAIFNjcmlwdE9iamVjdCBUaW1l bGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNUaW1lclJlY29yZChJbnNwZWN0b3JGcm9u dGVuZCoKICAgICByZXR1cm4gcmVjb3JkOwogfQogCi0vLyBzdGF0aWMKIFNjcmlwdE9iamVjdCBU aW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbFJlY29yZChJbnNwZWN0b3JG cm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGludCB0aW1lcklkLCBpbnQgdGlt ZW91dCwgYm9vbCBzaW5nbGVTaG90KQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVh dGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwpAQCAtNzksNyArNzUsNiBAQCBT Y3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lckluc3RhbGxSZWNv cmQoSW5zcGVjdG9yRnJvbnRlbmQqCiAgICAgcmV0dXJuIHJlY29yZDsKIH0KIAotLy8gc3RhdGlj CiBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0YXRl Q2hhbmdlVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUg c3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IHJlYWR5U3RhdGUpCiB7CiAgICAgU2Ny aXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGlt ZSk7CkBAIC05MCw3ICs4NSw2IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZVhIUlJlYWR5U3RhdGVDaGFuZ2VUaW1lbGluZVJlY29yZChJbnNwCiAgICAgcmV0dXJu IHJlY29yZDsKIH0KIAotLy8gc3RhdGljCiBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0 b3J5OjpjcmVhdGVYSFJMb2FkVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250 ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBTY3JpcHRP YmplY3QgcmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsK QEAgLTEwMCw3ICs5NCw2IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVhIUkxvYWRUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuCiAgICAgcmV0dXJuIHJl Y29yZDsKIH0KIAotLy8gc3RhdGljCiBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5 OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdFRhZ1RpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5k KiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBs aW5lTnVtYmVyKSAKIHsKICAgICBTY3JpcHRPYmplY3QgaXRlbSA9IGNyZWF0ZUdlbmVyaWNSZWNv cmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9U aW1lbGluZVJlY29yZEZhY3RvcnkuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3Jk RmFjdG9yeS5oCmluZGV4IDNkMzY2NDkuLmRhOWRhNjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1Rp bWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC00Myw3ICs0Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICBwdWJsaWM6CiAgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlR2VuZXJp Y1JlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUpOwogCi0gICAgICAg IHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlRE9NRGlzcGF0Y2hSZWNvcmQoSW5zcGVjdG9yRnJv bnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBFdmVudCYpOworICAgICAgICBzdGF0aWMg U2NyaXB0T2JqZWN0IGNyZWF0ZUV2ZW50RGlzcGF0Y2hSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQq LCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBFdmVudCYpOwogCiAgICAgICAgIHN0YXRpYyBTY3Jp cHRPYmplY3QgY3JlYXRlR2VuZXJpY1RpbWVyUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91 YmxlIHN0YXJ0VGltZSwgaW50IHRpbWVySWQpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZUFnZW50LmpzCmluZGV4IGNiYmI3MzYuLmRlYTY4YzUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzCkBAIC0zNCw3ICszNCw3IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50ID0gZnVuY3Rpb24oKSB7CiAKIC8vIE11c3QgYmUg a2VwdCBpbiBzeW5jIHdpdGggVGltZWxpbmVJdGVtLmgKIFdlYkluc3BlY3Rvci5UaW1lbGluZUFn ZW50LlJlY29yZFR5cGUgPSB7Ci0gICAgRE9NRGlzcGF0Y2ggICAgICAgICA6IDAsCisgICAgRXZl bnREaXNwYXRjaCAgICAgICA6IDAsCiAgICAgTGF5b3V0ICAgICAgICAgICAgICA6IDEsCiAgICAg UmVjYWxjdWxhdGVTdHlsZXMgICA6IDIsCiAgICAgUGFpbnQgICAgICAgICAgICAgICA6IDMsCkBA IC00NCw3ICs0NCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUgPSB7 CiAgICAgVGltZXJGaXJlICAgICAgICAgICA6IDcsCiAgICAgWEhSUmVhZHlTdGF0ZUNoYW5nZSA6 IDgsCiAgICAgWEhSTG9hZCAgICAgICAgICAgICA6IDksCi0gICAgRXZhbHVhdGVTY3JpcHRUYWcg ICA6IDEwCisgICAgRXZhbHVhdGVTY3JpcHRUYWcgICA6IDEwLAogfTsKIAogV2ViSW5zcGVjdG9y LmFkZFJlY29yZFRvVGltZWxpbmUgPSBmdW5jdGlvbihyZWNvcmQpIHsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXggY2U0ZTM5Yi4uNGQxYzkzMSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTE0 MSw3ICsxNDEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGlmICghdGhpcy5fcmVjb3JkU3R5bGVzKSB7CiAgICAgICAgICAgICB0aGlzLl9yZWNv cmRTdHlsZXMgPSB7fTsKICAgICAgICAgICAgIHZhciByZWNvcmRUeXBlcyA9IFdlYkluc3BlY3Rv ci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGU7Ci0gICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHls ZXNbcmVjb3JkVHlwZXMuRE9NRGlzcGF0Y2hdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJET00gRXZlbnQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5zY3JpcHRpbmcgfTsK KyAgICAgICAgICAgIHRoaXMuX3JlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5FdmVudERpc3BhdGNo XSA9IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXZlbnQiKSwgY2F0ZWdvcnk6IHRo aXMuY2F0ZWdvcmllcy5zY3JpcHRpbmcgfTsKICAgICAgICAgICAgIHRoaXMuX3JlY29yZFN0eWxl c1tyZWNvcmRUeXBlcy5MYXlvdXRdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJM YXlvdXQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5yZW5kZXJpbmcgfTsKICAgICAgICAg ICAgIHRoaXMuX3JlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5SZWNhbGN1bGF0ZVN0eWxlc10gPSB7 IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlY2FsY3VsYXRlIFN0eWxlIiksIGNhdGVn b3J5OiB0aGlzLmNhdGVnb3JpZXMucmVuZGVyaW5nIH07CiAgICAgICAgICAgICB0aGlzLl9yZWNv cmRTdHlsZXNbcmVjb3JkVHlwZXMuUGFpbnRdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJQYWludCIpLCBjYXRlZ29yeTogdGhpcy5jYXRlZ29yaWVzLnJlbmRlcmluZyB9OwpAQCAt MTc0LDcgKzE3NCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsK ICAgICBfZ2V0UmVjb3JkRGV0YWlsczogZnVuY3Rpb24ocmVjb3JkKQogICAgIHsKICAgICAgICAg c3dpdGNoIChyZWNvcmQudHlwZSkgewotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGlu ZUFnZW50LlJlY29yZFR5cGUuRE9NRGlzcGF0Y2g6CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9y LlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5FdmVudERpc3BhdGNoOgogICAgICAgICAgICAgcmV0 dXJuIHJlY29yZC5kYXRhLnR5cGU7CiAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5l QWdlbnQuUmVjb3JkVHlwZS5UaW1lckluc3RhbGw6CiAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9y LlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5UaW1lclJlbW92ZToKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKaW5kZXgg MmMxYmEyYi4uYjMzNjAyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAK KysrIGIvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTUzLDYgKzUzLDcgQEAKICNpbmNs dWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKICNpbmNsdWRlICJIaXN0b3J5LmgiCiAjaW5j bHVkZSAiSW5zcGVjdG9yQ29udHJvbGxlci5oIgorI2luY2x1ZGUgIkluc3BlY3RvclRpbWVsaW5l QWdlbnQuaCIKICNpbmNsdWRlICJMb2NhdGlvbi5oIgogI2luY2x1ZGUgIk1lZGlhLmgiCiAjaW5j bHVkZSAiTWVzc2FnZUV2ZW50LmgiCkBAIC0xMzEwLDcgKzEzMTEsMjMgQEAgYm9vbCBET01XaW5k b3c6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4gcHJwRXZlbnQsIFBhc3NSZWZQdHI8 RXZlbnRUYXJnZXQKICAgICBldmVudC0+c2V0Q3VycmVudFRhcmdldCh0aGlzKTsKICAgICBldmVu dC0+c2V0RXZlbnRQaGFzZShFdmVudDo6QVRfVEFSR0VUKTsKIAotICAgIHJldHVybiBmaXJlRXZl bnRMaXN0ZW5lcnMoZXZlbnQuZ2V0KCkpOworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgSW5z cGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IDA7CisgICAgaWYgKGZyYW1lKCkg JiYgZnJhbWUoKS0+cGFnZSgpKQorICAgICAgICB0aW1lbGluZUFnZW50ID0gZnJhbWUoKS0+cGFn ZSgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CisgICAgYm9vbCB0aW1lbGluZUFnZW50SXNB Y3RpdmUgPSB0aW1lbGluZUFnZW50ICYmIGhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50LT50eXBlKCkp OworICAgIGlmICh0aW1lbGluZUFnZW50SXNBY3RpdmUpCisgICAgICAgIHRpbWVsaW5lQWdlbnQt PndpbGxEaXNwYXRjaEV2ZW50KCpldmVudCk7CisjZW5kaWYKKworICAgIGJvb2wgcmVzdWx0ID0g ZmlyZUV2ZW50TGlzdGVuZXJzKGV2ZW50LmdldCgpKTsKKworI2lmIEVOQUJMRShJTlNQRUNUT1Ip CisgICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+ ZGlkRGlzcGF0Y2hFdmVudCgpOworI2VuZGlmCisKKyAgICByZXR1cm4gcmVzdWx0OwogfQogCiB2 b2lkIERPTVdpbmRvdzo6cmVtb3ZlQWxsRXZlbnRMaXN0ZW5lcnMoKQo= 42294 2009-11-01 20:43:08 -0800 2009-11-01 20:53:05 -0800 Adds missing change to localizedStrings.js Timeline-window-events.diff text/plain 11568 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjM0NzFkMi4uM2JjMTFkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAwOS0xMS0wMSAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHMgd2luZG93IGV2ZW50IGRpc3BhdGNoZXMgdG8gSW5zcGVjdG9y VGltZWxpbmVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMxMDAyCisKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6IFVwZGF0ZWQgY2FsbCBzaXRl IHRvIHdpbGxEaXNwYXRjaEV2ZW50IGFuZCBkaWREaXNwYXRjaEV2ZW50LgorICAgICAgICAoV2Vi Q29yZTo6Tm9kZTo6ZGlzcGF0Y2hHZW5lcmljRXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OndpbGxEaXNwYXRjaEV2ZW50KTogUmVuYW1lZC4KKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZERpc3BhdGNoRXZlbnQpOiBSZW5hbWVkLgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAgIChX ZWJDb3JlOjopOgorICAgICAgICAqIGluc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmVudERp c3BhdGNoUmVjb3JkKTogUmVuYW1lZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNv cmRGYWN0b3J5Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50 LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fZm9ybWF0UmVjb3Jk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fZ2V0UmVj b3JkRGV0YWlscyk6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RE9NV2luZG93OjpkaXNwYXRjaEV2ZW50KToKKworMjAwOS0xMS0wMSAgS2VsbHkgTm9y dG9uICA8a25vcnRvbkBnb29nbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KIAogICAgICAgICBEb2VzIG5vdCBzZW5kIERPTSBkaXNwYXRjaGVzIHRvIHRoZSBJ bnNwZWN0b3JUaW1lbGluZUFnZW50IGlmIHRoZXJlCmRpZmYgLS1naXQgYS9XZWJDb3JlL0VuZ2xp c2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzCmluZGV4IDk0NDI5MzEuLjg5NTU2YjQgMTAwNjQ0CkJpbmFyeSBmaWxl cyBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGFuZCBiL1dlYkNv cmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGRpZmZlcgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9kb20vTm9kZS5jcHAgYi9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCA4YjU0OTRm Li5lMTc4Mjg3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9XZWJDb3Jl L2RvbS9Ob2RlLmNwcApAQCAtMjQ3OSw3ICsyNDc5LDcgQEAgYm9vbCBOb2RlOjpkaXNwYXRjaEdl bmVyaWNFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBwcnBFdmVudCkKICAgICBJbnNwZWN0b3JUaW1l bGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gZG9jdW1lbnQoKS0+aW5zcGVjdG9yVGltZWxpbmVB Z2VudCgpOwogICAgIGJvb2wgdGltZWxpbmVBZ2VudElzQWN0aXZlID0gdGltZWxpbmVBZ2VudCAm JiBldmVudEhhc0xpc3RlbmVycyhldmVudC0+dHlwZSgpLCB0aGlzLCBhbmNlc3RvcnMpOyAgICAK ICAgICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZlKQotICAgICAgICB0aW1lbGluZUFnZW50LT53 aWxsRGlzcGF0Y2hET01FdmVudCgqZXZlbnQpOworICAgICAgICB0aW1lbGluZUFnZW50LT53aWxs RGlzcGF0Y2hFdmVudCgqZXZlbnQpOwogI2VuZGlmCiAKICAgICAvLyBTZXQgdXAgYSBwb2ludGVy IHRvIGluZGljYXRlIHdoZXRoZXIgLyB3aGVyZSB0byBkaXNwYXRjaCB3aW5kb3cgZXZlbnRzLgpA QCAtMjU3NCw3ICsyNTc0LDcgQEAgZG9uZURpc3BhdGNoaW5nOgogZG9uZVdpdGhEZWZhdWx0Ogog I2lmIEVOQUJMRShJTlNQRUNUT1IpCiAgICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkKLSAg ICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRGlzcGF0Y2hET01FdmVudCgpOworICAgICAgICB0aW1l bGluZUFnZW50LT5kaWREaXNwYXRjaEV2ZW50KCk7CiAjZW5kaWYKIAogICAgIERvY3VtZW50Ojp1 cGRhdGVTdHlsZUZvckFsbERvY3VtZW50cygpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JUaW1lbGluZUFnZW50LmNwcAppbmRleCA0ZjdiNzM2Li5iNGMxNzg2IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAorKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApAQCAtNTEsMTQgKzUxLDE1IEBA IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6On5JbnNwZWN0b3JUaW1lbGluZUFnZW50KCkKIHsKIH0K IAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRGlzcGF0Y2hET01FdmVudChjb25z dCBFdmVudCYgZXZlbnQpCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxEaXNwYXRj aEV2ZW50KGNvbnN0IEV2ZW50JiBldmVudCkKIHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChUaW1l bGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZURPTURpc3BhdGNoUmVjb3JkKG1fZnJvbnRlbmQsIGN1 cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgZXZlbnQpLCBET01EaXNwYXRjaFRpbWVsaW5lUmVj b3JkVHlwZSk7CisgICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5Ojpj cmVhdGVFdmVudERpc3BhdGNoUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNl Y29uZHMoKSwgZXZlbnQpLAorICAgICAgICBFdmVudERpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBl KTsKIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWREaXNwYXRjaERPTUV2ZW50 KCkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRGlzcGF0Y2hFdmVudCgpCiB7Ci0g ICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKERPTURpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBl KTsKKyAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoRXZlbnREaXNwYXRjaFRpbWVsaW5lUmVj b3JkVHlwZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbExheW91dCgp CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmgg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKaW5kZXggMDQwMTk3 Ny4uMGUxNGRlMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQu aApAQCAtNDMsNyArNDMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAvLyBNdXN0IGJl IGtlcHQgaW4gc3luYyB3aXRoIFRpbWVsaW5lQWdlbnQuanMKICAgICBlbnVtIFRpbWVsaW5lUmVj b3JkVHlwZSB7Ci0gICAgICAgIERPTURpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlID0gMCwKKyAg ICAgICAgRXZlbnREaXNwYXRjaFRpbWVsaW5lUmVjb3JkVHlwZSA9IDAsCiAgICAgICAgIExheW91 dFRpbWVsaW5lUmVjb3JkVHlwZSA9IDEsCiAgICAgICAgIFJlY2FsY3VsYXRlU3R5bGVzVGltZWxp bmVSZWNvcmRUeXBlID0gMiwKICAgICAgICAgUGFpbnRUaW1lbGluZVJlY29yZFR5cGUgPSAzLApA QCAtNjUsOCArNjUsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgcmVzZXRG cm9udGVuZFByb3h5T2JqZWN0KEluc3BlY3RvckZyb250ZW5kKik7CiAKICAgICAgICAgLy8gTWV0 aG9kcyBjYWxsZWQgZnJvbSBXZWJDb3JlLgotICAgICAgICB2b2lkIHdpbGxEaXNwYXRjaERPTUV2 ZW50KGNvbnN0IEV2ZW50Jik7Ci0gICAgICAgIHZvaWQgZGlkRGlzcGF0Y2hET01FdmVudCgpOwor ICAgICAgICB2b2lkIHdpbGxEaXNwYXRjaEV2ZW50KGNvbnN0IEV2ZW50Jik7CisgICAgICAgIHZv aWQgZGlkRGlzcGF0Y2hFdmVudCgpOwogCiAgICAgICAgIHZvaWQgd2lsbExheW91dCgpOwogICAg ICAgICB2b2lkIGRpZExheW91dCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvVGlt ZWxpbmVSZWNvcmRGYWN0b3J5LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3Jk RmFjdG9yeS5jcHAKaW5kZXggMDg1YmNkOS4uOWY5YWQ5ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCkBAIC0zOSw3ICszOSw2IEBACiAjaW5jbHVkZSAi U2NyaXB0T2JqZWN0LmgiCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIHN0YXRpYwogU2NyaXB0 T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChJbnNwZWN0 b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUpCiB7CiAgICAgU2NyaXB0T2Jq ZWN0IHJlY29yZCA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKQEAgLTQ3LDggKzQ2LDcg QEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29y ZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnQKICAgICByZXR1cm4gcmVjb3JkOwogfQogCi0vLyBz dGF0aWMKLVNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZURPTURpc3Bh dGNoUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwg Y29uc3QgRXZlbnQmIGV2ZW50KQorU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlRXZlbnREaXNwYXRjaFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRv dWJsZSBzdGFydFRpbWUsIGNvbnN0IEV2ZW50JiBldmVudCkKIHsKICAgICBTY3JpcHRPYmplY3Qg cmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKICAgICBT Y3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKQEAgLTU3LDcg KzU1LDYgQEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRE9NRGlz cGF0Y2hSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGYKICAgICByZXR1cm4gcmVjb3JkOwogfQog Ci0vLyBzdGF0aWMKIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdl bmVyaWNUaW1lclJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFy dFRpbWUsIGludCB0aW1lcklkKQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVhdGVH ZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwpAQCAtNjcsNyArNjQsNiBAQCBTY3Jp cHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljVGltZXJSZWNvcmQo SW5zcGVjdG9yRnJvbnRlbmQqCiAgICAgcmV0dXJuIHJlY29yZDsKIH0KIAotLy8gc3RhdGljCiBT Y3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lckluc3RhbGxSZWNv cmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBpbnQgdGlt ZXJJZCwgaW50IHRpbWVvdXQsIGJvb2wgc2luZ2xlU2hvdCkKIHsKICAgICBTY3JpcHRPYmplY3Qg cmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKQEAgLTc5 LDcgKzc1LDYgQEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlVGlt ZXJJbnN0YWxsUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKgogICAgIHJldHVybiByZWNvcmQ7CiB9 CiAKLS8vIHN0YXRpYwogU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl WEhSUmVhZHlTdGF0ZUNoYW5nZVRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9u dGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmwsIGludCByZWFkeVN0YXRl KQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250 ZW5kLCBzdGFydFRpbWUpOwpAQCAtOTAsNyArODUsNiBAQCBTY3JpcHRPYmplY3QgVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0YXRlQ2hhbmdlVGltZWxpbmVSZWNvcmQoSW5z cAogICAgIHJldHVybiByZWNvcmQ7CiB9CiAKLS8vIHN0YXRpYwogU2NyaXB0T2JqZWN0IFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9hZFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZy b250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmwpCiB7 CiAgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQs IHN0YXJ0VGltZSk7CkBAIC0xMDAsNyArOTQsNiBAQCBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVYSFJMb2FkVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbgog ICAgIHJldHVybiByZWNvcmQ7CiB9CiAKLS8vIHN0YXRpYwogU2NyaXB0T2JqZWN0IFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVTY3JpcHRUYWdUaW1lbGluZVJlY29yZChJbnNw ZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYg dXJsLCBkb3VibGUgbGluZU51bWJlcikgCiB7CiAgICAgU2NyaXB0T2JqZWN0IGl0ZW0gPSBjcmVh dGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmggYi9XZWJDb3JlL2luc3BlY3Rvci9U aW1lbGluZVJlY29yZEZhY3RvcnkuaAppbmRleCAzZDM2NjQ5Li5kYTlkYTY3IDEwMDY0NAotLS0g YS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaAorKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaApAQCAtNDMsNyArNDMsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgcHVibGljOgogICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0 IGNyZWF0ZUdlbmVyaWNSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1l KTsKIAotICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZURPTURpc3BhdGNoUmVjb3Jk KEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgRXZlbnQmKTsKKyAg ICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVFdmVudERpc3BhdGNoUmVjb3JkKEluc3Bl Y3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgRXZlbnQmKTsKIAogICAgICAg ICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZUdlbmVyaWNUaW1lclJlY29yZChJbnNwZWN0b3JG cm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGludCB0aW1lcklkKTsKIApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qcwppbmRleCBjYmJiNzM2Li5kZWE2OGM1 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qcwpAQCAt MzQsNyArMzQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudCA9IGZ1bmN0aW9uKCkgewog CiAvLyBNdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIFRpbWVsaW5lSXRlbS5oCiBXZWJJbnNwZWN0 b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlID0gewotICAgIERPTURpc3BhdGNoICAgICAgICAg OiAwLAorICAgIEV2ZW50RGlzcGF0Y2ggICAgICAgOiAwLAogICAgIExheW91dCAgICAgICAgICAg ICAgOiAxLAogICAgIFJlY2FsY3VsYXRlU3R5bGVzICAgOiAyLAogICAgIFBhaW50ICAgICAgICAg ICAgICAgOiAzLApAQCAtNDQsNyArNDQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5S ZWNvcmRUeXBlID0gewogICAgIFRpbWVyRmlyZSAgICAgICAgICAgOiA3LAogICAgIFhIUlJlYWR5 U3RhdGVDaGFuZ2UgOiA4LAogICAgIFhIUkxvYWQgICAgICAgICAgICAgOiA5LAotICAgIEV2YWx1 YXRlU2NyaXB0VGFnICAgOiAxMAorICAgIEV2YWx1YXRlU2NyaXB0VGFnICAgOiAxMCwKIH07CiAK IFdlYkluc3BlY3Rvci5hZGRSZWNvcmRUb1RpbWVsaW5lID0gZnVuY3Rpb24ocmVjb3JkKSB7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IGNlNGUz OWIuLjRkMWM5MzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1l bGluZVBhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBh bmVsLmpzCkBAIC0xNDEsNyArMTQxLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3JlY29yZFN0eWxlcykgewogICAgICAgICAg ICAgdGhpcy5fcmVjb3JkU3R5bGVzID0ge307CiAgICAgICAgICAgICB2YXIgcmVjb3JkVHlwZXMg PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlOwotICAgICAgICAgICAgdGhp cy5fcmVjb3JkU3R5bGVzW3JlY29yZFR5cGVzLkRPTURpc3BhdGNoXSA9IHsgdGl0bGU6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiRE9NIEV2ZW50IiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMu c2NyaXB0aW5nIH07CisgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMu RXZlbnREaXNwYXRjaF0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV2ZW50Iiks IGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMuc2NyaXB0aW5nIH07CiAgICAgICAgICAgICB0aGlz Ll9yZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMuTGF5b3V0XSA9IHsgdGl0bGU6IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiTGF5b3V0IiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMucmVuZGVyaW5n IH07CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMuUmVjYWxjdWxh dGVTdHlsZXNdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWNhbGN1bGF0ZSBT dHlsZSIpLCBjYXRlZ29yeTogdGhpcy5jYXRlZ29yaWVzLnJlbmRlcmluZyB9OwogICAgICAgICAg ICAgdGhpcy5fcmVjb3JkU3R5bGVzW3JlY29yZFR5cGVzLlBhaW50XSA9IHsgdGl0bGU6IFdlYklu c3BlY3Rvci5VSVN0cmluZygiUGFpbnQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5yZW5k ZXJpbmcgfTsKQEAgLTE3NCw3ICsxNzQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgX2dldFJlY29yZERldGFpbHM6IGZ1bmN0aW9uKHJlY29yZCkKICAg ICB7CiAgICAgICAgIHN3aXRjaCAocmVjb3JkLnR5cGUpIHsKLSAgICAgICAgY2FzZSBXZWJJbnNw ZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLkRPTURpc3BhdGNoOgorICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuRXZlbnREaXNwYXRjaDoKICAg ICAgICAgICAgIHJldHVybiByZWNvcmQuZGF0YS50eXBlOwogICAgICAgICBjYXNlIFdlYkluc3Bl Y3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuVGltZXJJbnN0YWxsOgogICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuVGltZXJSZW1vdmU6CmRpZmYg LS1naXQgYS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1dlYkNvcmUvcGFnZS9ET01XaW5k b3cuY3BwCmluZGV4IDJjMWJhMmIuLmIzMzYwMmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9E T01XaW5kb3cuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC01Myw2ICs1 Myw3IEBACiAjaW5jbHVkZSAiSFRNTEZyYW1lT3duZXJFbGVtZW50LmgiCiAjaW5jbHVkZSAiSGlz dG9yeS5oIgogI2luY2x1ZGUgIkluc3BlY3RvckNvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJJbnNw ZWN0b3JUaW1lbGluZUFnZW50LmgiCiAjaW5jbHVkZSAiTG9jYXRpb24uaCIKICNpbmNsdWRlICJN ZWRpYS5oIgogI2luY2x1ZGUgIk1lc3NhZ2VFdmVudC5oIgpAQCAtMTMxMCw3ICsxMzExLDIzIEBA IGJvb2wgRE9NV2luZG93OjpkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50 LCBQYXNzUmVmUHRyPEV2ZW50VGFyZ2V0CiAgICAgZXZlbnQtPnNldEN1cnJlbnRUYXJnZXQodGhp cyk7CiAgICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoRXZlbnQ6OkFUX1RBUkdFVCk7CiAKLSAgICBy ZXR1cm4gZmlyZUV2ZW50TGlzdGVuZXJzKGV2ZW50LmdldCgpKTsKKyNpZiBFTkFCTEUoSU5TUEVD VE9SKQorICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSAwOworICAg IGlmIChmcmFtZSgpICYmIGZyYW1lKCktPnBhZ2UoKSkKKyAgICAgICAgdGltZWxpbmVBZ2VudCA9 IGZyYW1lKCktPnBhZ2UoKS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOworICAgIGJvb2wgdGlt ZWxpbmVBZ2VudElzQWN0aXZlID0gdGltZWxpbmVBZ2VudCAmJiBoYXNFdmVudExpc3RlbmVycyhl dmVudC0+dHlwZSgpKTsKKyAgICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZlKQorICAgICAgICB0 aW1lbGluZUFnZW50LT53aWxsRGlzcGF0Y2hFdmVudCgqZXZlbnQpOworI2VuZGlmCisKKyAgICBi b29sIHJlc3VsdCA9IGZpcmVFdmVudExpc3RlbmVycyhldmVudC5nZXQoKSk7CisKKyNpZiBFTkFC TEUoSU5TUEVDVE9SKQorICAgIGlmICh0aW1lbGluZUFnZW50SXNBY3RpdmUpCisgICAgICAgIHRp bWVsaW5lQWdlbnQtPmRpZERpc3BhdGNoRXZlbnQoKTsKKyNlbmRpZgorCisgICAgcmV0dXJuIHJl c3VsdDsKIH0KIAogdm9pZCBET01XaW5kb3c6OnJlbW92ZUFsbEV2ZW50TGlzdGVuZXJzKCkK 42295 2009-11-01 20:53:05 -0800 2009-11-01 22:18:06 -0800 w/ binary diff. Timeline-window-events.diff text/plain 11714 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjM0NzFkMi4uMGY5NDAxNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMCBAQAogMjAwOS0xMS0wMSAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZHMgd2luZG93IGV2ZW50IGRpc3BhdGNoZXMgdG8gSW5zcGVjdG9y VGltZWxpbmVBZ2VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMxMDAyCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anM6CisgICAgICAgICogZG9tL05vZGUuY3BwOiBVcGRhdGVkIGNhbGwgc2l0ZSB0byB3aWxsRGlz cGF0Y2hFdmVudCBhbmQgZGlkRGlzcGF0Y2hFdmVudC4KKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6 OmRpc3BhdGNoR2VuZXJpY0V2ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50 Ojp3aWxsRGlzcGF0Y2hFdmVudCk6IFJlbmFtZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjpkaWREaXNwYXRjaEV2ZW50KTogUmVuYW1lZC4KKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oOgorICAgICAgICAoV2ViQ29yZTo6KToK KyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZlbnREaXNwYXRjaFJlY29y ZCk6IFJlbmFtZWQuCisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5o OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qczoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX2Zvcm1hdFJlY29yZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX2dldFJlY29yZERldGFpbHMp OgorICAgICAgICAqIHBhZ2UvRE9NV2luZG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdp bmRvdzo6ZGlzcGF0Y2hFdmVudCk6CisKKzIwMDktMTEtMDEgIEtlbGx5IE5vcnRvbiAgPGtub3J0 b25AZ29vZ2xlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCiAK ICAgICAgICAgRG9lcyBub3Qgc2VuZCBET00gZGlzcGF0Y2hlcyB0byB0aGUgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCBpZiB0aGVyZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanMgYi9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcwppbmRleCA5NDQyOTMxOGJmYjFjZTRlYmIxMTFiNmE2ZTk3MWQyYjBjZGRjMjYwLi44OTU1 NmI0N2Q0ZGYzNDlhMGIyYjVkMDYxM2JiNDNkMDBhYzJlNzdmIDEwMDY0NApHSVQgYmluYXJ5IHBh dGNoCmRlbHRhIDI2CmljbVoyPWc+bHZ1I3RpfiNsaXcrRk8pZ09xb0JTK1RZamFsRzBjSFQ2STE0 LWcKCmRlbHRhIDQyCnRjbWJQcmc+bHN0I3RpfiM+QEUhYzQ4OUJzbGxqeGN4dUkrWlNCQTM1X2sj XkxOMk1LTDFeQF52M0ByY3YKCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1dl YkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDhiNTQ5NGYuLmUxNzgyODcgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvZG9tL05vZGUuY3BwCisrKyBiL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0yNDc5LDcg KzI0NzksNyBAQCBib29sIE5vZGU6OmRpc3BhdGNoR2VuZXJpY0V2ZW50KFBhc3NSZWZQdHI8RXZl bnQ+IHBycEV2ZW50KQogICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQg PSBkb2N1bWVudCgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CiAgICAgYm9vbCB0aW1lbGlu ZUFnZW50SXNBY3RpdmUgPSB0aW1lbGluZUFnZW50ICYmIGV2ZW50SGFzTGlzdGVuZXJzKGV2ZW50 LT50eXBlKCksIHRoaXMsIGFuY2VzdG9ycyk7ICAgIAogICAgIGlmICh0aW1lbGluZUFnZW50SXNB Y3RpdmUpCi0gICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRjaERPTUV2ZW50KCpldmVu dCk7CisgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRjaEV2ZW50KCpldmVudCk7CiAj ZW5kaWYKIAogICAgIC8vIFNldCB1cCBhIHBvaW50ZXIgdG8gaW5kaWNhdGUgd2hldGhlciAvIHdo ZXJlIHRvIGRpc3BhdGNoIHdpbmRvdyBldmVudHMuCkBAIC0yNTc0LDcgKzI1NzQsNyBAQCBkb25l RGlzcGF0Y2hpbmc6CiBkb25lV2l0aERlZmF1bHQ6CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKICAg ICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZlKQotICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRE aXNwYXRjaERPTUV2ZW50KCk7CisgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZERpc3BhdGNoRXZl bnQoKTsKICNlbmRpZgogCiAgICAgRG9jdW1lbnQ6OnVwZGF0ZVN0eWxlRm9yQWxsRG9jdW1lbnRz KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50 LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4 IDRmN2I3MzYuLmI0YzE3ODYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuY3BwCkBAIC01MSwxNCArNTEsMTUgQEAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 fkluc3BlY3RvclRpbWVsaW5lQWdlbnQoKQogewogfQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OndpbGxEaXNwYXRjaERPTUV2ZW50KGNvbnN0IEV2ZW50JiBldmVudCkKK3ZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbERpc3BhdGNoRXZlbnQoY29uc3QgRXZlbnQmIGV2ZW50 KQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl RE9NRGlzcGF0Y2hSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygp LCBldmVudCksIERPTURpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAgICBwdXNoQ3VycmVu dFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2ZW50RGlzcGF0Y2hSZWNvcmQo bV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCBldmVudCksCisgICAgICAg IEV2ZW50RGlzcGF0Y2hUaW1lbGluZVJlY29yZFR5cGUpOwogfQogCi12b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZERpc3BhdGNoRE9NRXZlbnQoKQordm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWREaXNwYXRjaEV2ZW50KCkKIHsKLSAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNv cmQoRE9NRGlzcGF0Y2hUaW1lbGluZVJlY29yZFR5cGUpOworICAgIGRpZENvbXBsZXRlQ3VycmVu dFJlY29yZChFdmVudERpc3BhdGNoVGltZWxpbmVSZWNvcmRUeXBlKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTGF5b3V0KCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCAwNDAxOTc3Li4wZTE0ZGUyIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCkBAIC00Myw3ICs0Myw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogICAgIC8vIE11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggVGltZWxp bmVBZ2VudC5qcwogICAgIGVudW0gVGltZWxpbmVSZWNvcmRUeXBlIHsKLSAgICAgICAgRE9NRGlz cGF0Y2hUaW1lbGluZVJlY29yZFR5cGUgPSAwLAorICAgICAgICBFdmVudERpc3BhdGNoVGltZWxp bmVSZWNvcmRUeXBlID0gMCwKICAgICAgICAgTGF5b3V0VGltZWxpbmVSZWNvcmRUeXBlID0gMSwK ICAgICAgICAgUmVjYWxjdWxhdGVTdHlsZXNUaW1lbGluZVJlY29yZFR5cGUgPSAyLAogICAgICAg ICBQYWludFRpbWVsaW5lUmVjb3JkVHlwZSA9IDMsCkBAIC02NSw4ICs2NSw4IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCByZXNldEZyb250ZW5kUHJveHlPYmplY3QoSW5zcGVj dG9yRnJvbnRlbmQqKTsKIAogICAgICAgICAvLyBNZXRob2RzIGNhbGxlZCBmcm9tIFdlYkNvcmUu Ci0gICAgICAgIHZvaWQgd2lsbERpc3BhdGNoRE9NRXZlbnQoY29uc3QgRXZlbnQmKTsKLSAgICAg ICAgdm9pZCBkaWREaXNwYXRjaERPTUV2ZW50KCk7CisgICAgICAgIHZvaWQgd2lsbERpc3BhdGNo RXZlbnQoY29uc3QgRXZlbnQmKTsKKyAgICAgICAgdm9pZCBkaWREaXNwYXRjaEV2ZW50KCk7CiAK ICAgICAgICAgdm9pZCB3aWxsTGF5b3V0KCk7CiAgICAgICAgIHZvaWQgZGlkTGF5b3V0KCk7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwIGIv V2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAppbmRleCAwODViY2Q5 Li45ZjlhZDlkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZh Y3RvcnkuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5j cHAKQEAgLTM5LDcgKzM5LDYgQEAKICNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAotLy8gc3RhdGljCiBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0 b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91 YmxlIHN0YXJ0VGltZSkKIHsKICAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gZnJvbnRlbmQtPm5l d1NjcmlwdE9iamVjdCgpOwpAQCAtNDcsOCArNDYsNyBAQCBTY3JpcHRPYmplY3QgVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9u dAogICAgIHJldHVybiByZWNvcmQ7CiB9CiAKLS8vIHN0YXRpYwotU2NyaXB0T2JqZWN0IFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRE9NRGlzcGF0Y2hSZWNvcmQoSW5zcGVjdG9yRnJvbnRl bmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBFdmVudCYgZXZlbnQpCitTY3Jp cHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmVudERpc3BhdGNoUmVjb3Jk KEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgRXZl bnQmIGV2ZW50KQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVj b3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwogICAgIFNjcmlwdE9iamVjdCBkYXRhID0gZnJvbnRl bmQtPm5ld1NjcmlwdE9iamVjdCgpOwpAQCAtNTcsNyArNTUsNiBAQCBTY3JpcHRPYmplY3QgVGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVET01EaXNwYXRjaFJlY29yZChJbnNwZWN0b3JGcm9u dGVuZCogZgogICAgIHJldHVybiByZWNvcmQ7CiB9CiAKLS8vIHN0YXRpYwogU2NyaXB0T2JqZWN0 IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyUmVjb3JkKEluc3BlY3Rv ckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgaW50IHRpbWVySWQpCiB7CiAg ICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0 YXJ0VGltZSk7CkBAIC02Nyw3ICs2NCw2IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZUdlbmVyaWNUaW1lclJlY29yZChJbnNwZWN0b3JGcm9udGVuZCoKICAgICBy ZXR1cm4gcmVjb3JkOwogfQogCi0vLyBzdGF0aWMKIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29y ZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJv bnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGludCB0aW1lcklkLCBpbnQgdGltZW91dCwgYm9vbCBz aW5nbGVTaG90KQogewogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVj b3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwpAQCAtNzksNyArNzUsNiBAQCBTY3JpcHRPYmplY3Qg VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lckluc3RhbGxSZWNvcmQoSW5zcGVjdG9y RnJvbnRlbmQqCiAgICAgcmV0dXJuIHJlY29yZDsKIH0KIAotLy8gc3RhdGljCiBTY3JpcHRPYmpl Y3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVYSFJSZWFkeVN0YXRlQ2hhbmdlVGltZWxp bmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBj b25zdCBTdHJpbmcmIHVybCwgaW50IHJlYWR5U3RhdGUpCiB7CiAgICAgU2NyaXB0T2JqZWN0IHJl Y29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CkBAIC05MCw3 ICs4NSw2IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUlJl YWR5U3RhdGVDaGFuZ2VUaW1lbGluZVJlY29yZChJbnNwCiAgICAgcmV0dXJuIHJlY29yZDsKIH0K IAotLy8gc3RhdGljCiBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVY SFJMb2FkVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUg c3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBTY3JpcHRPYmplY3QgcmVjb3Jk ID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKQEAgLTEwMCw3ICs5 NCw2IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUkxvYWRU aW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuCiAgICAgcmV0dXJuIHJlY29yZDsKIH0KIAot Ly8gc3RhdGljCiBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFs dWF0ZVNjcmlwdFRhZ1RpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwg ZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBsaW5lTnVtYmVyKSAK IHsKICAgICBTY3JpcHRPYmplY3QgaXRlbSA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQs IHN0YXJ0VGltZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29y ZEZhY3RvcnkuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCmlu ZGV4IDNkMzY2NDkuLmRhOWRhNjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVs aW5lUmVjb3JkRmFjdG9yeS5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3Jk RmFjdG9yeS5oCkBAIC00Myw3ICs0Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBwdWJs aWM6CiAgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlR2VuZXJpY1JlY29yZChJbnNw ZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUpOwogCi0gICAgICAgIHN0YXRpYyBTY3Jp cHRPYmplY3QgY3JlYXRlRE9NRGlzcGF0Y2hSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3Vi bGUgc3RhcnRUaW1lLCBjb25zdCBFdmVudCYpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0 IGNyZWF0ZUV2ZW50RGlzcGF0Y2hSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3Rh cnRUaW1lLCBjb25zdCBFdmVudCYpOwogCiAgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3Jl YXRlR2VuZXJpY1RpbWVyUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGlt ZSwgaW50IHRpbWVySWQpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVBZ2VudC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZUFnZW50LmpzCmluZGV4IGNiYmI3MzYuLmRlYTY4YzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzCkBAIC0zNCw3ICszNCw3IEBAIFdlYkluc3BlY3Rv ci5UaW1lbGluZUFnZW50ID0gZnVuY3Rpb24oKSB7CiAKIC8vIE11c3QgYmUga2VwdCBpbiBzeW5j IHdpdGggVGltZWxpbmVJdGVtLmgKIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5 cGUgPSB7Ci0gICAgRE9NRGlzcGF0Y2ggICAgICAgICA6IDAsCisgICAgRXZlbnREaXNwYXRjaCAg ICAgICA6IDAsCiAgICAgTGF5b3V0ICAgICAgICAgICAgICA6IDEsCiAgICAgUmVjYWxjdWxhdGVT dHlsZXMgICA6IDIsCiAgICAgUGFpbnQgICAgICAgICAgICAgICA6IDMsCkBAIC00NCw3ICs0NCw3 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUgPSB7CiAgICAgVGltZXJG aXJlICAgICAgICAgICA6IDcsCiAgICAgWEhSUmVhZHlTdGF0ZUNoYW5nZSA6IDgsCiAgICAgWEhS TG9hZCAgICAgICAgICAgICA6IDksCi0gICAgRXZhbHVhdGVTY3JpcHRUYWcgICA6IDEwCisgICAg RXZhbHVhdGVTY3JpcHRUYWcgICA6IDEwLAogfTsKIAogV2ViSW5zcGVjdG9yLmFkZFJlY29yZFRv VGltZWxpbmUgPSBmdW5jdGlvbihyZWNvcmQpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXggY2U0ZTM5Yi4uNGQxYzkzMSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKKysrIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTE0MSw3ICsxNDEsNyBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICgh dGhpcy5fcmVjb3JkU3R5bGVzKSB7CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXMgPSB7 fTsKICAgICAgICAgICAgIHZhciByZWNvcmRUeXBlcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZUFn ZW50LlJlY29yZFR5cGU7Ci0gICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXNbcmVjb3JkVHlw ZXMuRE9NRGlzcGF0Y2hdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJET00gRXZl bnQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5zY3JpcHRpbmcgfTsKKyAgICAgICAgICAg IHRoaXMuX3JlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5FdmVudERpc3BhdGNoXSA9IHsgdGl0bGU6 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXZlbnQiKSwgY2F0ZWdvcnk6IHRoaXMuY2F0ZWdvcmll cy5zY3JpcHRpbmcgfTsKICAgICAgICAgICAgIHRoaXMuX3JlY29yZFN0eWxlc1tyZWNvcmRUeXBl cy5MYXlvdXRdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXlvdXQiKSwgY2F0 ZWdvcnk6IHRoaXMuY2F0ZWdvcmllcy5yZW5kZXJpbmcgfTsKICAgICAgICAgICAgIHRoaXMuX3Jl Y29yZFN0eWxlc1tyZWNvcmRUeXBlcy5SZWNhbGN1bGF0ZVN0eWxlc10gPSB7IHRpdGxlOiBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlJlY2FsY3VsYXRlIFN0eWxlIiksIGNhdGVnb3J5OiB0aGlzLmNh dGVnb3JpZXMucmVuZGVyaW5nIH07CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXNbcmVj b3JkVHlwZXMuUGFpbnRdID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYWludCIp LCBjYXRlZ29yeTogdGhpcy5jYXRlZ29yaWVzLnJlbmRlcmluZyB9OwpAQCAtMTc0LDcgKzE3NCw3 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfZ2V0UmVj b3JkRGV0YWlsczogZnVuY3Rpb24ocmVjb3JkKQogICAgIHsKICAgICAgICAgc3dpdGNoIChyZWNv cmQudHlwZSkgewotICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29y ZFR5cGUuRE9NRGlzcGF0Y2g6CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdl bnQuUmVjb3JkVHlwZS5FdmVudERpc3BhdGNoOgogICAgICAgICAgICAgcmV0dXJuIHJlY29yZC5k YXRhLnR5cGU7CiAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3Jk VHlwZS5UaW1lckluc3RhbGw6CiAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdl bnQuUmVjb3JkVHlwZS5UaW1lclJlbW92ZToKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9ET01X aW5kb3cuY3BwIGIvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKaW5kZXggMmMxYmEyYi4uYjMz NjAyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvV2ViQ29y ZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTUzLDYgKzUzLDcgQEAKICNpbmNsdWRlICJIVE1MRnJh bWVPd25lckVsZW1lbnQuaCIKICNpbmNsdWRlICJIaXN0b3J5LmgiCiAjaW5jbHVkZSAiSW5zcGVj dG9yQ29udHJvbGxlci5oIgorI2luY2x1ZGUgIkluc3BlY3RvclRpbWVsaW5lQWdlbnQuaCIKICNp bmNsdWRlICJMb2NhdGlvbi5oIgogI2luY2x1ZGUgIk1lZGlhLmgiCiAjaW5jbHVkZSAiTWVzc2Fn ZUV2ZW50LmgiCkBAIC0xMzEwLDcgKzEzMTEsMjMgQEAgYm9vbCBET01XaW5kb3c6OmRpc3BhdGNo RXZlbnQoUGFzc1JlZlB0cjxFdmVudD4gcHJwRXZlbnQsIFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQK ICAgICBldmVudC0+c2V0Q3VycmVudFRhcmdldCh0aGlzKTsKICAgICBldmVudC0+c2V0RXZlbnRQ aGFzZShFdmVudDo6QVRfVEFSR0VUKTsKIAotICAgIHJldHVybiBmaXJlRXZlbnRMaXN0ZW5lcnMo ZXZlbnQuZ2V0KCkpOworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgSW5zcGVjdG9yVGltZWxp bmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IDA7CisgICAgaWYgKGZyYW1lKCkgJiYgZnJhbWUoKS0+ cGFnZSgpKQorICAgICAgICB0aW1lbGluZUFnZW50ID0gZnJhbWUoKS0+cGFnZSgpLT5pbnNwZWN0 b3JUaW1lbGluZUFnZW50KCk7CisgICAgYm9vbCB0aW1lbGluZUFnZW50SXNBY3RpdmUgPSB0aW1l bGluZUFnZW50ICYmIGhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50LT50eXBlKCkpOworICAgIGlmICh0 aW1lbGluZUFnZW50SXNBY3RpdmUpCisgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRj aEV2ZW50KCpldmVudCk7CisjZW5kaWYKKworICAgIGJvb2wgcmVzdWx0ID0gZmlyZUV2ZW50TGlz dGVuZXJzKGV2ZW50LmdldCgpKTsKKworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgaWYgKHRp bWVsaW5lQWdlbnRJc0FjdGl2ZSkKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRGlzcGF0Y2hF dmVudCgpOworI2VuZGlmCisKKyAgICByZXR1cm4gcmVzdWx0OwogfQogCiB2b2lkIERPTVdpbmRv dzo6cmVtb3ZlQWxsRXZlbnRMaXN0ZW5lcnMoKQo=