132754 2014-05-09 15:51:11 -0700 Web Inspector: empty timeline should not use previous timeline's zoom interval 2015-05-15 20:49:01 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg mattbaker commit-queue graouts joepeck mattbaker simon.fraser timothy webkit-bug-importer oldest_to_newest 1008119 0 burg 2014-05-09 15:51:11 -0700 As is, I feel this is really really confusing. We could save timeline zoom intervals the same way we save other view state for back-forward navigations, but for unrelated page executions I don't see the use case. 1008120 1 webkit-bug-importer 2014-05-09 15:51:38 -0700 <rdar://problem/16872739> 1008126 2 timothy 2014-05-09 16:12:06 -0700 "unrelated page executions" is the key phase here. I find keeping the zoom level is useful for reload cases. Restoring a sane default for new / unrelated loads sounds fine. 1028013 3 burg 2014-08-08 17:03:04 -0700 This should be per-TimelineRecording, with a sane default. 1028014 4 236325 burg 2014-08-08 17:05:14 -0700 Created attachment 236325 Patch 1028072 5 236325 timothy 2014-08-09 20:59:55 -0700 Comment on attachment 236325 Patch I think we should attempt to keep the state when reloading at minimum. If you are trying to see somthing happen on load it is annoying to keep fiddling with the zoom and selection. Maybe we need a hybrid approach here? First timeline uses saved settings, subsequent timelines get a sane default at the beginning of time? Maybe secondsPerPixel can always persist? 1028075 6 burg 2014-08-09 22:00:58 -0700 If the recording is explicitly started via the button, then any subsequent reload navigations do not appear at the start of the recording. So I think you are suggesting that we reuse the same zoom setting for auto-capturing sessions on the same page as the previous auto-capturing session. 1028077 7 timothy 2014-08-09 23:29:24 -0700 Correct. Only the auto-recorded timeline. 1068087 8 236325 timothy 2015-02-10 09:46:00 -0800 Comment on attachment 236325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236325&action=review Lets fix this up and make reload reuse the previous settings. Otherwise I am on board with doing this. > Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js:71 > + this.selectionDuration = 5; 5 seconds seems short now. 10 or 15? 1094689 9 253082 mattbaker 2015-05-13 19:17:40 -0700 Created attachment 253082 [Patch] Proposed Fix 1094700 10 mattbaker 2015-05-13 19:52:58 -0700 Wrong patch, disregard. 1095003 11 253169 mattbaker 2015-05-14 19:56:11 -0700 Created attachment 253169 [Patch] Proposed Fix 1095363 12 253169 joepeck 2015-05-15 19:46:24 -0700 Comment on attachment 253169 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=253169&action=review r=me > Source/WebInspectorUI/ChangeLog:23 > + Increase default selection time to 15 seconds. I'm surprised by this, but I'll trust your judgement! 1095373 13 simon.fraser 2015-05-15 20:04:51 -0700 Yay! 1095389 14 253169 commit-queue 2015-05-15 20:48:55 -0700 Comment on attachment 253169 [Patch] Proposed Fix Clearing flags on attachment: 253169 Committed r184429: <http://trac.webkit.org/changeset/184429> 1095390 15 commit-queue 2015-05-15 20:49:01 -0700 All reviewed patches have been landed. Closing bug. 236325 2014-08-08 17:05:14 -0700 2015-05-13 19:17:35 -0700 Patch bug-132754-20140808170516.patch text/plain 3270 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl ZWE0MmNiMjM3MGM2Y2E4MWMyNzMyMGI2ZTQ5NWEzNjNkODE2ZDZkLi5iZTRlNmM1MDQ2NDk3YmVh ODNhNTc3ZjJiMTI4ZTcwNDlkMDlkOTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMCBAQAogMjAxNC0wOC0wOCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZW1wdHkgdGltZWxpbmUgc2hvdWxkIG5v dCB1c2UgcHJldmlvdXMgdGltZWxpbmUncyB6b29tIGludGVydmFsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI3NTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhlIHNhbWUgZGVmYXVsdCB6b29t IGFuZCB0aW1lIGludGVydmFsIGZvciBhbGwgbmV3IFRpbWVsaW5lQ29udGVudFZpZXdzLgorICAg ICAgICBSZW1vdmUgV2ViSW5zcGVjdG9yLlNldHRpbmcgaW5zdGFuY2VzLCBhcyBlYWNoIGNvbnRl bnQgdmlldyBoYXMgaXRzIG93biBzdGF0ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVPdmVydmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92 ZXJ2aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlw ZS5zZXQgc2Vjb25kc1BlclBpeGVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92 ZXJ2aWV3LnByb3RvdHlwZS5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCk6CisKKzIwMTQtMDgt MDggIEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgorCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IGFkZCBkZWJ1Z2dpbmcgZmxhZyB0byBJbnNwZWN0b3JUZXN0IGZvciB1bmJ1 ZmZlcmVkIGxvZ2dpbmcgdG8gc3RkZXJyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzU3MjYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKaW5kZXgg YzJmNTYzYmFmNWNlNDJkYjAyZWE2NDQwZDVlNzNmYTE0NmE5NmJmOC4uZDkwOTc3YTljZTY2ZTJk YWRlYWUyOTZiODJlYTQyNDA4OWRjNGE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCkBA IC02MCwxOSArNjAsMTUgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcgPSBmdW5jdGlv bih0aW1lbGluZU92ZXJ2aWV3R3JhcGhzTWFwKQogICAgIHRoaXMuX3Njcm9sbFdpZHRoU2l6ZXIu Y2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuU2Nyb2xsV2lkdGhTaXpl clN0eWxlQ2xhc3NOYW1lOwogICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lci5hcHBlbmRDaGlsZCh0 aGlzLl9zY3JvbGxXaWR0aFNpemVyKTsKIAotICAgIHRoaXMuX3NlY29uZHNQZXJQaXhlbFNldHRp bmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInRpbWVsaW5lLW92ZXJ2aWV3LXNlY29uZHMt cGVyLXBpeGVsIiwgMC4wMSk7Ci0gICAgdGhpcy5fc2VsZWN0aW9uU3RhcnRUaW1lU2V0dGluZyA9 IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygidGltZWxpbmUtb3ZlcnZpZXctc2VsZWN0aW9uLXN0 YXJ0LXRpbWUiLCAwKTsKLSAgICB0aGlzLl9zZWxlY3Rpb25EdXJhdGlvblNldHRpbmcgPSBuZXcg V2ViSW5zcGVjdG9yLlNldHRpbmcoInRpbWVsaW5lLW92ZXJ2aWV3LXNlbGVjdGlvbi1kdXJhdGlv biIsIDUpOwotCiAgICAgdGhpcy5fc3RhcnRUaW1lID0gMDsKICAgICB0aGlzLl9jdXJyZW50VGlt ZSA9IDA7CiAgICAgdGhpcy5fZW5kVGltZSA9IDA7Ci0gICAgdGhpcy5fc2Vjb25kc1BlclBpeGVs ID0gdGhpcy5fc2Vjb25kc1BlclBpeGVsU2V0dGluZy52YWx1ZTsKKyAgICB0aGlzLl9zZWNvbmRz UGVyUGl4ZWwgPSAwLjAxOwogICAgIHRoaXMuX3Njcm9sbFN0YXJ0VGltZSA9IDA7CiAgICAgdGhp cy5fY2FjaGVkU2Nyb2xsQ29udGFpbmVyV2lkdGggPSBOYU47CiAKLSAgICB0aGlzLnNlbGVjdGlv blN0YXJ0VGltZSA9IHRoaXMuX3NlbGVjdGlvblN0YXJ0VGltZVNldHRpbmcudmFsdWU7Ci0gICAg dGhpcy5zZWxlY3Rpb25EdXJhdGlvbiA9IHRoaXMuX3NlbGVjdGlvbkR1cmF0aW9uU2V0dGluZy52 YWx1ZTsKKyAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9IDA7CisgICAgdGhpcy5zZWxlY3Rp b25EdXJhdGlvbiA9IDU7CiB9OwogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5TdHls ZUNsYXNzTmFtZSA9ICJ0aW1lbGluZS1vdmVydmlldyI7CkBAIC0xNDEsNyArMTM3LDYgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIHRoaXMuX3NlY29uZHNQZXJQaXhlbCA9IHg7Ci0gICAgICAgIHRoaXMu X3NlY29uZHNQZXJQaXhlbFNldHRpbmcudmFsdWUgPSB4OwogCiAgICAgICAgIHRoaXMuX25lZWRz TGF5b3V0KCk7CiAgICAgfSwKQEAgLTM1NCw5ICszNDksNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdl ZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9zZWxlY3Rpb25TdGFydFRp bWVTZXR0aW5nLnZhbHVlID0gdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgLSB0aGlzLl9zdGFydFRp bWU7Ci0gICAgICAgIHRoaXMuX3NlbGVjdGlvbkR1cmF0aW9uU2V0dGluZy52YWx1ZSA9IHRoaXMu c2VsZWN0aW9uRHVyYXRpb247Ci0KICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuRXZlbnQuVGltZVJhbmdlU2VsZWN0aW9u Q2hhbmdlZCk7CiAgICAgfQogfTsK 253082 2015-05-13 19:17:40 -0700 2015-05-13 19:58:25 -0700 [Patch] Proposed Fix bug-132754-20150513191617.patch text/plain 4091 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz OTc5YjY5ZDRjOTdlN2Y1NjhkNTMxYTNkN2RhNTM0MGVmNzBlOGEzLi4yNzJiZmRiMzAzNzA5ZTNm ODU1MmFlMTcyYjdlZGQ5ZTkxZWJjNDg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxNS0wNS0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZW1wdHkgdGltZWxpbmUgc2hvdWxkIG5vdCB1c2Ug cHJldmlvdXMgdGltZWxpbmUncyB6b29tIGludGVydmFsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI3NTQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCBhbmQgZW5kIHRpbWUgdmFsdWVz IGZvciB0aGUgcmVuZGVyaW5nIGZyYW1lIHRpbWVsaW5lIG92ZXJ2aWV3IHNob3VsZCBhbHdheXMg YmUgZXF1YWwgdG8gdGhlIGZyYW1lCisgICAgICAgIG51bWJlciBvZiB0aGUgbGFzdCByZWNvcmQg aW4gdGhlIHJlbmRlcmluZyBmcmFtZXMgdGltZWxpbmUuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5w cm90b3R5cGUudXBkYXRlTGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX3VwZGF0ZVRpbWVzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5f cmVjb3JkaW5nVGltZXNVcGRhdGVkKToKKwogMjAxNS0wNS0xMSAgQnJlbnQgRnVsZ2hhbSAgPGJm dWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBNb3ZlIFdpbmRvd3MgYnVpbGQgdGFy Z2V0IHRvIFdpbmRvd3MgNyAob3IgbmV3ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwppbmRl eCAxZDM1ZTExZDM1MjUxNzkzMWY3OTY4OWYyMmY0ZTliZjBjNjk2YjU4Li5hMTMzNjhlZjg2ZjM1 OWMwOTZhNmMxNzViYmM3ZmNlOWQ1YWIzZDhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMK QEAgLTY2LDYgKzY2LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcgPSBmdW5jdGlv bihpZGVudGlmaWVyLCB0aW1lbGluZVJlY29yZGluZywgbWluaW11bUQKIAogICAgIHRoaXMuX3N0 YXJ0VGltZSA9IDA7CiAgICAgdGhpcy5fY3VycmVudFRpbWUgPSAwOworICAgIHRoaXMuX3JldmVh bEN1cnJlbnRUaW1lID0gZmFsc2U7CiAgICAgdGhpcy5fZW5kVGltZSA9IDA7CiAgICAgdGhpcy5f bWluaW11bUR1cmF0aW9uUGVyUGl4ZWwgPSBtaW5pbXVtRHVyYXRpb25QZXJQaXhlbDsKICAgICB0 aGlzLl9tYXhpbXVtRHVyYXRpb25QZXJQaXhlbCA9IG1heGltdW1EdXJhdGlvblBlclBpeGVsOwpA QCAtMjgwLDcgKzI4MSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlw ZSA9IHsKIAogICAgICAgICBpZiAodGhpcy5fcmV2ZWFsQ3VycmVudFRpbWUpIHsKICAgICAgICAg ICAgIHRoaXMucmV2ZWFsTWFya2VyKHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyKTsKLSAgICAgICAg ICAgIGRlbGV0ZSB0aGlzLl9yZXZlYWxDdXJyZW50VGltZTsKKyAgICAgICAgICAgIHRoaXMuX3Jl dmVhbEN1cnJlbnRUaW1lID0gZmFsc2U7CiAgICAgICAgIH0KIAogICAgICAgICBjb25zdCB2aXNp YmxlRHVyYXRpb24gPSB0aGlzLnZpc2libGVEdXJhdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDQ4MGMwNzZjNDFjNDhhNDhhZTI0YWNm ZTI1NTRjNjU5MzczYjY5MWQuLjg5MTBmZGU0NDlhYTc3ODJiNjZmYjc2NTkzYTgzNmVlZWQwMzJj NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwpA QCAtNDI5LDggKzQyOSwxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50 Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcu Y3VycmVudFRpbWUgPSBjdXJyZW50VGltZTsKIAogICAgICAgICBpZiAodGhpcy5fcmVuZGVyaW5n RnJhbWVUaW1lbGluZSAmJiB0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcucmVwcmVzZW50ZWRPYmpl Y3QudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJh bWUpIHsKLSAgICAgICAgICAgIHZhciBvbGRFbmRUaW1lID0gdGhpcy5fcmVuZGVyaW5nRnJhbWVU aW1lbGluZU92ZXJ2aWV3LmVuZFRpbWU7Ci0gICAgICAgICAgICB0aGlzLl9yZW5kZXJpbmdGcmFt ZVRpbWVsaW5lT3ZlcnZpZXcuZW5kVGltZSA9IHRoaXMuX3JlbmRlcmluZ0ZyYW1lVGltZWxpbmUu cmVjb3Jkcy5sZW5ndGg7CisgICAgICAgICAgICB2YXIgY3VycmVudEZyYW1lTnVtYmVyID0gMDsK KyAgICAgICAgICAgIGlmICh0aGlzLl9yZW5kZXJpbmdGcmFtZVRpbWVsaW5lLnJlY29yZHMubGVu Z3RoKQorICAgICAgICAgICAgICAgIGN1cnJlbnRGcmFtZU51bWJlciA9IHRoaXMuX3JlbmRlcmlu Z0ZyYW1lVGltZWxpbmUucmVjb3Jkcy5sYXN0VmFsdWUuZnJhbWVOdW1iZXI7CisKKyAgICAgICAg ICAgIHRoaXMuX3JlbmRlcmluZ0ZyYW1lVGltZWxpbmVPdmVydmlldy5jdXJyZW50VGltZSA9IHRo aXMuX3JlbmRlcmluZ0ZyYW1lVGltZWxpbmVPdmVydmlldy5lbmRUaW1lID0gY3VycmVudEZyYW1l TnVtYmVyOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fdGltZWxpbmVTaWRlYmFyUGFuZWwu dXBkYXRlRmlsdGVyKCk7CkBAIC01MTMsNiArNTE2LDEwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gV2UgbWlnaHQg d2FudCB0byBoYXZlIHRoZSBiYWNrZW5kIHNlbmQgYSAic3RhcnQiIHJlY29yZCB0byBnZXQgY3Vy cmVudCB0aW1lIG1vdmluZy4KIAogICAgICAgICBmb3IgKHZhciB0aW1lbGluZSBvZiB0aGlzLl9y ZWNvcmRpbmcudGltZWxpbmVzLnZhbHVlcygpKSB7CisgICAgICAgICAgICAvLyBUaGUgcmVuZGVy aW5nIGZyYW1lIHRpbWVsaW5lIGRvZXNuJ3QgdXNlIGEgdGltZSBheGlzLgorICAgICAgICAgICAg aWYgKHRpbWVsaW5lLnR5cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlJl bmRlcmluZ0ZyYW1lKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCiAgICAgICAgICAgICB2 YXIgbGFzdFJlY29yZCA9IHRpbWVsaW5lLnJlY29yZHMubGFzdFZhbHVlOwogICAgICAgICAgICAg aWYgKCFsYXN0UmVjb3JkKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwo= 253169 2015-05-14 19:56:11 -0700 2015-05-15 20:48:55 -0700 [Patch] Proposed Fix bug-132754-20150514195447.patch text/plain 8379 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw ZTBhNjFlY2JmN2VjMTc2MDE1Y2QxODlmM2RjNWM2NTZkNzg5ZTI2Li4zNDQyMGJkMGI0MDBmYWI0 NzQyZDdmZGNlOTM3YmEwY2FkYzQ3OTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxNS0wNS0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZW1wdHkgdGltZWxpbmUgc2hvdWxkIG5vdCB1c2Ug cHJldmlvdXMgdGltZWxpbmUncyB6b29tIGludGVydmFsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI3NTQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgdGltZWxpbmUgcmVjb3JkaW5nIGlzIHN0 YXJ0ZWQgaW4gcmVzcG9uc2UgdG8gYSBwcm92aXNpb25hbCBsb2FkLCBUaW1lbGluZU1hbmFnZXIg c2hvdWxkIGNoZWNrIHdoZXRoZXIKKyAgICAgICAgdGhlIG1haW4gcmVzb3VyY2UgdXJsIGlzIGNo YW5naW5nIGJlZm9yZSBsb2FkaW5nIGEgbmV3IHRpbWVsaW5lIHJlY29yZGluZy4gSWYgdGhlIG1h aW4gcmVzb3VyY2UgaXMgY2hhbmdpbmcsCisgICAgICAgIHNldCB0aGUgc2VsZWN0aW9uIHN0YXJ0 LCBzZWxlY3Rpb24gZHVyYXRpb24sIGFuZCBkdXJhdGlvbi1wZXItcGl4ZWwgc2V0dGluZ3Mgb2Yg dGhlIFRpbWVsaW5lT3ZlcnZpZXcgdG8gdGhlaXIKKyAgICAgICAgZGVmYXVsdCB2YWx1ZXMuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUuaXNDYXB0dXJpbmdQYWdlUmVsb2FkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLmNhcHR1cmlu Z1N0b3BwZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5 cGUucGFnZURpZExvYWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5w cm90b3R5cGUuX3N0YXJ0QXV0b0NhcHR1cmluZyk6CisgICAgICAgIEFkZGVkIGEgcHJvcGVydHkg Zm9yIGNoZWNraW5nIHdoZXRoZXIgYXV0byBjYXB0dXJlIHdhcyB0cmlnZ2VyZWQgYnkgYSBwYWdl IHJlbG9hZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGluZWFyVGltZWxpbmVP dmVydmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MaW5lYXJUaW1lbGluZU92ZXJ2aWV3 KToKKyAgICAgICAgSW5jcmVhc2UgZGVmYXVsdCBzZWxlY3Rpb24gdGltZSB0byAxNSBzZWNvbmRz LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcpOgorICAgICAgICBSZXNldCBz ZWxlY3Rpb24gYW5kIHpvb20gaWYgVGltZWxpbmVNYW5hZ2VyIGlzbid0IGNhcHR1cmluZyBpbiBy ZXNwb25zZSB0byBhIHBhZ2UgcmVsb2FkLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlldy5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICBSZXNldCBzZWxlY3Rpb24gYW5k IHpvb20uCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlw ZS5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX3Jlc2V0U2VsZWN0aW9uKToKKyAgICAgICAgQWRkZWQg YSBoZWxwZXIgZnVuY3Rpb24gZm9yIHJlc2V0dGluZyBzZWxlY3Rpb24gYW5kIHpvb20gdG8gdGhl aXIgZGVmYXVsdCB2YWx1ZXMuCisKIDIwMTUtMDUtMTQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBVcGRhdGUgdGhlIE5ldyBU YWIgYnV0dG9uIGRpc2FibGVkIHN0YXRlIGFmdGVyIGV4dHJhIGRvbWFpbnMgYXJlIGFjdGl2YXRl ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IGExYmNkOWVmZGM5NGM0 NmQwMjVmZmY4MjI5MmQ3N2E0ZjkxNDdjNDEuLjUzYThmODcxYzA3NTBlYzgzZjdmMzUzYjExZTQz NmI2YzRmZjQ5YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKQEAgLTM0 LDYgKzM0LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5l TWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgV2ViSW5zcGVjdG9y LkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50LlJlc291cmNl V2FzQWRkZWQsIHRoaXMuX3Jlc291cmNlV2FzQWRkZWQsIHRoaXMpOwogCiAgICAgICAgIHRoaXMu X2lzQ2FwdHVyaW5nID0gZmFsc2U7CisgICAgICAgIHRoaXMuX2lzQ2FwdHVyaW5nUGFnZVJlbG9h ZCA9IGZhbHNlOworICAgICAgICB0aGlzLl9hdXRvQ2FwdHVyaW5nTWFpblJlc291cmNlID0gbnVs bDsKICAgICAgICAgdGhpcy5fYm91bmRTdG9wQ2FwdHVyaW5nID0gdGhpcy5zdG9wQ2FwdHVyaW5n LmJpbmQodGhpcyk7CiAKICAgICAgICAgdGhpcy5yZXNldCgpOwpAQCAtNzAsNiArNzIsMTEgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5lTWFuYWdlciBleHRl bmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgcmV0dXJuIHRoaXMuX2lzQ2FwdHVyaW5n OwogICAgIH0KIAorICAgIGlzQ2FwdHVyaW5nUGFnZVJlbG9hZCgpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5faXNDYXB0dXJpbmdQYWdlUmVsb2FkOworICAgIH0KKwogICAgIHN0YXJ0Q2Fw dHVyaW5nKHNob3VsZENyZWF0ZVJlY29yZGluZykKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KCF0aGlzLl9pc0NhcHR1cmluZywgIlRpbWVsaW5lTWFuYWdlciBpcyBhbHJlYWR5IGNhcHR1 cmluZy4iKTsKQEAgLTE0Niw2ICsxNTMsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2Vy ID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAg ICAgICB9CiAKICAgICAgICAgdGhpcy5faXNDYXB0dXJpbmcgPSBmYWxzZTsKKyAgICAgICAgdGhp cy5faXNDYXB0dXJpbmdQYWdlUmVsb2FkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2F1dG9DYXB0 dXJpbmdNYWluUmVzb3VyY2UgPSBudWxsOwogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIuRXZlbnQuQ2FwdHVyaW5nU3Rv cHBlZCk7CkBAIC0xNjQsOCArMTcyLDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIg PSBjbGFzcyBUaW1lbGluZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAg ICAgIH0uYmluZCh0aGlzKSk7CiAgICAgfQogCisgICAgLy8gUHJvdGVjdGVkCisKICAgICBwYWdl RGlkTG9hZCh0aW1lc3RhbXApCiAgICAgeworICAgICAgICAvLyBDYWxsZWQgZnJvbSBXZWJJbnNw ZWN0b3IuUGFnZU9ic2VydmVyLgorCiAgICAgICAgIGlmIChpc05hTihXZWJJbnNwZWN0b3IuZnJh bWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLmxvYWRFdmVudFRpbWVzdGFtcCkpCiAgICAgICAg ICAgICBXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLm1hcmtMb2Fk RXZlbnQodGhpcy5hY3RpdmVSZWNvcmRpbmcuY29tcHV0ZUVsYXBzZWRUaW1lKHRpbWVzdGFtcCkp OwogICAgIH0KQEAgLTQ3Miw2ICs0ODQsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2Vy ID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAg ICAgICBpZiAobWFpblJlc291cmNlID09PSB0aGlzLl9hdXRvQ2FwdHVyaW5nTWFpblJlc291cmNl KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgICAgIHZhciBvbGRNYWluUmVzb3Vy Y2UgPSBldmVudC50YXJnZXQubWFpblJlc291cmNlIHx8IG51bGw7CisgICAgICAgIHRoaXMuX2lz Q2FwdHVyaW5nUGFnZVJlbG9hZCA9IG9sZE1haW5SZXNvdXJjZSAhPT0gbnVsbCAmJiBvbGRNYWlu UmVzb3VyY2UudXJsID09PSBtYWluUmVzb3VyY2UudXJsOworCiAgICAgICAgIGlmICh0aGlzLl9p c0NhcHR1cmluZykKICAgICAgICAgICAgIHRoaXMuc3RvcENhcHR1cmluZygpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MaW5lYXJUaW1l bGluZU92ZXJ2aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTGluZWFyVGltZWxpbmVPdmVydmlldy5qcwppbmRleCAzMDA4N2Y5MzY5Yjg4MDJhZGZmZmIz OGFlYTZhZjYwNjA1NmRlODQ0Li4zMDNjMWU2ZmNhMDJkNGRkYzZmZmUwYWZlZDcyMWVmODhkMmFl YmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9MaW5lYXJUaW1lbGluZU92ZXJ2aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0xpbmVhclRpbWVsaW5lT3ZlcnZpZXcuanMKQEAgLTMwLDcgKzMw LDcgQEAgV2ViSW5zcGVjdG9yLkxpbmVhclRpbWVsaW5lT3ZlcnZpZXcgPSBmdW5jdGlvbih0aW1l bGluZVJlY29yZGluZykKICAgICB2YXIgZGVmYXVsdFNldHRpbmdzVmFsdWVzID0gewogICAgICAg ICBkdXJhdGlvblBlclBpeGVsOiAwLjAxLAogICAgICAgICBzZWxlY3Rpb25TdGFydFZhbHVlOiAw LAotICAgICAgICBzZWxlY3Rpb25EdXJhdGlvbjogNQorICAgICAgICBzZWxlY3Rpb25EdXJhdGlv bjogMTUKICAgICB9OwogCiAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuY2FsbCh0 aGlzLCAibGluZWFyIiwgdGltZWxpbmVSZWNvcmRpbmcsIDAuMDAwMSwgNjAsIGRlZmF1bHRTZXR0 aW5nc1ZhbHVlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwppbmRleCBhMTMzNjhlZjg2ZjM1 OWMwOTZhNmMxNzViYmM3ZmNlOWQ1YWIzZDhkLi5lYTY2Yjk4ZTBjYWNmNzc1ZDM2NDk0NzdiNmIy YjViMWY5MjQ0Njk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKQEAgLTYwLDkgKzYwLDEw IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gZnVuY3Rpb24oaWRlbnRpZmllciwg dGltZWxpbmVSZWNvcmRpbmcsIG1pbmltdW1ECiAgICAgdGhpcy5fc2Nyb2xsV2lkdGhTaXplci5j bGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5TY3JvbGxXaWR0aFNpemVy U3R5bGVDbGFzc05hbWU7CiAgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyRWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLl9zY3JvbGxXaWR0aFNpemVyKTsKIAotICAgIHRoaXMuX2R1cmF0aW9uUGVyUGl4 ZWxTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLXRpbWVs aW5lLW92ZXJ2aWV3LWR1cmF0aW9uLXBlci1waXhlbCIsIGRlZmF1bHRTZXR0aW5nc1ZhbHVlcy5k dXJhdGlvblBlclBpeGVsKTsKLSAgICB0aGlzLl9zZWxlY3Rpb25TdGFydFZhbHVlU2V0dGluZyA9 IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZyhpZGVudGlmaWVyICsgIi10aW1lbGluZS1vdmVydmll dy1zZWxlY3Rpb24tc3RhcnQtdmFsdWUiLCBkZWZhdWx0U2V0dGluZ3NWYWx1ZXMuc2VsZWN0aW9u U3RhcnRWYWx1ZSk7Ci0gICAgdGhpcy5fc2VsZWN0aW9uRHVyYXRpb25TZXR0aW5nID0gbmV3IFdl Ykluc3BlY3Rvci5TZXR0aW5nKGlkZW50aWZpZXIgKyAiLXRpbWVsaW5lLW92ZXJ2aWV3LXNlbGVj dGlvbi1kdXJhdGlvbiIsIGRlZmF1bHRTZXR0aW5nc1ZhbHVlcy5zZWxlY3Rpb25EdXJhdGlvbik7 CisgICAgdGhpcy5fZGVmYXVsdFNldHRpbmdzVmFsdWVzID0gZGVmYXVsdFNldHRpbmdzVmFsdWVz OworICAgIHRoaXMuX2R1cmF0aW9uUGVyUGl4ZWxTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5T ZXR0aW5nKGlkZW50aWZpZXIgKyAiLXRpbWVsaW5lLW92ZXJ2aWV3LWR1cmF0aW9uLXBlci1waXhl bCIsIHRoaXMuX2RlZmF1bHRTZXR0aW5nc1ZhbHVlcy5kdXJhdGlvblBlclBpeGVsKTsKKyAgICB0 aGlzLl9zZWxlY3Rpb25TdGFydFZhbHVlU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGlu ZyhpZGVudGlmaWVyICsgIi10aW1lbGluZS1vdmVydmlldy1zZWxlY3Rpb24tc3RhcnQtdmFsdWUi LCB0aGlzLl9kZWZhdWx0U2V0dGluZ3NWYWx1ZXMuc2VsZWN0aW9uU3RhcnRWYWx1ZSk7CisgICAg dGhpcy5fc2VsZWN0aW9uRHVyYXRpb25TZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5n KGlkZW50aWZpZXIgKyAiLXRpbWVsaW5lLW92ZXJ2aWV3LXNlbGVjdGlvbi1kdXJhdGlvbiIsIHRo aXMuX2RlZmF1bHRTZXR0aW5nc1ZhbHVlcy5zZWxlY3Rpb25EdXJhdGlvbik7CiAKICAgICB0aGlz Ll9zdGFydFRpbWUgPSAwOwogICAgIHRoaXMuX2N1cnJlbnRUaW1lID0gMDsKQEAgLTc5LDYgKzgw LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcgPSBmdW5jdGlvbihpZGVudGlmaWVy LCB0aW1lbGluZVJlY29yZGluZywgbWluaW11bUQKIAogICAgIGZvciAodmFyIHRpbWVsaW5lIG9m IHRoaXMuX3JlY29yZGluZy50aW1lbGluZXMudmFsdWVzKCkpCiAgICAgICAgIHRoaXMuX3RpbWVs aW5lQWRkZWQodGltZWxpbmUpOworCisgICAgaWYgKCFXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5h Z2VyLmlzQ2FwdHVyaW5nUGFnZVJlbG9hZCgpKQorICAgICAgICB0aGlzLl9yZXNldFNlbGVjdGlv bigpOwogfTsKIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuU3R5bGVDbGFzc05hbWUg PSAidGltZWxpbmUtb3ZlcnZpZXciOwpAQCAtMjQ1LDYgKzI0OSw4IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGZvciAodmFyIHRp bWVsaW5lT3ZlcnZpZXdHcmFwaCBvZiB0aGlzLl90aW1lbGluZU92ZXJ2aWV3R3JhcGhzTWFwLnZh bHVlcygpKQogICAgICAgICAgICAgdGltZWxpbmVPdmVydmlld0dyYXBoLnJlc2V0KCk7CisKKyAg ICAgICAgdGhpcy5fcmVzZXRTZWxlY3Rpb24oKTsKICAgICB9LAogCiAgICAgYWRkTWFya2VyOiBm dW5jdGlvbihtYXJrZXIpCkBAIC00NDIsNSArNDQ4LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fc2VsZWN0aW9uRHVyYXRpb25T ZXR0aW5nLnZhbHVlID0gdGhpcy5zZWxlY3Rpb25EdXJhdGlvbjsKIAogICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5FdmVu dC5UaW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2VkKTsKLSAgICB9CisgICAgfSwKKworICAgIF9yZXNl dFNlbGVjdGlvbjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5zZWNvbmRzUGVyUGl4 ZWwgPSB0aGlzLl9kZWZhdWx0U2V0dGluZ3NWYWx1ZXMuZHVyYXRpb25QZXJQaXhlbDsKKyAgICAg ICAgdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgPSB0aGlzLl9kZWZhdWx0U2V0dGluZ3NWYWx1ZXMu c2VsZWN0aW9uU3RhcnRWYWx1ZTsKKyAgICAgICAgdGhpcy5zZWxlY3Rpb25EdXJhdGlvbiA9IHRo aXMuX2RlZmF1bHRTZXR0aW5nc1ZhbHVlcy5zZWxlY3Rpb25EdXJhdGlvbjsKKyAgICB9LAogfTsK