31132 2009-11-04 11:14:57 -0800 Web Inspector: TimelineRecordFactory.{h,cpp} has some method name inconsistencies. 2009-11-04 12:12:30 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 knorton knorton bweinstein commit-queue joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 160521 0 knorton 2009-11-04 11:14:57 -0800 Some end in TimelineRecord where others end in Record. They should all end in Record. 160524 1 42500 knorton 2009-11-04 11:17:14 -0800 Created attachment 42500 Renames the misnamed. 160552 2 42500 commit-queue 2009-11-04 12:12:23 -0800 Comment on attachment 42500 Renames the misnamed. Clearing flags on attachment: 42500 Committed r50524: <http://trac.webkit.org/changeset/50524> 160553 3 commit-queue 2009-11-04 12:12:30 -0800 All reviewed patches have been landed. Closing bug. 42500 2009-11-04 11:17:14 -0800 2009-11-04 12:12:22 -0800 Renames the misnamed. Timeline-renames.diff text/plain 12424 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWQwYjFkMy4uMTdhMGI4NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAwOS0xMS0wNCAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZpeGVzIG5hbWluZyBpbmNvbnNpc3RlbmNpZXMgaW4gVGltZWxpbmVS ZWNvcmRGYWN0b3J5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzExMzIKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxQYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ2hhbmdl WEhSUmVhZHlTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50 Ojp3aWxsTG9hZFhIUik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50 Ojp3aWxsRXZhbHVhdGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6d2lsbFNlbmRSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9uc2UpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRmluaXNoTG9hZGluZ1Jlc291 cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSUmVhZHlTdGF0 ZUNoYW5nZVJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZVhIUkxvYWRSZWNvcmQpOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRG YWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpU aW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZU1hcmtUaW1lbGluZVJlY29yZCk6CisgICAgICAg IChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlU2VuZFJlcXVl c3RSZWNvcmQpOgorICAgICAgICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVh dGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpUaW1l bGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlRmluaXNoUmVjb3JkKToKKyAgICAgICAg KFdlYkNvcmU6OlRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUGFpbnRSZWNvcmQpOgorICAg ICAgICAqIGluc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaDoKKwogMjAwOS0xMS0wNCAg VmFkaW0gWmVpdGxpbiAgPHZhZGltQHd4d2lkZ2V0cy5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuY3BwCmluZGV4IGJmYmQ4YWEuLmIyOGFhOTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC04Nyw3ICs4Nyw3IEBAIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkUmVjYWxjdWxhdGVTdHlsZSgpCiAKIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6d2lsbFBhaW50KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgcHVzaEN1 cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYWludFRpbWVsaW5lUmVj b3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgcmVjdCksCisgICAg cHVzaEN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYWludFJlY29y ZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksIHJlY3QpLAogICAgICAg ICBQYWludFRpbWVsaW5lUmVjb3JkVHlwZSk7CiB9CiAKQEAgLTEzMSw3ICsxMzEsNyBAQCB2b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpcmVUaW1lcigpCiAKIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6d2lsbENoYW5nZVhIUlJlYWR5U3RhdGUoY29uc3QgU3RyaW5nJiB1cmws IGludCByZWFkeVN0YXRlKQogewotICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3Jk RmFjdG9yeTo6Y3JlYXRlWEhSUmVhZHlTdGF0ZUNoYW5nZVRpbWVsaW5lUmVjb3JkKG1fZnJvbnRl bmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgdXJsLCByZWFkeVN0YXRlKSwKKyAgICBw dXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUlJlYWR5U3Rh dGVDaGFuZ2VSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCB1 cmwsIHJlYWR5U3RhdGUpLAogICAgICAgICBYSFJSZWFkeVN0YXRlQ2hhbmdlUmVjb3JkVHlwZSk7 CiB9CiAKQEAgLTE0Miw3ICsxNDIsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRp ZENoYW5nZVhIUlJlYWR5U3RhdGUoKQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Ondp bGxMb2FkWEhSKGNvbnN0IFN0cmluZyYgdXJsKSAKIHsKLSAgICBwdXNoQ3VycmVudFJlY29yZChU aW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUkxvYWRUaW1lbGluZVJlY29yZChtX2Zyb250 ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksIHVybCksIFhIUkxvYWRSZWNvcmRUeXBl KTsKKyAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhI UkxvYWRSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCB1cmwp LCBYSFJMb2FkUmVjb3JkVHlwZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 ZGlkTG9hZFhIUigpCkBAIC0xNTIsNyArMTUyLDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjpkaWRMb2FkWEhSKCkKIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRXZh bHVhdGVTY3JpcHQoY29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVyKQogewotICAgIHB1 c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVTY3Jp cHRUaW1lbGluZVJlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCks IHVybCwgbGluZU51bWJlciksIEV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmRUeXBlKTsKKyAg ICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRl U2NyaXB0UmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgdXJs LCBsaW5lTnVtYmVyKSwgRXZhbHVhdGVTY3JpcHRUaW1lbGluZVJlY29yZFR5cGUpOwogfQogICAg IAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFsdWF0ZVNjcmlwdCgpCkBAIC0x NjMsNyArMTYzLDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFsdWF0ZVNj cmlwdCgpCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxTZW5kUmVzb3VyY2VSZXF1 ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgYm9vbCBpc01haW5SZXNvdXJjZSwKICAgICBj b25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgU2NyaXB0T2JqZWN0IHJlY29y ZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VTZW5kUmVxdWVzdFRpbWVs aW5lUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwKKyAgICBT Y3JpcHRPYmplY3QgcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVSZXNvdXJj ZVNlbmRSZXF1ZXN0UmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMo KSwKICAgICAgICAgaWRlbnRpZmllciwgaXNNYWluUmVzb3VyY2UsIHJlcXVlc3QpOwogICAgIHJl Y29yZC5zZXQoInR5cGUiLCBSZXNvdXJjZVNlbmRSZXF1ZXN0VGltZWxpbmVSZWNvcmRUeXBlKTsK ICAgICBtX2Zyb250ZW5kLT5hZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCk7CkBAIC0xNzEsNyAr MTcxLDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2VuZFJlc291cmNlUmVx dWVzdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGIKIAogdm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRSZWNlaXZlUmVzb3VyY2VSZXNwb25zZSh1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewotICAgIFNjcmlwdE9iamVj dCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlUmVjZWl2ZVJl c3BvbnNlVGltZWxpbmVSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25k cygpLAorICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVJlc291cmNlUmVjZWl2ZVJlc3BvbnNlUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1l SW5NaWxsaXNlY29uZHMoKSwKICAgICAgICAgaWRlbnRpZmllciwgcmVzcG9uc2UpOwogICAgIHJl Y29yZC5zZXQoInR5cGUiLCBSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVRpbWVsaW5lUmVjb3JkVHlw ZSk7CiAgICAgbV9mcm9udGVuZC0+YWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQpOwpAQCAtMTc5 LDcgKzE3OSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkUmVjZWl2ZVJlc291 cmNlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyCiAKIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6ZGlkRmluaXNoTG9hZGluZ1Jlc291cmNlKHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgYm9vbCBkaWRGYWlsKQogewotICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGlu ZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlRmluaXNoVGltZWxpbmVSZWNvcmQobV9mcm9u dGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLAorICAgIFNjcmlwdE9iamVjdCByZWNv cmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlRmluaXNoUmVjb3JkKG1f ZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwKICAgICAgICAgaWRlbnRpZmll ciwgZGlkRmFpbCk7CiAgICAgcmVjb3JkLnNldCgidHlwZSIsIFJlc291cmNlRmluaXNoVGltZWxp bmVSZWNvcmRUeXBlKTsKICAgICBtX2Zyb250ZW5kLT5hZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29y ZCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3Rvcnku Y3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAppbmRleCAw OGZiNzM4Li5lMTgwMzk5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJl Y29yZEZhY3RvcnkuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFj dG9yeS5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFj dG9yeTo6Y3JlYXRlVGltZXJJbnN0YWxsUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKgogICAgIHJl dHVybiByZWNvcmQ7CiB9CiAKLVNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVhIUlJlYWR5U3RhdGVDaGFuZ2VUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCog ZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgcmVhZHlT dGF0ZSkKK1NjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVhIUlJlYWR5 U3RhdGVDaGFuZ2VSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3Rh cnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IHJlYWR5U3RhdGUpCiB7CiAgICAgU2NyaXB0 T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7 CiAgICAgU2NyaXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CkBA IC04OSw3ICs4OSw3IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0 ZVhIUlJlYWR5U3RhdGVDaGFuZ2VUaW1lbGluZVJlY29yZChJbnNwCiAgICAgcmV0dXJuIHJlY29y ZDsKIH0KIAotU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9h ZFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0 VGltZSwgY29uc3QgU3RyaW5nJiB1cmwpCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0 b3J5OjpjcmVhdGVYSFJMb2FkUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91 YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmwpCiB7CiAgICAgU2NyaXB0T2JqZWN0IHJl Y29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CiAgICAgU2Ny aXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CkBAIC05OCwyNyAr OTgsMjcgQEAgU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhSTG9h ZFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW4KICAgICByZXR1cm4gcmVjb3JkOwogfQog Ci1TY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlw dFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0 VGltZSwgY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBsaW5lTnVtYmVyKSAKK1NjcmlwdE9iamVj dCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRlU2NyaXB0UmVjb3JkKEluc3Bl Y3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1 cmwsIGRvdWJsZSBsaW5lTnVtYmVyKSAKIHsKLSAgICBTY3JpcHRPYmplY3QgaXRlbSA9IGNyZWF0 ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CisgICAgU2NyaXB0T2JqZWN0IHJl Y29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CiAgICAgU2Ny aXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CiAgICAgZGF0YS5z ZXQoInVybCIsIHVybCk7CiAgICAgZGF0YS5zZXQoImxpbmVOdW1iZXIiLCBsaW5lTnVtYmVyKTsK LSAgICBpdGVtLnNldCgiZGF0YSIsIGRhdGEpOwotICAgIHJldHVybiBpdGVtOworICAgIHJlY29y ZC5zZXQoImRhdGEiLCBkYXRhKTsKKyAgICByZXR1cm4gcmVjb3JkOwogfQogCiBTY3JpcHRPYmpl Y3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVNYXJrVGltZWxpbmVSZWNvcmQoSW5zcGVj dG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIG1l c3NhZ2UpIAogewotICAgIFNjcmlwdE9iamVjdCBpdGVtID0gY3JlYXRlR2VuZXJpY1JlY29yZChm cm9udGVuZCwgc3RhcnRUaW1lKTsKKyAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gY3JlYXRlR2Vu ZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKICAgICBTY3JpcHRPYmplY3QgZGF0YSA9 IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKICAgICBkYXRhLnNldCgibWVzc2FnZSIsIG1l c3NhZ2UpOwotICAgIGl0ZW0uc2V0KCJkYXRhIiwgZGF0YSk7Ci0gICAgcmV0dXJuIGl0ZW07Cisg ICAgcmVjb3JkLnNldCgiZGF0YSIsIGRhdGEpOworICAgIHJldHVybiByZWNvcmQ7CiB9CiAKIAot U2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3VyY2VTZW5kUmVx dWVzdFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0 YXJ0VGltZSwKK1NjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291 cmNlU2VuZFJlcXVlc3RSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUg c3RhcnRUaW1lLAogICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgYm9vbCBpc01haW5SZXNv dXJjZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewogICAgIFNjcmlwdE9iamVj dCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOwpAQCAt MTMxLDcgKzEzMSw3IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0 ZVJlc291cmNlU2VuZFJlcXVlc3RUaW1lbGluZVJlY29yZChJbnNwCiAgICAgcmV0dXJuIHJlY29y ZDsKIH0KIAotU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVzb3Vy Y2VSZWNlaXZlUmVzcG9uc2VUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRl bmQsIGRvdWJsZSBzdGFydFRpbWUsCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5 OjpjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCog ZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsCiAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBTY3JpcHRPYmplY3Qg cmVjb3JkID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsKQEAgLTE0 NCw3ICsxNDQsNyBAQCBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVS ZXNvdXJjZVJlY2VpdmVSZXNwb25zZVRpbWVsaW5lUmVjb3JkKAogICAgIHJldHVybiByZWNvcmQ7 CiB9CiAKLVNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNl RmluaXNoVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUg c3RhcnRUaW1lLAorU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlUmVz b3VyY2VGaW5pc2hSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3Rh cnRUaW1lLAogICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgYm9vbCBkaWRGYWlsKQogewog ICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBjcmVhdGVHZW5lcmljUmVjb3JkKGZyb250ZW5kLCBz dGFydFRpbWUpOwpAQCAtMTU1LDcgKzE1NSw3IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29y ZEZhY3Rvcnk6OmNyZWF0ZVJlc291cmNlRmluaXNoVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yCiAg ICAgcmV0dXJuIHJlY29yZDsKIH0KIAotU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9y eTo6Y3JlYXRlUGFpbnRUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQs IGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IEludFJlY3QmIHJlY3QpCitTY3JpcHRPYmplY3QgVGlt ZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVQYWludFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCog ZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAg U2NyaXB0T2JqZWN0IHJlY29yZCA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0 VGltZSk7CiAgICAgU2NyaXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0 KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3Rvcnku aCBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCmluZGV4IGQ1MmU5 MmQuLmUwY2NjOTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3Jk RmFjdG9yeS5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5o CkBAIC01MiwyMSArNTIsMjEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHN0YXRp YyBTY3JpcHRPYmplY3QgY3JlYXRlVGltZXJJbnN0YWxsUmVjb3JkKEluc3BlY3RvckZyb250ZW5k KiwgZG91YmxlIHN0YXJ0VGltZSwgaW50IHRpbWVySWQsIGludCB0aW1lb3V0LCBib29sIHNpbmds ZVNob3QpOwogCi0gICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlWEhSUmVhZHlTdGF0 ZUNoYW5nZVRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGlt ZSwgY29uc3QgU3RyaW5nJiB1cmwsIGludCByZWFkeVN0YXRlKTsKLSAgICAgICAgc3RhdGljIFNj cmlwdE9iamVjdCBjcmVhdGVYSFJMb2FkVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQq LCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCk7CisgICAgICAgIHN0YXRpYyBT Y3JpcHRPYmplY3QgY3JlYXRlWEhSUmVhZHlTdGF0ZUNoYW5nZVJlY29yZChJbnNwZWN0b3JGcm9u dGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgcmVhZHlTdGF0 ZSk7CisgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlWEhSTG9hZFJlY29yZChJbnNw ZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsKTsKICAg ICAgICAgCi0gICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlRXZhbHVhdGVTY3JpcHRU aW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0 IFN0cmluZyYsIGRvdWJsZSBsaW5lTnVtYmVyKTsKKyAgICAgICAgc3RhdGljIFNjcmlwdE9iamVj dCBjcmVhdGVFdmFsdWF0ZVNjcmlwdFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBz dGFydFRpbWUsIGNvbnN0IFN0cmluZyYsIGRvdWJsZSBsaW5lTnVtYmVyKTsKICAgICAgICAgCiAg ICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlTWFya1RpbWVsaW5lUmVjb3JkKEluc3Bl Y3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJik7CiAKLSAgICAg ICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVSZXNvdXJjZVNlbmRSZXF1ZXN0VGltZWxpbmVS ZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLAorICAgICAgICBzdGF0 aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVJlc291cmNlU2VuZFJlcXVlc3RSZWNvcmQoSW5zcGVjdG9y RnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLAogICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBib29sIGlzTWFpblJlc291cmNlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsK LSAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNwb25z ZVRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwKKyAg ICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVSZXNvdXJjZVJlY2VpdmVSZXNwb25zZVJl Y29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsCiAgICAgICAgICAgICB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKLSAgICAg ICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVSZXNvdXJjZUZpbmlzaFRpbWVsaW5lUmVjb3Jk KEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwKKyAgICAgICAgc3RhdGljIFNj cmlwdE9iamVjdCBjcmVhdGVSZXNvdXJjZUZpbmlzaFJlY29yZChJbnNwZWN0b3JGcm9udGVuZCos IGRvdWJsZSBzdGFydFRpbWUsCiAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGJvb2wgZGlkRmFpbCk7CiAKLSAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVQYWlu dFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29u c3QgSW50UmVjdCYpOworICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVBhaW50UmVj b3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgSW50UmVjdCYp OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgVGltZWxpbmVSZWNvcmRGYWN0b3J5KCkgeyB9Cg==