195789 2019-03-14 20:06:22 -0700 Web Inspector: CPU Usage Timeline - the right edge of each column should align with a CPU measurement 2019-03-19 13:13:10 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1516862 0 hi 2019-03-14 20:06:22 -0700 Right now, we are rendering each column such that the middle of the column is aligned with the CPU measurement. This could potentially be misleading, as due to the width of the bar, it implies that there was a period of time after the actual CPU measurement that is attributed to that same CPU measurement. 1 2 3 _______ [ * ] [ * ]_______ [ * ][ * ] _______[ * ][ * ] [ * ][ * ][ * ] [__*__][__*__][__*__] A B C D E F In this example, a developer might "attribute" any work done at time B to record 1, when in reality it should be "attributed" to record 2, since the CPU measurement had already been taken by the time B was captured, meaning that the work for B hadn't yet been don and could therefore not have affected the CPU measurement We should be rendering the columns such that the CPU measurement aligns with the trailing edge of the column. 1 2 3 _______ ___ [ *] [ [ *]_______[ [ *][ *][ ____[ *][ *][ *][ *][ *][ __*][____*][____*][__ A B C D E F NOT: the drawing isn't exactly accurate, as the * would overlap the ]. Legend: [ ] = a column for a CPU measurement (500ms wide to account for the fact that CPU measurements are 500ms apart) * = the time when the measurement actually takes place 1516884 1 webkit-bug-importer 2019-03-14 22:00:34 -0700 <rdar://problem/48915271> 1516885 2 364769 hi 2019-03-14 22:04:04 -0700 Created attachment 364769 Patch 1517347 3 364907 hi 2019-03-15 20:49:33 -0700 Created attachment 364907 Patch 1518432 4 364907 joepeck 2019-03-19 12:03:01 -0700 Comment on attachment 364907 Patch r=me 1518493 5 364907 commit-queue 2019-03-19 13:13:08 -0700 Comment on attachment 364907 Patch Clearing flags on attachment: 364907 Committed r243166: <https://trac.webkit.org/changeset/243166> 1518495 6 commit-queue 2019-03-19 13:13:10 -0700 All reviewed patches have been landed. Closing bug. 364769 2019-03-14 22:04:04 -0700 2019-03-15 20:49:30 -0700 Patch bug-195789-20190314220404.patch text/plain 4059 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFlOWU4MjYwODI4ZDA1MWY1MDMyZjU0OTAxZGIy MjdmNTExYjJhZWYuLmU3NTdlY2JhNTIxYjI2ZjA5OTI5ZTQzOWRjNjYxMmM5M2I4OWZjOWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE5LTAzLTE0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD UFUgVXNhZ2UgVGltZWxpbmUgLSB0aGUgcmlnaHQgZWRnZSBvZiBlYWNoIGNvbHVtbiBzaG91bGQg YWxpZ24gd2l0aCBhIENQVSBtZWFzdXJlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1Nzg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODkx NTI3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS aWdodCBub3csIGVhY2ggY29sdW1uIGlzIHJlbmRlcmVkIHN1Y2ggdGhhdCB0aGUgbWlkZGxlIG9m IHRoZSBjb2x1bW4gaXMgYWxpZ25lZCB3aXRoIHRoZQorICAgICAgICB0aW1lIG9mIHRoZSBDUFUg bWVhc3VyZW1lbnQuIFRoaXMgY291bGQgcG90ZW50aWFsbHkgYmUgbWlzbGVhZGluZywgYXMgdGhl IHdpZHRoL3Bvc2l0aW9uIG9mCisgICAgICAgIHRoZSBiYXIgaW1wbGllcyB0aGF0IHRoZXJlIHdh cyBhIHBlcmlvZCBvZiB0aW1lIGFmdGVyIHRoZSBhY3R1YWwgdGltZSBvZiB0aGUgQ1BVIG1lYXN1 cmVtZW50CisgICAgICAgIHRoYXQgc2hvdWxkIGJlICJhdHRyaWJ1dGVkIiB0byB0aGF0IHNhbWUg Q1BVIG1lYXN1cmVtZW50LgorCisgICAgICAgICAgIDEgICAgICAyICAgICAgMworICAgICAgICAg ICAgICAgX19fX19fXworICAgICAgICAgICAgICAgWyAgKiAgXQorICAgICAgICAgICAgICAgWyAg KiAgXV9fX19fX18KKyAgICAgICAgICAgICAgIFsgICogIF1bICAqICBdCisgICAgICAgIF9fX19f X19bICAqICBdWyAgKiAgXQorICAgICAgICBbICAqICBdWyAgKiAgXVsgICogIF0KKyAgICAgICAg W19fKl9fXVtfXypfX11bX18qX19dCisgICAgICAgICBBICAgQiAgQyAgIEQgIEUgICBGCisKKyAg ICAgICAgSW4gdGhpcyBleGFtcGxlLCBvbmUgbWlnaHQgImF0dHJpYnV0ZSIgYW55IHdvcmsgZG9u ZSBhdCB0aW1lIEIgdG8gcmVjb3JkIDEsIHdoZW4gaW4gcmVhbGl0eSwKKyAgICAgICAgaXQgc2hv dWxkIGJlICJhdHRyaWJ1dGVkIiB0byByZWNvcmQgMiwgc2luY2UgdGhlIENQVSBtZWFzdXJlbWVu dCBoYWQgYWxyZWFkeSBiZWVuIHRha2VuIGJ5CisgICAgICAgIHRoZSB0aW1lIEIgd2FzIGNhcHR1 cmVkLCBtZWFuaW5nIHRoYXQgdGhlIHdvcmsgZm9yIEIgaGFkbid0IHlldCBiZWVuIGRvbmUgYW5k IGNvdWxkCisgICAgICAgIHRoZXJlZm9yZSBub3QgaGF2ZSBhZmZlY3RlZCB0aGUgQ1BVIG1lYXN1 cmVtZW50IGZvciByZWNvcmQgMS4KKworICAgICAgICBXZSBzaG91bGQgYmUgcmVuZGVyaW5nIHRo ZSBjb2x1bW5zIHN1Y2ggdGhhdCB0aGUgQ1BVIG1lYXN1cmVtZW50IGFsaWducyB3aXRoIHRoZSB0 cmFpbGluZworICAgICAgICBlZGdlIG9mIHRoZSBjb2x1bW4sIHNvIHRoYXQgYWxsIG9mIHRoZSB3 b3JrIHRoYXQgY291bGQgYmUgImF0dHJpYnV0ZWQiIHRvIGEgZ2l2ZW4gQ1BVCisgICAgICAgIG1l YXN1cmVtZW50IGNvbWVzIGJlZm9yZSBpdC4KKworICAgICAgICAgIDEgICAgICAyICAgICAgMwor ICAgICAgICAgICAgX19fX19fXyAgICAgICBfX18KKyAgICAgICAgICAgIFsgICAgKl0gICAgICAg WworICAgICAgICAgICAgWyAgICAqXV9fX19fX19bCisgICAgICAgICAgICBbICAgICpdWyAgICAq XVsKKyAgICAgICAgX19fX1sgICAgKl1bICAgICpdWworICAgICAgICAgICpdWyAgICAqXVsgICAg Kl1bCisgICAgICAgIF9fKl1bX19fXypdW19fX18qXVtfXworICAgICAgICAgQSAgIEIgIEMgICBE ICBFICAgRgorCisgICAgICAgICAgICAgICAgTk9URTogdGhpcyAicmVuZGVyaW5nIiBpc24ndCBl eGFjdGx5IGFjY3VyYXRlLCBhcyB0aGUgYCpgIHNob3VsZCBvdmVybGFwIHRoZSBgXWAuCisKKyAg ICAgICAgTGVnZW5kOgorICAgICAgICAgLSBgWyAgICAgXWAgcmVwcmVzZW50cyBhIGNvbHVtbiBm b3IgYSBDUFUgbWVhc3VyZW1lbnQKKyAgICAgICAgIC0gYCpgIHJlcHJlc2VudHMgdGhlIHRpbWUg d2hlbiB0aGUgbWVhc3VyZW1lbnQgYWN0dWFsbHkgdGFrZXMgcGxhY2UKKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAgICAo V0kuQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5sYXlvdXQpOgorCiAyMDE5LTAz LTE0ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IFN0eWxlczogSnVtcCB0byBlZmZlY3RpdmUgcHJvcGVydHkgYnV0dG9uIGRv ZXNuJ3QgaGlkZSBhZnRlciBvdmVycmlkZGVuIHByb3BlcnR5IGJlY29tZSBlZmZlY3RpdmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NQVVRp bWVsaW5lT3ZlcnZpZXdHcmFwaC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwppbmRleCBhNTJhZjVkZjQ3MDNm YjZhOTYwZWU3MDkwOTQyOTM3NDlhMGQ1YjgzLi5mNTAyNGRmMWYwYmI5OWQ3ZTBlMTc5ZjVlNjM2 OTQ4NTk5YTM0NTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLmpz CkBAIC0xMjEsMTQgKzEyMSwxMyBAQCBXSS5DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFz cyBDUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5UaW1lbGluZQogICAgICAgICAg ICAgcmV0dXJuIHlTY2FsZShyZWNvcmQudXNhZ2UpOwogICAgICAgICB9CiAKLSAgICAgICAgbGV0 IGludGVydmFsV2lkdGggPSAoQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnNhbXBsaW5nUmF0ZVBl clNlY29uZCAvIHNlY29uZHNQZXJQaXhlbCk7CisgICAgICAgIGxldCBpbnRlcnZhbFdpZHRoID0g Q1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnNhbXBsaW5nUmF0ZVBlclNlY29uZCAvIHNlY29uZHNQ ZXJQaXhlbDsKICAgICAgICAgY29uc3QgbWluaW11bURpc3BsYXlIZWlnaHQgPSA0OwogCi0gICAg ICAgIC8vIEJhcnMgZm9yIGVhY2ggcmVjb3JkLgogICAgICAgICBmb3IgKGxldCByZWNvcmQgb2Yg dmlzaWJsZVJlY29yZHMpIHsKICAgICAgICAgICAgIGxldCBhZGRpdGlvbmFsQ2xhc3MgPSByZWNv cmQgPT09IHRoaXMuc2VsZWN0ZWRSZWNvcmQgPyAic2VsZWN0ZWQiIDogdW5kZWZpbmVkOwogICAg ICAgICAgICAgbGV0IHcgPSBpbnRlcnZhbFdpZHRoOwotICAgICAgICAgICAgbGV0IHggPSB4U2Nh bGUocmVjb3JkLnN0YXJ0VGltZSAtIChDUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguc2FtcGxpbmdS YXRlUGVyU2Vjb25kIC8gMikpOyAgICAgICAgICAgIAorICAgICAgICAgICAgbGV0IHggPSB4U2Nh bGUocmVjb3JkLnN0YXJ0VGltZSk7CiAgICAgICAgICAgICBsZXQgaDEgPSBNYXRoLm1heChtaW5p bXVtRGlzcGxheUhlaWdodCwgeVNjYWxlKHJlY29yZC5tYWluVGhyZWFkVXNhZ2UpKTsKICAgICAg ICAgICAgIGxldCBoMiA9IE1hdGgubWF4KG1pbmltdW1EaXNwbGF5SGVpZ2h0LCB5U2NhbGUocmVj b3JkLm1haW5UaHJlYWRVc2FnZSArIHJlY29yZC53b3JrZXJUaHJlYWRVc2FnZSkpOwogICAgICAg ICAgICAgbGV0IGgzID0gTWF0aC5tYXgobWluaW11bURpc3BsYXlIZWlnaHQsIHlTY2FsZShyZWNv cmQudXNhZ2UpKTsK 364907 2019-03-15 20:49:33 -0700 2019-03-19 13:13:08 -0700 Patch bug-195789-20190315204932.patch text/plain 6341 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGM2YWZjYmJhYTdhOGQ5MWY0MWJlNDViOWVkZDdi NWNhYmYzN2MwZWIuLjc1NWI3MDU5M2IwYzQzNjM0MWVmMDRkYzRmM2E1MzM1ZDZiZWM5ODggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3IEBACisyMDE5LTAzLTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD UFUgVXNhZ2UgVGltZWxpbmUgLSB0aGUgcmlnaHQgZWRnZSBvZiBlYWNoIGNvbHVtbiBzaG91bGQg YWxpZ24gd2l0aCBhIENQVSBtZWFzdXJlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1Nzg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODkx NTI3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS aWdodCBub3csIGVhY2ggY29sdW1uIGlzIHJlbmRlcmVkIHN1Y2ggdGhhdCB0aGUgbWlkZGxlIG9m IHRoZSBjb2x1bW4gaXMgYWxpZ25lZCB3aXRoIHRoZQorICAgICAgICB0aW1lIG9mIHRoZSBDUFUg bWVhc3VyZW1lbnQuIFRoaXMgY291bGQgcG90ZW50aWFsbHkgYmUgbWlzbGVhZGluZywgYXMgdGhl IHdpZHRoL3Bvc2l0aW9uIG9mCisgICAgICAgIHRoZSBiYXIgaW1wbGllcyB0aGF0IHRoZXJlIHdh cyBhIHBlcmlvZCBvZiB0aW1lIGFmdGVyIHRoZSBhY3R1YWwgdGltZSBvZiB0aGUgQ1BVIG1lYXN1 cmVtZW50CisgICAgICAgIHRoYXQgc2hvdWxkIGJlICJhdHRyaWJ1dGVkIiB0byB0aGF0IHNhbWUg Q1BVIG1lYXN1cmVtZW50LgorCisgICAgICAgICAgIDEgICAgICAyICAgICAgMworICAgICAgICAg ICAgICAgX19fX19fXworICAgICAgICAgICAgICAgWyAgKiAgXQorICAgICAgICAgICAgICAgWyAg KiAgXV9fX19fX18KKyAgICAgICAgICAgICAgIFsgICogIF1bICAqICBdCisgICAgICAgIF9fX19f X19bICAqICBdWyAgKiAgXQorICAgICAgICBbICAqICBdWyAgKiAgXVsgICogIF0KKyAgICAgICAg W19fKl9fXVtfXypfX11bX18qX19dCisgICAgICAgICBBICAgQiAgQyAgIEQgIEUgICBGCisKKyAg ICAgICAgSW4gdGhpcyBleGFtcGxlLCBvbmUgbWlnaHQgImF0dHJpYnV0ZSIgYW55IHdvcmsgZG9u ZSBhdCB0aW1lIEIgdG8gcmVjb3JkIDEsIHdoZW4gaW4gcmVhbGl0eSwKKyAgICAgICAgaXQgc2hv dWxkIGJlICJhdHRyaWJ1dGVkIiB0byByZWNvcmQgMiwgc2luY2UgdGhlIENQVSBtZWFzdXJlbWVu dCBoYWQgYWxyZWFkeSBiZWVuIHRha2VuIGJ5CisgICAgICAgIHRoZSB0aW1lIEIgd2FzIGNhcHR1 cmVkLCBtZWFuaW5nIHRoYXQgdGhlIHdvcmsgZm9yIEIgaGFkbid0IHlldCBiZWVuIGRvbmUgYW5k IGNvdWxkCisgICAgICAgIHRoZXJlZm9yZSBub3QgaGF2ZSBhZmZlY3RlZCB0aGUgQ1BVIG1lYXN1 cmVtZW50IGZvciByZWNvcmQgMS4KKworICAgICAgICBXZSBzaG91bGQgYmUgcmVuZGVyaW5nIHRo ZSBjb2x1bW5zIHN1Y2ggdGhhdCB0aGUgQ1BVIG1lYXN1cmVtZW50IGFsaWducyB3aXRoIHRoZSB0 cmFpbGluZworICAgICAgICBlZGdlIG9mIHRoZSBjb2x1bW4sIHNvIHRoYXQgYWxsIG9mIHRoZSB3 b3JrIHRoYXQgY291bGQgYmUgImF0dHJpYnV0ZWQiIHRvIGEgZ2l2ZW4gQ1BVCisgICAgICAgIG1l YXN1cmVtZW50IGNvbWVzIGJlZm9yZSBpdC4KKworICAgICAgICAgIDEgICAgICAyICAgICAgMwor ICAgICAgICAgICAgX19fX19fXyAgICAgICBfX18KKyAgICAgICAgICAgIFsgICAgKl0gICAgICAg WworICAgICAgICAgICAgWyAgICAqXV9fX19fX19bCisgICAgICAgICAgICBbICAgICpdWyAgICAq XVsKKyAgICAgICAgX19fX1sgICAgKl1bICAgICpdWworICAgICAgICAgICpdWyAgICAqXVsgICAg Kl1bCisgICAgICAgIF9fKl1bX19fXypdW19fX18qXVtfXworICAgICAgICAgQSAgIEIgIEMgICBE ICBFICAgRgorCisgICAgICAgICAgICAgICAgTk9URTogdGhpcyAicmVuZGVyaW5nIiBpc24ndCBl eGFjdGx5IGFjY3VyYXRlLCBhcyB0aGUgYCpgIHNob3VsZCBvdmVybGFwIHRoZSBgXWAuCisKKyAg ICAgICAgTGVnZW5kOgorICAgICAgICAgLSBgWyAgICAgXWAgcmVwcmVzZW50cyBhIGNvbHVtbiBm b3IgYSBDUFUgbWVhc3VyZW1lbnQKKyAgICAgICAgIC0gYCpgIHJlcHJlc2VudHMgdGhlIHRpbWUg d2hlbiB0aGUgbWVhc3VyZW1lbnQgYWN0dWFsbHkgdGFrZXMgcGxhY2UKKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAgICAo V0kuQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAo V0kuQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5faGFuZGxlQ2hhcnRDbGljayk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzOgorICAg ICAgICAoV0kuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX3JlY29yZFNlbGVjdGVkKToKKwog MjAxOS0wMy0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IENQVSBVc2FnZSBUaW1lbGluZSAtIEdpdmUgbG9uZyB0aHJlYWQg bmFtZXMgYSB0b29sdGlwIGlmIHRoZXkgY291bGQgYmUgZWxsaXBzaXplZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVPdmVy dmlld0dyYXBoLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q1BVVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCmluZGV4IGVmMTMzN2ZkZjczZWNjZGRlNWMyMjUz YjBmMTE1YjgyNzg4NDVlOTQuLjA4N2E0YTZiZjNmNjAwYTU4MjgwOWJkZjA1YjBkMThiNjExMzFj MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKQEAgLTExNiw3 ICsxMTYsNyBAQCBXSS5DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBDUFVUaW1lbGlu ZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5UaW1lbGluZQogICAgICAgICB9CiAKICAgICAgICAg Y29uc3QgaW5jbHVkZVJlY29yZEJlZm9yZVN0YXJ0ID0gdHJ1ZTsKLSAgICAgICAgbGV0IHZpc2li bGVSZWNvcmRzID0gdGhpcy5fY3B1VGltZWxpbmUucmVjb3Jkc0luVGltZVJhbmdlKGdyYXBoU3Rh cnRUaW1lLCB2aXNpYmxlRW5kVGltZSArIChDUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguc2FtcGxp bmdSYXRlUGVyU2Vjb25kIC8gMiksIGluY2x1ZGVSZWNvcmRCZWZvcmVTdGFydCk7CisgICAgICAg IGxldCB2aXNpYmxlUmVjb3JkcyA9IHRoaXMuX2NwdVRpbWVsaW5lLnJlY29yZHNJblRpbWVSYW5n ZShncmFwaFN0YXJ0VGltZSwgdmlzaWJsZUVuZFRpbWUsIGluY2x1ZGVSZWNvcmRCZWZvcmVTdGFy dCk7CiAgICAgICAgIGlmICghdmlzaWJsZVJlY29yZHMubGVuZ3RoKQogICAgICAgICAgICAgcmV0 dXJuOwogCkBAIC0xMjQsMTQgKzEyNCwxMyBAQCBXSS5DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGgg PSBjbGFzcyBDUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5UaW1lbGluZQogICAg ICAgICAgICAgcmV0dXJuIHlTY2FsZShyZWNvcmQudXNhZ2UpOwogICAgICAgICB9CiAKLSAgICAg ICAgbGV0IGludGVydmFsV2lkdGggPSAoQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnNhbXBsaW5n UmF0ZVBlclNlY29uZCAvIHNlY29uZHNQZXJQaXhlbCk7CisgICAgICAgIGxldCBpbnRlcnZhbFdp ZHRoID0gQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnNhbXBsaW5nUmF0ZVBlclNlY29uZCAvIHNl Y29uZHNQZXJQaXhlbDsKICAgICAgICAgY29uc3QgbWluaW11bURpc3BsYXlIZWlnaHQgPSA0Owog Ci0gICAgICAgIC8vIEJhcnMgZm9yIGVhY2ggcmVjb3JkLgogICAgICAgICBmb3IgKGxldCByZWNv cmQgb2YgdmlzaWJsZVJlY29yZHMpIHsKICAgICAgICAgICAgIGxldCBhZGRpdGlvbmFsQ2xhc3Mg PSByZWNvcmQgPT09IHRoaXMuc2VsZWN0ZWRSZWNvcmQgPyAic2VsZWN0ZWQiIDogdW5kZWZpbmVk OwogICAgICAgICAgICAgbGV0IHcgPSBpbnRlcnZhbFdpZHRoOwotICAgICAgICAgICAgbGV0IHgg PSB4U2NhbGUocmVjb3JkLnN0YXJ0VGltZSAtIChDUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguc2Ft cGxpbmdSYXRlUGVyU2Vjb25kIC8gMikpOyAgICAgICAgICAgIAorICAgICAgICAgICAgbGV0IHgg PSB4U2NhbGUocmVjb3JkLnN0YXJ0VGltZSAtIENQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5zYW1w bGluZ1JhdGVQZXJTZWNvbmQpOwogICAgICAgICAgICAgbGV0IGgxID0gTWF0aC5tYXgobWluaW11 bURpc3BsYXlIZWlnaHQsIHlTY2FsZShyZWNvcmQubWFpblRocmVhZFVzYWdlKSk7CiAgICAgICAg ICAgICBsZXQgaDIgPSBNYXRoLm1heChtaW5pbXVtRGlzcGxheUhlaWdodCwgeVNjYWxlKHJlY29y ZC5tYWluVGhyZWFkVXNhZ2UgKyByZWNvcmQud29ya2VyVGhyZWFkVXNhZ2UpKTsKICAgICAgICAg ICAgIGxldCBoMyA9IE1hdGgubWF4KG1pbmltdW1EaXNwbGF5SGVpZ2h0LCB5U2NhbGUocmVjb3Jk LnVzYWdlKSk7CkBAIC0yMDAsNyArMTk5LDcgQEAgV0kuQ1BVVGltZWxpbmVPdmVydmlld0dyYXBo ID0gY2xhc3MgQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoIGV4dGVuZHMgV0kuVGltZWxpbmUKICAg ICAgICAgbGV0IGdyYXBoU3RhcnRUaW1lID0gdGhpcy5zdGFydFRpbWU7CiAKICAgICAgICAgbGV0 IGNsaWNrVGltZSA9IGdyYXBoU3RhcnRUaW1lICsgZ3JhcGhDbGlja1RpbWU7Ci0gICAgICAgIGxl dCByZWNvcmQgPSB0aGlzLl9jcHVUaW1lbGluZS5jbG9zZXN0UmVjb3JkVG8oY2xpY2tUaW1lKTsK KyAgICAgICAgbGV0IHJlY29yZCA9IHRoaXMuX2NwdVRpbWVsaW5lLmNsb3Nlc3RSZWNvcmRUbyhj bGlja1RpbWUgKyAoQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnNhbXBsaW5nUmF0ZVBlclNlY29u ZCAvIDIpKTsKICAgICAgICAgaWYgKCFyZWNvcmQpCiAgICAgICAgICAgICByZXR1cm47CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lT3ZlcnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3LmpzCmluZGV4IGFhNmEzYTQ2M2RhNTM5ZWE1NDdjY2JjZjUwYTY1 Nzk5YjAyYjkxZTIuLmExNTYwZTk0ZjNlYTQ3MzNlYzY5ZmE4ODYzODg3ZDRkOTVlN2UwNDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lT3ZlcnZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVPdmVydmlldy5qcwpAQCAtNzg4LDcgKzc4OCw3IEBAIFdJLlRpbWVsaW5l T3ZlcnZpZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV0kuVmlldwogCiAgICAg ICAgICAgICBpZiAoZmlyc3RSZWNvcmQgaW5zdGFuY2VvZiBXSS5DUFVUaW1lbGluZVJlY29yZCkg ewogICAgICAgICAgICAgICAgIGxldCBzZWxlY3Rpb25QYWRkaW5nID0gV0kuQ1BVVGltZWxpbmVP dmVydmlld0dyYXBoLnNhbXBsaW5nUmF0ZVBlclNlY29uZCAqIDIuMjU7Ci0gICAgICAgICAgICAg ICAgdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgPSBzdGFydFRpbWUgLSBzZWxlY3Rpb25QYWRkaW5n OworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lID0gc3RhcnRUaW1lIC0g c2VsZWN0aW9uUGFkZGluZyAtIChXSS5DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGguc2FtcGxpbmdS YXRlUGVyU2Vjb25kIC8gMik7CiAgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25EdXJhdGlv biA9IGVuZFRpbWUgLSBzdGFydFRpbWUgKyAoc2VsZWN0aW9uUGFkZGluZyAqIDIpOwogICAgICAg ICAgICAgfSBlbHNlIGlmIChzdGFydFRpbWUgPCB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSB8fCBl bmRUaW1lID4gdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLnNlbGVjdGlvbkR1cmF0aW9u KSB7CiAgICAgICAgICAgICAgICAgbGV0IHNlbGVjdGlvblBhZGRpbmcgPSB0aGlzLnNlY29uZHNQ ZXJQaXhlbCAqIDEwOwo=