79802 2012-02-28 08:50:47 -0800 Web Inspector: move DOM counter graphs out of experimental 2012-02-29 00:31:27 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein dglazkov joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 566736 0 yurys 2012-02-28 08:50:47 -0800 It is time to have the graphs enabled by default in Timeline "Memory" mode. 566742 1 129270 yurys 2012-02-28 08:54:25 -0800 Created attachment 129270 Patch 566851 2 129270 webkit.review.bot 2012-02-28 10:39:53 -0800 Comment on attachment 129270 Patch Attachment 129270 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11711008 New failing tests: inspector/timeline/timeline-parse-html.html inspector/timeline/timeline-paint.html inspector/timeline/timeline-script-tag-2.html inspector/timeline/timeline-event-dispatch.html inspector/timeline/timeline-script-tag-1.html inspector/timeline/timeline-time-stamp.html inspector/timeline/timeline-load-event.html inspector/timeline/timeline-layout.html inspector/timeline/timeline-recalculate-styles.html inspector/timeline/timeline-dom-content-loaded-event.html inspector/timeline/timeline-mark-timeline.html inspector/timeline/timeline-animation-frame.html inspector/timeline/timeline-injected-script-eval.html inspector/timeline/timeline-network-resource.html 567462 3 yurys 2012-02-29 00:31:27 -0800 Committed: http://trac.webkit.org/changeset/109204 129270 2012-02-28 08:54:25 -0800 2012-02-28 10:39:53 -0800 Patch bug-79802-20120228205423.patch text/plain 8408 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY0NTAyNWI0NjU3YjI4 NmU4NTM0NzkzNWVjM2FjNzNjNzIzZDNlOC4uODNiYjVkMDY5MTMyZGZjNjQ2YTAzZjcyM2FjM2Zh ZDA1Y2MzMWQ4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTAyLTI4ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1vdmUgRE9NIGNvdW50ZXIgZ3JhcGhzIG91dCBvZiBleHBlcmltZW50YWwKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5ODAyCisKKyAgICAgICAg RW5hYmxlIERPTSBjb3VudGVyIGdyYXBocyBieSBkZWZhdWx0LgorCisgICAgICAgIFJldmVhbCBu ZWFyZXN0IHJlY29yZCBmcm9tIHRoZSBsZWZ0IGhhbmQgc2lkZSB3aGVuIHRoZXJlIGlzIG5vCisg ICAgICAgIHJlY29yZCBjb250YWluaW5nIHRoZSBwb2ludCB3aGVyZSB0aGUgdXNlciBjbGlja2Vk LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHBl cmltZW50c1NldHRpbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l UGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX2VuZFNwbGl0dGVyRHJhZ2dp bmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9vblRp bWVsaW5lRXZlbnRSZWNvcmRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5l bC5wcm90b3R5cGUuc2lkZWJhclJlc2l6ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lUGFuZWwucHJvdG90eXBlLl9yZXNldFBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZVBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVQYW5lbC5wcm90b3R5cGUucmV2ZWFsUmVjb3JkQXQpOgorCisyMDEyLTAyLTI4ICBZ dXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHByZXNlcnZlIG1lbW9yeSBjb3VudGVycyBzaXplIGFmdGVyIGZyb250ZW5kIHJlb3Bl bmluZwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk3 OTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0 aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMK aW5kZXggNTI2M2NmNTYxODBjNDFhMmRjN2M2NmJjNzFhNzk1ZGU4MmJkYzFlMC4uOTY3YmZmOWNh MDVjMTNhN2EyNWVhNzEyMTNiYjQxODY1NTg3NjU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC0xNzUsNyArMTc1LDYgQEAgV2ViSW5z cGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgCiAgICAgLy8gQWRk IGN1cnJlbnRseSBydW5uaW5nIGV4cGVyaW1lbnRzIGhlcmUuCiAgICAgdGhpcy5zb3VyY2VGcmFt ZUFsd2F5c0VkaXRhYmxlID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic291cmNlRnJhbWVBbHdh eXNFZGl0YWJsZSIsICJNYWtlIHJlc291cmNlcyBhbHdheXMgZWRpdGFibGUiKTsKLSAgICB0aGlz LnNob3dNZW1vcnlDb3VudGVycyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNob3dNZW1vcnlD b3VudGVycyIsICJTaG93IG1lbW9yeSBjb3VudGVycyBpbiBUaW1lbGluZSBwYW5lbCIpOwogICAg IHRoaXMudGltZWxpbmVTdGFydEF0WmVybyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInRpbWVs aW5lU3RhcnRBdFplcm8iLCAiRW5hYmxlIHN0YXJ0IGF0IHplcm8gbW9kZSBpbiBUaW1lbGluZSBw YW5lbCIpOwogICAgIC8vIEZJWE1FOiBFbmFibGUgaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhl ZGRiL3Jlc291cmNlcy1wYW5lbC5odG1sIHdoZW4gcmVtb3ZlZCBmcm9tIGV4cGVyaW1lbnRzLgog ICAgIHRoaXMuc2hvd0luZGV4ZWREQiA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNob3dJbmRl eGVkREIiLCAiU2hvdyBJbmRleGVkREIgaW4gUmVzb3VyY2VzIHBhbmVsIik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXgg YzY4ZTJkZmNlMzczNmYyNTFlYTdkM2Y0MzFhMGFhMDkyNjZkN2ZhYS4uYWI1MTRiY2U1MDNhMDE4 YTczY2U4OTk2NzMwOTE1ZmNmZDE2MDY3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtNTYsMTUgKzU2LDEzIEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2NvbnRhaW5l ckVsZW1lbnQuaWQgPSAidGltZWxpbmUtY29udGFpbmVyIjsKICAgICB0aGlzLl9jb250YWluZXJF bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX29uU2Nyb2xsLmJpbmQodGhp cyksIGZhbHNlKTsKIAotICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5z aG93TWVtb3J5Q291bnRlcnMuaXNFbmFibGVkKCkpIHsKLSAgICAgICAgdGhpcy5fdGltZWxpbmVN ZW1vcnlTcGxpdHRlciA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2Iik7Ci0gICAgICAg IHRoaXMuX3RpbWVsaW5lTWVtb3J5U3BsaXR0ZXIuaWQgPSAidGltZWxpbmUtbWVtb3J5LXNwbGl0 dGVyIjsKLSAgICAgICAgdGhpcy5fdGltZWxpbmVNZW1vcnlTcGxpdHRlci5hZGRFdmVudExpc3Rl bmVyKCJtb3VzZWRvd24iLCB0aGlzLl9zdGFydFNwbGl0dGVyRHJhZ2dpbmcuYmluZCh0aGlzKSwg ZmFsc2UpOwotICAgICAgICB0aGlzLl90aW1lbGluZU1lbW9yeVNwbGl0dGVyLmFkZFN0eWxlQ2xh c3MoImhpZGRlbiIpOwotICAgICAgICB0aGlzLl9tZW1vcnlTdGF0aXN0aWNzID0gbmV3IFdlYklu c3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzKHRoaXMsIHRoaXMuc3BsaXRWaWV3LnByZWZlcnJlZFNp ZGViYXJXaWR0aCgpKTsKLSAgICAgICAgdGhpcy5fb3ZlcnZpZXdQYW5lLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLkV2ZW50cy5Nb2RlQ2hhbmdlZCwg dGhpcy5fdGltZWxpbmVzT3ZlcnZpZXdNb2RlQ2hhbmdlZCwgdGhpcyk7Ci0gICAgICAgIFdlYklu c3BlY3Rvci5zZXR0aW5ncy5tZW1vcnlDb3VudGVyR3JhcGhzSGVpZ2h0ID0gV2ViSW5zcGVjdG9y LnNldHRpbmdzLmNyZWF0ZVNldHRpbmcoIm1lbW9yeUNvdW50ZXJHcmFwaHNIZWlnaHQiLCAxNTAp OwotICAgIH0KKyAgICB0aGlzLl90aW1lbGluZU1lbW9yeVNwbGl0dGVyID0gdGhpcy5lbGVtZW50 LmNyZWF0ZUNoaWxkKCJkaXYiKTsKKyAgICB0aGlzLl90aW1lbGluZU1lbW9yeVNwbGl0dGVyLmlk ID0gInRpbWVsaW5lLW1lbW9yeS1zcGxpdHRlciI7CisgICAgdGhpcy5fdGltZWxpbmVNZW1vcnlT cGxpdHRlci5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9zdGFydFNwbGl0dGVy RHJhZ2dpbmcuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIHRoaXMuX3RpbWVsaW5lTWVtb3J5U3Bs aXR0ZXIuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgdGhpcy5fbWVtb3J5U3RhdGlzdGlj cyA9IG5ldyBXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcyh0aGlzLCB0aGlzLnNwbGl0Vmll dy5wcmVmZXJyZWRTaWRlYmFyV2lkdGgoKSk7CisgICAgdGhpcy5fb3ZlcnZpZXdQYW5lLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLkV2ZW50cy5Nb2Rl Q2hhbmdlZCwgdGhpcy5fdGltZWxpbmVzT3ZlcnZpZXdNb2RlQ2hhbmdlZCwgdGhpcyk7CisgICAg V2ViSW5zcGVjdG9yLnNldHRpbmdzLm1lbW9yeUNvdW50ZXJHcmFwaHNIZWlnaHQgPSBXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGluZygibWVtb3J5Q291bnRlckdyYXBoc0hlaWdodCIs IDE1MCk7CiAKICAgICB2YXIgaXRlbXNUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuU2lk ZWJhclNlY3Rpb25UcmVlRWxlbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJFQ09SRFMiKSwg e30sIHRydWUpOwogICAgIHRoaXMuc2lkZWJhclRyZWUuYXBwZW5kQ2hpbGQoaXRlbXNUcmVlRWxl bWVudCk7CkBAIC04MCw4ICs3OCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuX2l0ZW1zR3JhcGhzRWxlbWVudC5pZCA9ICJ0aW1lbGluZS1ncmFw aHMiOwogICAgIHRoaXMuX2l0ZW1zR3JhcGhzRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3Vz ZXdoZWVsIiwgdGhpcy5fb3ZlcnZpZXdQYW5lLnNjcm9sbFdpbmRvdy5iaW5kKHRoaXMuX292ZXJ2 aWV3UGFuZSksIHRydWUpOwogICAgIHRoaXMuX2NvbnRhaW5lckNvbnRlbnRFbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX3RpbWVsaW5lR3JpZC5lbGVtZW50KTsKLSAgICBpZiAodGhpcy5fbWVtb3J5 U3RhdGlzdGljcykKLSAgICAgICAgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy5zZXRNYWluVGltZWxp bmVHcmlkKHRoaXMuX3RpbWVsaW5lR3JpZCk7CisgICAgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy5z ZXRNYWluVGltZWxpbmVHcmlkKHRoaXMuX3RpbWVsaW5lR3JpZCk7CiAKICAgICB0aGlzLl90b3BH YXBFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5fdG9w R2FwRWxlbWVudC5jbGFzc05hbWUgPSAidGltZWxpbmUtZ2FwIjsKQEAgLTE2Miw4ICsxNTksNyBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAg ICBkZWxldGUgdGhpcy5fZHJhZ09mZnNldDsKICAgICAgICAgV2ViSW5zcGVjdG9yLmVsZW1lbnRE cmFnRW5kKGV2ZW50KTsKLSAgICAgICAgaWYgKHRoaXMuX21lbW9yeVN0YXRpc3RpY3MpCi0gICAg ICAgICAgICB0aGlzLl9tZW1vcnlTdGF0aXN0aWNzLnNob3coKTsKKyAgICAgICAgdGhpcy5fbWVt b3J5U3RhdGlzdGljcy5zaG93KCk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5tZW1v cnlDb3VudGVyR3JhcGhzSGVpZ2h0LnNldCh0aGlzLnNwbGl0Vmlldy5lbGVtZW50Lm9mZnNldEhl aWdodCk7CiAgICAgfSwKIApAQCAtMzc2LDggKzM3Miw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF90aW1lbGluZXNPdmVydmlld01vZGVDaGFuZ2Vk OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fbWVtb3J5U3RhdGlz dGljcykKLSAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdmFyIHNob3VsZFNob3dNZW1vcnkg PSBldmVudC5kYXRhID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuTW9kZS5N ZW1vcnk7CiAgICAgICAgIGlmIChzaG91bGRTaG93TWVtb3J5ID09PSB0aGlzLl9tZW1vcnlTdGF0 aXN0aWNzLnZpc2libGUoKSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTQ1Niw3ICs0NTAsNyBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu X2lubmVyQWRkUmVjb3JkVG9UaW1lbGluZShldmVudC5kYXRhLCB0aGlzLl9yb290UmVjb3JkKCkp OwogICAgICAgICB0aGlzLl9zY2hlZHVsZVJlZnJlc2goZmFsc2UpOwogCi0gICAgICAgIGlmICh0 aGlzLl9tZW1vcnlTdGF0aXN0aWNzICYmIGV2ZW50LmRhdGFbImNvdW50ZXJzIl0pCisgICAgICAg IGlmIChldmVudC5kYXRhWyJjb3VudGVycyJdKQogICAgICAgICAgICAgdGhpcy5fbWVtb3J5U3Rh dGlzdGljcy5hZGRUaW1saW5lRXZlbnQoZXZlbnQpOwogICAgIH0sCiAKQEAgLTQ3Nyw5ICs0NzEs NyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuX292ZXJ2aWV3UGFuZS5zaWRlYmFyUmVzaXplZCh3aWR0aCk7CiAgICAgICAgIC8vIE1pbiB3 aWR0aCA9IDxudW1iZXIgb2YgYnV0dG9ucyBvbiB0aGUgbGVmdD4gKiAzMQogICAgICAgICB0aGlz LnN0YXR1c0JhckZpbHRlcnMuc3R5bGUubGVmdCA9IE1hdGgubWF4KCh0aGlzLnN0YXR1c0Jhckl0 ZW1zLmxlbmd0aCArIDIpICogMzEsIHdpZHRoKSArICJweCI7Ci0KLSAgICAgICAgaWYgKHRoaXMu X21lbW9yeVN0YXRpc3RpY3MpCi0gICAgICAgICAgICB0aGlzLl9tZW1vcnlTdGF0aXN0aWNzLnNl dFNpZGViYXJXaWR0aCh3aWR0aCk7CisgICAgICAgIHRoaXMuX21lbW9yeVN0YXRpc3RpY3Muc2V0 U2lkZWJhcldpZHRoKHdpZHRoKTsKICAgICB9LAogCiAgICAgb25SZXNpemU6IGZ1bmN0aW9uKCkK QEAgLTUwOCw4ICs1MDAsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX2FkanVzdFNjcm9sbFBvc2l0aW9uKDApOwogICAgICAgICB0aGlz Ll9jbG9zZVJlY29yZERldGFpbHMoKTsKICAgICAgICAgdGhpcy5fYWxsUmVjb3Jkc0NvdW50ID0g MDsKLSAgICAgICAgaWYgKHRoaXMuX21lbW9yeVN0YXRpc3RpY3MpCi0gICAgICAgICAgICB0aGlz Ll9tZW1vcnlTdGF0aXN0aWNzLnJlc2V0KCk7CisgICAgICAgIHRoaXMuX21lbW9yeVN0YXRpc3Rp Y3MucmVzZXQoKTsKICAgICB9LAogCiAgICAgZWxlbWVudHNUb1Jlc3RvcmVTY3JvbGxQb3NpdGlv bnNGb3I6IGZ1bmN0aW9uKCkKQEAgLTU3MSw3ICs1NjIsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVJlY29yZHNDb3VudGVy KHJlY29yZHNJbldpbmRvd0NvdW50KTsKICAgICAgICAgaWYoIXRoaXMuX2JvdW5kYXJpZXNBcmVW YWxpZCkKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUV2ZW50RGl2aWRlcnMoKTsKLSAgICAgICAg aWYgKHRoaXMuX21lbW9yeVN0YXRpc3RpY3MgJiYgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy52aXNp YmxlKCkpCisgICAgICAgIGlmICh0aGlzLl9tZW1vcnlTdGF0aXN0aWNzLnZpc2libGUoKSkKICAg ICAgICAgICAgIHRoaXMuX21lbW9yeVN0YXRpc3RpY3MucmVmcmVzaCgpOwogICAgICAgICB0aGlz Ll9ib3VuZGFyaWVzQXJlVmFsaWQgPSB0cnVlOwogICAgIH0sCkBAIC01OTUsMTAgKzU4NiwxNCBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBy ZWNvcmRzSW5XaW5kb3cgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5maWx0ZXJlZFJlY29yZHMo KTsKICAgICAgICAgdmFyIHJlY29yZFRvUmV2ZWFsOwogICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IHJlY29yZHNJbldpbmRvdy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgaWYgKHJlY29y ZHNJbldpbmRvd1tpXS5jb250YWluc1RpbWUodGltZSkpIHsKLSAgICAgICAgICAgICAgICByZWNv cmRUb1JldmVhbCA9IHJlY29yZHNJbldpbmRvd1tpXTsKKyAgICAgICAgICAgIHZhciByZWNvcmQg PSByZWNvcmRzSW5XaW5kb3dbaV07CisgICAgICAgICAgICBpZiAocmVjb3JkLmNvbnRhaW5zVGlt ZSh0aW1lKSkgeworICAgICAgICAgICAgICAgIHJlY29yZFRvUmV2ZWFsID0gcmVjb3JkOwogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgLy8gSWYgdGhl cmUgaXMgbm8gcmVjb3JkIGNvbnRhaW5pbmcgdGhlIHRpbWUgdGhhbiB1c2UgdGhlIGxhdGVzdCBv bmUgYmVmb3JlIHRoYXQgdGltZS4KKyAgICAgICAgICAgIGlmICghcmVjb3JkVG9SZXZlYWwgfHwg cmVjb3JkLmVuZFRpbWUgPCB0aW1lICYmIHJlY29yZFRvUmV2ZWFsLmVuZFRpbWUgPCByZWNvcmQu ZW5kVGltZSkKKyAgICAgICAgICAgICAgICByZWNvcmRUb1JldmVhbCA9IHJlY29yZDsKICAgICAg ICAgfQogCiAgICAgICAgIC8vIFRoZSByZWNvcmQgZW5kcyBiZWZvcmUgdGhlIHdpbmRvdyBsZWZ0 IGJvdW5kIHNvIHNjcm9sbCB0byB0aGUgdG9wLgo=