150615 2015-10-27 17:57:34 -0700 Web Inspector: Remove Timeline MarkDOMContent and MarkLoad, data is already available 2015-10-27 19:45:45 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1137021 0 joepeck 2015-10-27 17:57:34 -0700 * SUMMARY Remove Timeline MarkDOMContent and MarkLoad, data is already available. This data is already sent for the main frame in the `Page.domContentEventFired` and `Page.loadEventFired` events. We can drop the Timeline specific events in favor of these which have existed for a very long time (before iOS 7). 1137030 1 264187 joepeck 2015-10-27 18:25:49 -0700 Created attachment 264187 [PATCH] Proposed Fix 1137039 2 264187 commit-queue 2015-10-27 19:45:42 -0700 Comment on attachment 264187 [PATCH] Proposed Fix Clearing flags on attachment: 264187 Committed r191651: <http://trac.webkit.org/changeset/191651> 1137040 3 commit-queue 2015-10-27 19:45:45 -0700 All reviewed patches have been landed. Closing bug. 264187 2015-10-27 18:25:49 -0700 2015-10-27 19:45:42 -0700 [PATCH] Proposed Fix remove-mark-events.patch text/plain 14060 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDEzZjIzMzguLjAwZTk3NmU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNCBAQAogMjAxNS0xMC0yNyAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92 ZSBUaW1lbGluZSBNYXJrRE9NQ29udGVudCBhbmQgTWFya0xvYWQsIGRhdGEgaXMgYWxyZWFkeSBh dmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1MDYxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5lLmpzb246CisKKzIwMTUtMTAtMjcgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW1vdmUgdW51c2VkIC8gZHVwbGljYXRlZCBYSFIgdGltZWxpbmUgaW5zdHJ1bWVudGF0aW9u CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA2MDUK IApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9U aW1lbGluZS5qc29uIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9U aW1lbGluZS5qc29uCmluZGV4IGVhZGYyNzUuLjVmNWEwYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvVGltZWxpbmUuanNvbgorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1RpbWVsaW5lLmpzb24KQEAgLTIw LDggKzIwLDYgQEAKICAgICAgICAgICAgICAgICAiVGltZXJSZW1vdmUiLAogICAgICAgICAgICAg ICAgICJUaW1lckZpcmUiLAogICAgICAgICAgICAgICAgICJFdmFsdWF0ZVNjcmlwdCIsCi0gICAg ICAgICAgICAgICAgIk1hcmtMb2FkIiwKLSAgICAgICAgICAgICAgICAiTWFya0RPTUNvbnRlbnQi LAogICAgICAgICAgICAgICAgICJUaW1lU3RhbXAiLAogICAgICAgICAgICAgICAgICJUaW1lIiwK ICAgICAgICAgICAgICAgICAiVGltZUVuZCIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjRhNmViNi4uNmU5NGQ2 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE1LTEwLTI3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3Zl IFRpbWVsaW5lIE1hcmtET01Db250ZW50IGFuZCBNYXJrTG9hZCwgZGF0YSBpcyBhbHJlYWR5IGF2 YWlsYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUwNjE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhlIHRpbWVzdGFtcCBvbmx5IGV2ZW50IGRhdGEgaXMgYWxyZWFkeSBhdmFpbGFibGUgZnJvbSBg UGFnZS5kb21Db250ZW50RXZlbnRGaXJlZGAKKyAgICAgICAgYW5kIGBQYWdlLmxvYWRFdmVudEZp cmVkYCBldmVudHMuIFdlIGNhbiBkcm9wIHRoZSBUaW1lbGluZSBzcGVjaWZpYyBldmVudHMgaW4K KyAgICAgICAgZmF2b3Igb2YgdGhlc2Ugd2hpY2ggaGF2ZSBleGlzdGVkIGZvciBhIHZlcnkgbG9u ZyB0aW1lIChiZWZvcmUgaU9TIDcpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvcklu c3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmxvYWRFdmVudEZpcmVkSW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OmRvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkSW1wbCk6IERlbGV0ZWQu CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya0RPTUNvbnRlbnRFdmVu dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpk aWRNYXJrTG9hZEV2ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OnRvUHJvdG9jb2wp OiBEZWxldGVkLgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6 CisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZU1hcmtEYXRhKTogRGVsZXRl ZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5Lmg6CisKKzIwMTUt MTAtMjcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBSZW1vdmUgdW51c2VkIC8gZHVwbGljYXRlZCBYSFIgdGltZWxpbmUgaW5z dHJ1bWVudGF0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTA2MDUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvckluc3RydW1lbnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmNwcAppbmRleCAwNmI1NTQ4Li5iMTk5NGM3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNw cApAQCAtNjg0LDkgKzY4NCw2IEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRS ZWNlaXZlU2NyaXB0UmVzcG9uc2VJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmCiAKIHZvaWQgSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkb21Db250ZW50TG9hZGVkRXZlbnRGaXJlZEltcGwoSW5z dHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgRnJhbWUmIGZyYW1lKQogewot ICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zdHJ1bWVu dGluZ0FnZW50cy5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCi0gICAgICAgIHRpbWVsaW5lQWdl bnQtPmRpZE1hcmtET01Db250ZW50RXZlbnQoZnJhbWUpOwotCiAgICAgaWYgKCFmcmFtZS5pc01h aW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAKQEAgLTY5OSwxMyArNjk2LDcgQEAgdm9pZCBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRvbUNvbnRlbnRMb2FkZWRFdmVudEZpcmVkSW1wbChJ bnN0cnVtZW50aW5nQWdlbnQKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmxvYWRF dmVudEZpcmVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50aW5nQWdlbnRzLCBG cmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg aWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnN0cnVtZW50aW5n QWdlbnRzLmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+ ZGlkTWFya0xvYWRFdmVudCgqZnJhbWUpOwotCi0gICAgaWYgKCFmcmFtZS0+aXNNYWluRnJhbWUo KSkKKyAgICBpZiAoIWZyYW1lIHx8ICFmcmFtZS0+aXNNYWluRnJhbWUoKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgaWYgKEluc3BlY3RvclBhZ2VBZ2VudCogcGFnZUFnZW50ID0gaW5zdHJ1bWVu dGluZ0FnZW50cy5pbnNwZWN0b3JQYWdlQWdlbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRleCBmNTdjMjVjLi44ZmJi OWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuY3BwCkBAIC00OTYsMTYgKzQ5Niw2IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVB Z2VudDo6dGltZUVuZChGcmFtZSYgZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKICAgICBh cHBlbmRSZWNvcmQoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lU3RhbXBEYXRhKG1l c3NhZ2UpLCBUaW1lbGluZVJlY29yZFR5cGU6OlRpbWVFbmQsIHRydWUsICZmcmFtZSk7CiB9CiAK LXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya0RPTUNvbnRlbnRFdmVudChGcmFt ZSYgZnJhbWUpCi17Ci0gICAgYXBwZW5kUmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3Jl YXRlTWFya0RhdGEoZnJhbWUuaXNNYWluRnJhbWUoKSksIFRpbWVsaW5lUmVjb3JkVHlwZTo6TWFy a0RPTUNvbnRlbnQsIGZhbHNlLCAmZnJhbWUpOwotfQotCi12b2lkIEluc3BlY3RvclRpbWVsaW5l QWdlbnQ6OmRpZE1hcmtMb2FkRXZlbnQoRnJhbWUmIGZyYW1lKQotewotICAgIGFwcGVuZFJlY29y ZChUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZU1hcmtEYXRhKGZyYW1lLmlzTWFpbkZyYW1l KCkpLCBUaW1lbGluZVJlY29yZFR5cGU6Ok1hcmtMb2FkLCBmYWxzZSwgJmZyYW1lKTsKLX0KLQog dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21taXRMb2FkKCkKIHsKICAgICBjbGVh clJlY29yZFN0YWNrKCk7CkBAIC01OTYsMTEgKzU4Niw2IEBAIHN0YXRpYyBJbnNwZWN0b3I6OlBy b3RvY29sOjpUaW1lbGluZTo6RXZlbnRUeXBlIHRvUHJvdG9jb2woVGltZWxpbmVSZWNvcmRUeXBl IHR5CiAgICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OkV2YWx1YXRlU2NyaXB0OgogICAgICAg ICByZXR1cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6VGltZWxpbmU6OkV2ZW50VHlwZTo6RXZhbHVh dGVTY3JpcHQ7CiAKLSAgICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6TWFya0xvYWQ6Ci0gICAg ICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpNYXJr TG9hZDsKLSAgICBjYXNlIFRpbWVsaW5lUmVjb3JkVHlwZTo6TWFya0RPTUNvbnRlbnQ6Ci0gICAg ICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpNYXJr RE9NQ29udGVudDsKLQogICAgIGNhc2UgVGltZWxpbmVSZWNvcmRUeXBlOjpUaW1lU3RhbXA6CiAg ICAgICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpUaW1lbGluZTo6RXZlbnRUeXBlOjpU aW1lU3RhbXA7CiAgICAgY2FzZSBUaW1lbGluZVJlY29yZFR5cGU6OlRpbWU6CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCBjMjQw YmFlLi4zOWM0ZGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVGltZWxpbmVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JUaW1lbGluZUFnZW50LmgKQEAgLTgyLDkgKzgyLDYgQEAgZW51bSBjbGFzcyBUaW1lbGluZVJl Y29yZFR5cGUgewogCiAgICAgRXZhbHVhdGVTY3JpcHQsCiAKLSAgICBNYXJrTG9hZCwKLSAgICBN YXJrRE9NQ29udGVudCwKLQogICAgIFRpbWVTdGFtcCwKICAgICBUaW1lLAogICAgIFRpbWVFbmQs CkBAIC0xNTUsOCArMTUyLDYgQEAgcHVibGljOgogICAgIHZvaWQgd2lsbFdyaXRlSFRNTCh1bnNp Z25lZCBzdGFydExpbmUsIEZyYW1lKik7CiAgICAgdm9pZCBkaWRXcml0ZUhUTUwodW5zaWduZWQg ZW5kTGluZSk7CiAgICAgdm9pZCBkaWRUaW1lU3RhbXAoRnJhbWUmLCBjb25zdCBTdHJpbmcmKTsK LSAgICB2b2lkIGRpZE1hcmtET01Db250ZW50RXZlbnQoRnJhbWUmKTsKLSAgICB2b2lkIGRpZE1h cmtMb2FkRXZlbnQoRnJhbWUmKTsKICAgICB2b2lkIGRpZFJlcXVlc3RBbmltYXRpb25GcmFtZShp bnQgY2FsbGJhY2tJZCwgRnJhbWUqKTsKICAgICB2b2lkIGRpZENhbmNlbEFuaW1hdGlvbkZyYW1l KGludCBjYWxsYmFja0lkLCBGcmFtZSopOwogICAgIHZvaWQgd2lsbEZpcmVBbmltYXRpb25GcmFt ZShpbnQgY2FsbGJhY2tJZCwgRnJhbWUqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKaW5kZXggNWRjMzM5NC4uYTY3ZWUyNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5j cHAKQEAgLTE0MCwxMyArMTQwLDYgQEAgUmVmPEluc3BlY3Rvck9iamVjdD4gVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVMYXlvdXREYXRhKHVuc2lnbmVkIGRpcnR5T2JqZWMKICAgICByZXR1 cm4gV1RGOjptb3ZlKGRhdGEpOwogfQogCi1SZWY8SW5zcGVjdG9yT2JqZWN0PiBUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZU1hcmtEYXRhKGJvb2wgaXNNYWluRnJhbWUpCi17Ci0gICAgUmVm PEluc3BlY3Rvck9iamVjdD4gZGF0YSA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7Ci0gICAg ZGF0YS0+c2V0Qm9vbGVhbigiaXNNYWluRnJhbWUiLCBpc01haW5GcmFtZSk7Ci0gICAgcmV0dXJu IFdURjo6bW92ZShkYXRhKTsKLX0KLQogUmVmPEluc3BlY3Rvck9iamVjdD4gVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVQYXJzZUhUTUxEYXRhKHVuc2lnbmVkIHN0YXJ0TGluZSkKIHsKICAg ICBSZWY8SW5zcGVjdG9yT2JqZWN0PiBkYXRhID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3Rv cnkuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaApp bmRleCA1YTkwZmUzLi4zYjcwYmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC03NSw4ICs3NSw2IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogICAgICAgICBzdGF0aWMgUmVmPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBj cmVhdGVMYXlvdXREYXRhKHVuc2lnbmVkIGRpcnR5T2JqZWN0cywgdW5zaWduZWQgdG90YWxPYmpl Y3RzLCBib29sIHBhcnRpYWxMYXlvdXQpOwogCi0gICAgICAgIHN0YXRpYyBSZWY8SW5zcGVjdG9y OjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZU1hcmtEYXRhKGJvb2wgaXNNYWluRnJhbWUpOwotCiAg ICAgICAgIHN0YXRpYyBSZWY8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNyZWF0ZVBhcnNl SFRNTERhdGEodW5zaWduZWQgc3RhcnRMaW5lKTsKIAogICAgICAgICBzdGF0aWMgUmVmPEluc3Bl Y3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVBbmltYXRpb25GcmFtZURhdGEoaW50IGNhbGxi YWNrSWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggOTg4ZTc3OC4uMTNhZDczMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTUtMTAtMjcgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW1vdmUgVGltZWxpbmUgTWFya0RPTUNvbnRlbnQgYW5kIE1hcmtMb2FkLCBkYXRhIGlzIGFs cmVhZHkgYXZhaWxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTA2MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUuX3Byb2Nlc3NF dmVudCk6CisgICAgICAgIFJlbW92ZSB0aGUgbm93IHVubmVlZCBtYXJrIGV2ZW50IGhhbmRsaW5n LgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5wYWdl RE9NQ29udGVudExvYWRlZEV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lTWFuYWdlci5wcm90b3R5cGUucGFnZUxvYWRFdmVudEZpcmVkKToKKyAgICAgICAgVXBkYXRl IHRoZSBtYWluIGZyYW1lIGFuZCBjcmVhdGUgbWFya2VycyBmb3IgdGhlIGN1cnJlbnQgcmVjb3Jk aW5nLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Qcm90b2NvbC9QYWdlT2JzZXJ2ZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFnZU9ic2VydmVyLnByb3RvdHlwZS5kb21Db250ZW50 RXZlbnRGaXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFnZU9ic2VydmVyLnByb3RvdHlw ZS5sb2FkRXZlbnRGaXJlZCk6CisgICAgICAgIEZvcndhcmQgdG8gVGltZWxpbmVNYW5hZ2VyLgor CisyMDE1LTEwLTI3ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAg ICAgICAgV2ViIEluc3BlY3RvcjogU2hvdyBUaW1lbGluZSBNYXJrZXJzIGFnYWluIChET01Db250 ZW50TG9hZGVkLCBMb2FkLCBjb25zb2xlLnRpbWVTdGFtcCkKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDYxMgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1l bGluZU1hbmFnZXIuanMKaW5kZXggMzJhYWNiYS4uOGQ0MGUyMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L1RpbWVsaW5lTWFuYWdlci5qcwpAQCAtMjMzLDEyICsyMzMsMzYgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5lTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rv ci5PYmplY3QKIAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgcGFnZURpZExvYWQodGltZXN0YW1w KQorICAgIHBhZ2VET01Db250ZW50TG9hZGVkRXZlbnRGaXJlZCh0aW1lc3RhbXApCiAgICAgewog ICAgICAgICAvLyBDYWxsZWQgZnJvbSBXZWJJbnNwZWN0b3IuUGFnZU9ic2VydmVyLgogCi0gICAg ICAgIGlmIChpc05hTihXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1l LmxvYWRFdmVudFRpbWVzdGFtcCkpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuZnJhbWVSZXNv dXJjZU1hbmFnZXIubWFpbkZyYW1lLm1hcmtMb2FkRXZlbnQodGhpcy5hY3RpdmVSZWNvcmRpbmcu Y29tcHV0ZUVsYXBzZWRUaW1lKHRpbWVzdGFtcCkpOworICAgICAgICBjb25zb2xlLmFzc2VydCh0 aGlzLl9hY3RpdmVSZWNvcmRpbmcpOworICAgICAgICBjb25zb2xlLmFzc2VydChpc05hTihXZWJJ bnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLmRvbUNvbnRlbnRSZWFkeUV2 ZW50VGltZXN0YW1wKSk7CisKKyAgICAgICAgbGV0IGNvbXB1dGVkVGltZXN0YW1wID0gdGhpcy5h Y3RpdmVSZWNvcmRpbmcuY29tcHV0ZUVsYXBzZWRUaW1lKHRpbWVzdGFtcCk7CisKKyAgICAgICAg V2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5tYXJrRE9NQ29udGVu dFJlYWR5RXZlbnQoY29tcHV0ZWRUaW1lc3RhbXApOworCisgICAgICAgIGxldCBldmVudE1hcmtl ciA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYXJrZXIoY29tcHV0ZWRUaW1lc3RhbXAsIFdl Ykluc3BlY3Rvci5UaW1lbGluZU1hcmtlci5UeXBlLkRPTUNvbnRlbnRFdmVudCk7CisgICAgICAg IHRoaXMuX2FjdGl2ZVJlY29yZGluZy5hZGRFdmVudE1hcmtlcihldmVudE1hcmtlcik7CisgICAg fQorCisgICAgcGFnZUxvYWRFdmVudEZpcmVkKHRpbWVzdGFtcCkKKyAgICB7CisgICAgICAgIC8v IENhbGxlZCBmcm9tIFdlYkluc3BlY3Rvci5QYWdlT2JzZXJ2ZXIuCisKKyAgICAgICAgY29uc29s ZS5hc3NlcnQodGhpcy5fYWN0aXZlUmVjb3JkaW5nKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQo aXNOYU4oV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5sb2FkRXZl bnRUaW1lc3RhbXApKTsKKworICAgICAgICBsZXQgY29tcHV0ZWRUaW1lc3RhbXAgPSB0aGlzLmFj dGl2ZVJlY29yZGluZy5jb21wdXRlRWxhcHNlZFRpbWUodGltZXN0YW1wKTsKKworICAgICAgICBX ZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLm1hcmtMb2FkRXZlbnQo Y29tcHV0ZWRUaW1lc3RhbXApOworCisgICAgICAgIGxldCBldmVudE1hcmtlciA9IG5ldyBXZWJJ bnNwZWN0b3IuVGltZWxpbmVNYXJrZXIoY29tcHV0ZWRUaW1lc3RhbXAsIFdlYkluc3BlY3Rvci5U aW1lbGluZU1hcmtlci5UeXBlLkxvYWRFdmVudCk7CisgICAgICAgIHRoaXMuX2FjdGl2ZVJlY29y ZGluZy5hZGRFdmVudE1hcmtlcihldmVudE1hcmtlcik7CisKKyAgICAgICAgdGhpcy5fc3RvcEF1 dG9SZWNvcmRpbmdTb29uKCk7CiAgICAgfQogCiAgICAgLy8gUHJpdmF0ZQpAQCAtMzkyLDQ4ICs0 MTYsMTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5lTWFu YWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAgIF9wcm9jZXNzRXZlbnQocmVj b3JkUGF5bG9hZCwgcGFyZW50UmVjb3JkUGF5bG9hZCkKICAgICB7Ci0gICAgICAgIHZhciBzdGFy dFRpbWUgPSB0aGlzLmFjdGl2ZVJlY29yZGluZy5jb21wdXRlRWxhcHNlZFRpbWUocmVjb3JkUGF5 bG9hZC5zdGFydFRpbWUpOwotICAgICAgICB2YXIgZW5kVGltZSA9IHRoaXMuYWN0aXZlUmVjb3Jk aW5nLmNvbXB1dGVFbGFwc2VkVGltZShyZWNvcmRQYXlsb2FkLmVuZFRpbWUpOwotCiAgICAgICAg IHN3aXRjaCAocmVjb3JkUGF5bG9hZC50eXBlKSB7Ci0gICAgICAgIGNhc2UgVGltZWxpbmVBZ2Vu dC5FdmVudFR5cGUuTWFya0xvYWQ6Ci0gICAgICAgICAgICBjb25zb2xlLmFzc2VydChpc05hTihl bmRUaW1lKSk7Ci0KLSAgICAgICAgICAgIHZhciBmcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJl c291cmNlTWFuYWdlci5mcmFtZUZvcklkZW50aWZpZXIocmVjb3JkUGF5bG9hZC5mcmFtZUlkKTsK LSAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGZyYW1lKTsKLSAgICAgICAgICAgIGlmICghZnJh bWUpCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgIGZyYW1lLm1hcmtMb2Fk RXZlbnQoc3RhcnRUaW1lKTsKLQotICAgICAgICAgICAgaWYgKCFmcmFtZS5pc01haW5GcmFtZSgp KQotICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICB2YXIgZXZlbnRNYXJrZXIg PSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFya2VyKHN0YXJ0VGltZSwgV2ViSW5zcGVjdG9y LlRpbWVsaW5lTWFya2VyLlR5cGUuTG9hZEV2ZW50KTsKLSAgICAgICAgICAgIHRoaXMuX2FjdGl2 ZVJlY29yZGluZy5hZGRFdmVudE1hcmtlcihldmVudE1hcmtlcik7Ci0KLSAgICAgICAgICAgIHRo aXMuX3N0b3BBdXRvUmVjb3JkaW5nU29vbigpOwotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAg ICAgY2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5NYXJrRE9NQ29udGVudDoKLSAgICAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KGlzTmFOKGVuZFRpbWUpKTsKLQotICAgICAgICAgICAgdmFyIGZy YW1lID0gV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLmZyYW1lRm9ySWRlbnRpZmll cihyZWNvcmRQYXlsb2FkLmZyYW1lSWQpOwotICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoZnJh bWUpOwotICAgICAgICAgICAgaWYgKCFmcmFtZSkKLSAgICAgICAgICAgICAgICBicmVhazsKLQot ICAgICAgICAgICAgZnJhbWUubWFya0RPTUNvbnRlbnRSZWFkeUV2ZW50KHN0YXJ0VGltZSk7Ci0K LSAgICAgICAgICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSkKLSAgICAgICAgICAgICAgICBi cmVhazsKLQotICAgICAgICAgICAgdmFyIGV2ZW50TWFya2VyID0gbmV3IFdlYkluc3BlY3Rvci5U aW1lbGluZU1hcmtlcihzdGFydFRpbWUsIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hcmtlci5UeXBl LkRPTUNvbnRlbnRFdmVudCk7Ci0gICAgICAgICAgICB0aGlzLl9hY3RpdmVSZWNvcmRpbmcuYWRk RXZlbnRNYXJrZXIoZXZlbnRNYXJrZXIpOwotICAgICAgICAgICAgYnJlYWs7Ci0KICAgICAgICAg Y2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5UaW1lU3RhbXA6Ci0gICAgICAgICAgICB2YXIg ZXZlbnRNYXJrZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFya2VyKHN0YXJ0VGltZSwg V2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFya2VyLlR5cGUuVGltZVN0YW1wKTsKKyAgICAgICAgICAg IHZhciB0aW1lc3RhbXAgPSB0aGlzLmFjdGl2ZVJlY29yZGluZy5jb21wdXRlRWxhcHNlZFRpbWUo cmVjb3JkUGF5bG9hZC5zdGFydFRpbWUpOworICAgICAgICAgICAgdmFyIGV2ZW50TWFya2VyID0g bmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZU1hcmtlcih0aW1lc3RhbXAsIFdlYkluc3BlY3Rvci5U aW1lbGluZU1hcmtlci5UeXBlLlRpbWVTdGFtcCk7CiAgICAgICAgICAgICB0aGlzLl9hY3RpdmVS ZWNvcmRpbmcuYWRkRXZlbnRNYXJrZXIoZXZlbnRNYXJrZXIpOwogICAgICAgICAgICAgYnJlYWs7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3Rv Y29sL1BhZ2VPYnNlcnZlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1Byb3RvY29sL1BhZ2VPYnNlcnZlci5qcwppbmRleCAxMWZhZWVkLi45ODE5NzJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9QYWdlT2Jz ZXJ2ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9j b2wvUGFnZU9ic2VydmVyLmpzCkBAIC0yOSwxMiArMjksMTIgQEAgV2ViSW5zcGVjdG9yLlBhZ2VP YnNlcnZlciA9IGNsYXNzIFBhZ2VPYnNlcnZlcgogCiAgICAgZG9tQ29udGVudEV2ZW50RmlyZWQo dGltZXN0YW1wKQogICAgIHsKLSAgICAgICAgLy8gQ292ZXJlZCBieSBUaW1lbGluZSAiTWFya0RP TUNvbnRlbnQiIHJlY29yZC4KKyAgICAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlci5w YWdlRE9NQ29udGVudExvYWRlZEV2ZW50RmlyZWQodGltZXN0YW1wKTsKICAgICB9CiAKICAgICBs b2FkRXZlbnRGaXJlZCh0aW1lc3RhbXApCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IudGlt ZWxpbmVNYW5hZ2VyLnBhZ2VEaWRMb2FkKHRpbWVzdGFtcCk7CisgICAgICAgIFdlYkluc3BlY3Rv ci50aW1lbGluZU1hbmFnZXIucGFnZUxvYWRFdmVudEZpcmVkKHRpbWVzdGFtcCk7CiAgICAgfQog CiAgICAgZnJhbWVOYXZpZ2F0ZWQoZnJhbWUsIGxvYWRlcklkKQo=