70499 2011-10-20 07:29:13 -0700 Web Inspector: minor CPU profiling UX improvements 2011-10-20 07:50:58 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 487551 0 pfeldman 2011-10-20 07:29:13 -0700 - Store profile type - Store time percentage toggle state 487553 1 111768 pfeldman 2011-10-20 07:31:23 -0700 Created attachment 111768 Patch 487560 2 111768 yurys 2011-10-20 07:47:12 -0700 Comment on attachment 111768 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111768&action=review > Source/WebCore/inspector/front-end/ProfileView.js:37 > + this.view = WebInspector.settings.createSetting("cpuProfilerView", WebInspector.CPUProfileView._TypeHeavy); Maybe private? 487563 3 pfeldman 2011-10-20 07:50:58 -0700 Committed r97977: <http://trac.webkit.org/changeset/97977> 111768 2011-10-20 07:31:23 -0700 2011-10-20 07:47:12 -0700 Patch bug-70499-20111020183121.patch text/plain 8900 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTc5NzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMjM0OGE1N2FmODhhMDk0 NGUzNDM4ODIyZDNjYzZhZmQ2MTgxM2I3Li42MzIxZDI4YTRiMDZiZDM5OWEzYzZjYjA1MTZkNjYz MjRmN2EwMGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTAtMjAgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IG1pbm9yIENQVSBwcm9maWxpbmcgVVggaW1wcm92ZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDQ5OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIHByb2ZpbGUgdHlwZS4gU3RvcmUgdGlt ZSBwZXJjZW50YWdlIHRvZ2dsZSBzdGF0ZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Byb2ZpbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3LnBy b2ZpbGVDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcucHJv dG90eXBlLl9jaGFuZ2VWaWV3LnNldCBlbHNlKToKKwogMjAxMS0xMC0yMCAgVnNldm9sb2QgVmxh c292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZHZh bmNlZCBzZWFyY2ggcmVzdWx0cyBzaG91bGQga2VlcCB3b3JraW5nIGFmdGVyIHByZXR0eSBwcmlu dCB0b2dnbGVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzCmluZGV4IGNmNDBiYzI2ZTc5MDkzMDUzZmQ3OTJi MzczNzUyOGIzNDlhZmI0ZjAuLjJlOGE1YTg4NGZmMTM3NWFhMWM1ZmQyYTE1YmQwNzE5NWNmODdl MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmls ZURhdGFHcmlkVHJlZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Byb2ZpbGVEYXRhR3JpZFRyZWUuanMKQEAgLTU4LDE3ICs1OCwxNyBAQCBXZWJJbnNwZWN0b3Iu UHJvZmlsZURhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGRhdGFbImZ1bmN0aW9u Il0gPSB0aGlzLmZ1bmN0aW9uTmFtZTsKICAgICAgICAgZGF0YVsiY2FsbHMiXSA9IHRoaXMubnVt YmVyT2ZDYWxsczsKIAotICAgICAgICBpZiAodGhpcy5wcm9maWxlVmlldy5zaG93U2VsZlRpbWVB c1BlcmNlbnQpCisgICAgICAgIGlmICh0aGlzLnByb2ZpbGVWaWV3LnNob3dTZWxmVGltZUFzUGVy Y2VudC5nZXQoKSkKICAgICAgICAgICAgIGRhdGFbInNlbGYiXSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiJS4yZiUlIiwgdGhpcy5zZWxmUGVyY2VudCk7CiAgICAgICAgIGVsc2UKICAgICAgICAg ICAgIGRhdGFbInNlbGYiXSA9IGZvcm1hdE1pbGxpc2Vjb25kcyh0aGlzLnNlbGZUaW1lKTsKIAot ICAgICAgICBpZiAodGhpcy5wcm9maWxlVmlldy5zaG93VG90YWxUaW1lQXNQZXJjZW50KQorICAg ICAgICBpZiAodGhpcy5wcm9maWxlVmlldy5zaG93VG90YWxUaW1lQXNQZXJjZW50LmdldCgpKQog ICAgICAgICAgICAgZGF0YVsidG90YWwiXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiUl IiwgdGhpcy50b3RhbFBlcmNlbnQpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBkYXRhWyJ0 b3RhbCJdID0gZm9ybWF0TWlsbGlzZWNvbmRzKHRoaXMudG90YWxUaW1lKTsKIAotICAgICAgICBp ZiAodGhpcy5wcm9maWxlVmlldy5zaG93QXZlcmFnZVRpbWVBc1BlcmNlbnQpCisgICAgICAgIGlm ICh0aGlzLnByb2ZpbGVWaWV3LnNob3dBdmVyYWdlVGltZUFzUGVyY2VudC5nZXQoKSkKICAgICAg ICAgICAgIGRhdGFbImF2ZXJhZ2UiXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiUlIiwg dGhpcy5hdmVyYWdlUGVyY2VudCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGRhdGFbImF2 ZXJhZ2UiXSA9IGZvcm1hdE1pbGxpc2Vjb25kcyh0aGlzLmF2ZXJhZ2VUaW1lKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCmluZGV4IDA4 NmVmYTRlY2FkNTI1MjAwOTg1NmFiMGE2MDBiODliYzQxYjFlMmQuLjAwMGEwZjJkZThkNjdjOTQ3 MWY5YTZmNmUzYTk2MjYxMDc2ODgzOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwpAQCAtMzAsMTAgKzMwLDExIEBAIFdlYkluc3Bl Y3Rvci5DUFVQcm9maWxlVmlldyA9IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgV2ViSW5zcGVjdG9y LlZpZXcuY2FsbCh0aGlzKTsKIAogICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJwcm9m aWxlLXZpZXciKTsKLQotICAgIHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJjZW50ID0gdHJ1ZTsKLSAg ICB0aGlzLnNob3dUb3RhbFRpbWVBc1BlcmNlbnQgPSB0cnVlOwotICAgIHRoaXMuc2hvd0F2ZXJh Z2VUaW1lQXNQZXJjZW50ID0gdHJ1ZTsKKyAgICAKKyAgICB0aGlzLnNob3dTZWxmVGltZUFzUGVy Y2VudCA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKCJjcHVQcm9maWxlclNo b3dTZWxmVGltZUFzUGVyY2VudCIsIHRydWUpOworICAgIHRoaXMuc2hvd1RvdGFsVGltZUFzUGVy Y2VudCA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKCJjcHVQcm9maWxlclNo b3dUb3RhbFRpbWVBc1BlcmNlbnQiLCB0cnVlKTsKKyAgICB0aGlzLnNob3dBdmVyYWdlVGltZUFz UGVyY2VudCA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKCJjcHVQcm9maWxl clNob3dBdmVyYWdlVGltZUFzUGVyY2VudCIsIHRydWUpOworICAgIHRoaXMudmlldyA9IFdlYklu c3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKCJjcHVQcm9maWxlclZpZXciLCBXZWJJbnNw ZWN0b3IuQ1BVUHJvZmlsZVZpZXcuX1R5cGVIZWF2eSk7CiAKICAgICB2YXIgY29sdW1ucyA9IHsg InNlbGYiOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGYiKSwgd2lkdGg6ICI3 MnB4Iiwgc29ydDogImRlc2NlbmRpbmciLCBzb3J0YWJsZTogdHJ1ZSB9LAogICAgICAgICAgICAg ICAgICAgICAidG90YWwiOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRvdGFsIiks IHdpZHRoOiAiNzJweCIsIHNvcnRhYmxlOiB0cnVlIH0sCkBAIC01NCw3ICs1NSw2IEBAIFdlYklu c3BlY3Rvci5DUFVQcm9maWxlVmlldyA9IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgdGhpcy52aWV3 U2VsZWN0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNlbGVjdCIpOwogICAgIHRo aXMudmlld1NlbGVjdEVsZW1lbnQuY2xhc3NOYW1lID0gInN0YXR1cy1iYXItaXRlbSI7CiAgICAg dGhpcy52aWV3U2VsZWN0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCB0aGlzLl9j aGFuZ2VWaWV3LmJpbmQodGhpcyksIGZhbHNlKTsKLSAgICB0aGlzLnZpZXcgPSAiSGVhdnkiOwog CiAgICAgdmFyIGhlYXZ5Vmlld09wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlv biIpOwogICAgIGhlYXZ5Vmlld09wdGlvbi5sYWJlbCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi SGVhdnkgKEJvdHRvbSBVcCkiKTsKQEAgLTYyLDYgKzYyLDcgQEAgV2ViSW5zcGVjdG9yLkNQVVBy b2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICB0cmVlVmlld09wdGlvbi5sYWJlbCA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVHJlZSAoVG9wIERvd24pIik7CiAgICAgdGhpcy52aWV3 U2VsZWN0RWxlbWVudC5hcHBlbmRDaGlsZChoZWF2eVZpZXdPcHRpb24pOwogICAgIHRoaXMudmll d1NlbGVjdEVsZW1lbnQuYXBwZW5kQ2hpbGQodHJlZVZpZXdPcHRpb24pOworICAgIHRoaXMudmll d1NlbGVjdEVsZW1lbnQuc2VsZWN0ZWRJbmRleCA9IHRoaXMudmlldy5nZXQoKSA9PT0gV2ViSW5z cGVjdG9yLkNQVVByb2ZpbGVWaWV3Ll9UeXBlSGVhdnkgPyAwIDogMTsKIAogICAgIHRoaXMucGVy Y2VudEJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAicGVyY2Vu dC10aW1lLXN0YXR1cy1iYXItaXRlbSIpOwogICAgIHRoaXMucGVyY2VudEJ1dHRvbi5hZGRFdmVu dExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3BlcmNlbnRDbGlja2VkLmJpbmQodGhpcyksIGZhbHNl KTsKQEAgLTgwLDI3ICs4MSwyNCBAQCBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcgPSBmdW5j dGlvbihwcm9maWxlKQogCiAgICAgdGhpcy5wcm9maWxlID0gcHJvZmlsZTsKIAotICAgIHZhciBz ZWxmID0gdGhpczsKICAgICBmdW5jdGlvbiBwcm9maWxlQ2FsbGJhY2soZXJyb3IsIHByb2ZpbGUp CiAgICAgewogICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IHNlbGYucHJvZmlsZS5oZWFkID0gcHJvZmlsZS5oZWFkOwotICAgICAgICBzZWxmLl9hc3NpZ25Q YXJlbnRzSW5Qcm9maWxlKCk7Ci0KLSAgICAgICAgc2VsZi5wcm9maWxlRGF0YUdyaWRUcmVlID0g c2VsZi5ib3R0b21VcFByb2ZpbGVEYXRhR3JpZFRyZWU7Ci0gICAgICAgIHNlbGYucHJvZmlsZURh dGFHcmlkVHJlZS5zb3J0KFdlYkluc3BlY3Rvci5Qcm9maWxlRGF0YUdyaWRUcmVlLnByb3BlcnR5 Q29tcGFyYXRvcigic2VsZlRpbWUiLCBmYWxzZSkpOwotCi0gICAgICAgIHNlbGYucmVmcmVzaCgp OwotCi0gICAgICAgIHNlbGYuX3VwZGF0ZVBlcmNlbnRCdXR0b24oKTsKKyAgICAgICAgdGhpcy5w cm9maWxlLmhlYWQgPSBwcm9maWxlLmhlYWQ7CisgICAgICAgIHRoaXMuX2Fzc2lnblBhcmVudHNJ blByb2ZpbGUoKTsKKyAgICAgICAgdGhpcy5fY2hhbmdlVmlldygpOworICAgICAgICB0aGlzLl91 cGRhdGVQZXJjZW50QnV0dG9uKCk7CiAgICAgfQogCi0gICAgdGhpcy5fbGlua2lmaWVyID0gV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuY3JlYXRlTGlua2lmaWVyKCk7Cisg ICAgdGhpcy5fbGlua2lmaWVyID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwuY3JlYXRlTGlua2lmaWVyKG5ldyBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5EZWZhdWx0TGlua2lmaWVyRm9ybWF0dGVyKDMwKSk7CiAKLSAgICBQcm9maWxlckFnZW50 LmdldFByb2ZpbGUodGhpcy5wcm9maWxlLnR5cGVJZCwgdGhpcy5wcm9maWxlLnVpZCwgcHJvZmls ZUNhbGxiYWNrKTsKKyAgICBQcm9maWxlckFnZW50LmdldFByb2ZpbGUodGhpcy5wcm9maWxlLnR5 cGVJZCwgdGhpcy5wcm9maWxlLnVpZCwgcHJvZmlsZUNhbGxiYWNrLmJpbmQodGhpcykpOwogfQog CitXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcuX1R5cGVUcmVlID0gIlRyZWUiOworV2ViSW5z cGVjdG9yLkNQVVByb2ZpbGVWaWV3Ll9UeXBlSGVhdnkgPSAiSGVhdnkiOworCiBXZWJJbnNwZWN0 b3IuQ1BVUHJvZmlsZVZpZXcucHJvdG90eXBlID0gewogICAgIGdldCBzdGF0dXNCYXJJdGVtcygp CiAgICAgewpAQCAtNDEyLDE5ICs0MTAsMTkgQEAgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgcHJvZmlsZU5vZGUucmV2ZWFsQW5kU2VsZWN0KCk7CiAg ICAgfSwKIAotICAgIF9jaGFuZ2VWaWV3OiBmdW5jdGlvbihldmVudCkKKyAgICBfY2hhbmdlVmll dzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKCFldmVudCB8fCAhdGhpcy5wcm9maWxl KQorICAgICAgICBpZiAoIXRoaXMucHJvZmlsZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAg ICAgICBpZiAoZXZlbnQudGFyZ2V0LnNlbGVjdGVkSW5kZXggPT0gMSAmJiB0aGlzLnZpZXcgPT0g IkhlYXZ5IikgeworICAgICAgICBpZiAodGhpcy52aWV3U2VsZWN0RWxlbWVudC5zZWxlY3RlZElu ZGV4ID09IDEpIHsKICAgICAgICAgICAgIHRoaXMucHJvZmlsZURhdGFHcmlkVHJlZSA9IHRoaXMu dG9wRG93blByb2ZpbGVEYXRhR3JpZFRyZWU7CiAgICAgICAgICAgICB0aGlzLl9zb3J0UHJvZmls ZSgpOwotICAgICAgICAgICAgdGhpcy52aWV3ID0gIlRyZWUiOwotICAgICAgICB9IGVsc2UgaWYg KGV2ZW50LnRhcmdldC5zZWxlY3RlZEluZGV4ID09IDAgJiYgdGhpcy52aWV3ID09ICJUcmVlIikg eworICAgICAgICAgICAgdGhpcy52aWV3LnNldChXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcu X1R5cGVUcmVlKTsKKyAgICAgICAgfSBlbHNlIGlmICh0aGlzLnZpZXdTZWxlY3RFbGVtZW50LnNl bGVjdGVkSW5kZXggPT0gMCkgewogICAgICAgICAgICAgdGhpcy5wcm9maWxlRGF0YUdyaWRUcmVl ID0gdGhpcy5ib3R0b21VcFByb2ZpbGVEYXRhR3JpZFRyZWU7CiAgICAgICAgICAgICB0aGlzLl9z b3J0UHJvZmlsZSgpOwotICAgICAgICAgICAgdGhpcy52aWV3ID0gIkhlYXZ5IjsKKyAgICAgICAg ICAgIHRoaXMudmlldy5zZXQoV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3Ll9UeXBlSGVhdnkp OwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCF0aGlzLmN1cnJlbnRRdWVyeSB8fCAhdGhpcy5f c2VhcmNoRmluaXNoZWRDYWxsYmFjayB8fCAhdGhpcy5fc2VhcmNoUmVzdWx0cykKQEAgLTQzOSwx NiArNDM3LDE2IEBAIFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAK ICAgICBfcGVyY2VudENsaWNrZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFy IGN1cnJlbnRTdGF0ZSA9IHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJjZW50ICYmIHRoaXMuc2hvd1Rv dGFsVGltZUFzUGVyY2VudCAmJiB0aGlzLnNob3dBdmVyYWdlVGltZUFzUGVyY2VudDsKLSAgICAg ICAgdGhpcy5zaG93U2VsZlRpbWVBc1BlcmNlbnQgPSAhY3VycmVudFN0YXRlOwotICAgICAgICB0 aGlzLnNob3dUb3RhbFRpbWVBc1BlcmNlbnQgPSAhY3VycmVudFN0YXRlOwotICAgICAgICB0aGlz LnNob3dBdmVyYWdlVGltZUFzUGVyY2VudCA9ICFjdXJyZW50U3RhdGU7CisgICAgICAgIHZhciBj dXJyZW50U3RhdGUgPSB0aGlzLnNob3dTZWxmVGltZUFzUGVyY2VudC5nZXQoKSAmJiB0aGlzLnNo b3dUb3RhbFRpbWVBc1BlcmNlbnQuZ2V0KCkgJiYgdGhpcy5zaG93QXZlcmFnZVRpbWVBc1BlcmNl bnQuZ2V0KCk7CisgICAgICAgIHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJjZW50LnNldCghY3VycmVu dFN0YXRlKTsKKyAgICAgICAgdGhpcy5zaG93VG90YWxUaW1lQXNQZXJjZW50LnNldCghY3VycmVu dFN0YXRlKTsKKyAgICAgICAgdGhpcy5zaG93QXZlcmFnZVRpbWVBc1BlcmNlbnQuc2V0KCFjdXJy ZW50U3RhdGUpOwogICAgICAgICB0aGlzLnJlZnJlc2hTaG93QXNQZXJjZW50cygpOwogICAgIH0s CiAKICAgICBfdXBkYXRlUGVyY2VudEJ1dHRvbjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg aWYgKHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJjZW50ICYmIHRoaXMuc2hvd1RvdGFsVGltZUFzUGVy Y2VudCAmJiB0aGlzLnNob3dBdmVyYWdlVGltZUFzUGVyY2VudCkgeworICAgICAgICBpZiAodGhp cy5zaG93U2VsZlRpbWVBc1BlcmNlbnQuZ2V0KCkgJiYgdGhpcy5zaG93VG90YWxUaW1lQXNQZXJj ZW50LmdldCgpICYmIHRoaXMuc2hvd0F2ZXJhZ2VUaW1lQXNQZXJjZW50LmdldCgpKSB7CiAgICAg ICAgICAgICB0aGlzLnBlcmNlbnRCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNob3cgYWJzb2x1dGUgdG90YWwgYW5kIHNlbGYgdGltZXMuIik7CiAgICAgICAgICAgICB0aGlz LnBlcmNlbnRCdXR0b24udG9nZ2xlZCA9IHRydWU7CiAgICAgICAgIH0gZWxzZSB7CkBAIC01MzYs MTEgKzUzNCwxMSBAQCBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcucHJvdG90eXBlID0gewog ICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmIChjZWxsLmhhc1N0eWxlQ2xhc3MoInRv dGFsLWNvbHVtbiIpKQotICAgICAgICAgICAgdGhpcy5zaG93VG90YWxUaW1lQXNQZXJjZW50ID0g IXRoaXMuc2hvd1RvdGFsVGltZUFzUGVyY2VudDsKKyAgICAgICAgICAgIHRoaXMuc2hvd1RvdGFs VGltZUFzUGVyY2VudC5zZXQoIXRoaXMuc2hvd1RvdGFsVGltZUFzUGVyY2VudC5nZXQoKSk7CiAg ICAgICAgIGVsc2UgaWYgKGNlbGwuaGFzU3R5bGVDbGFzcygic2VsZi1jb2x1bW4iKSkKLSAgICAg ICAgICAgIHRoaXMuc2hvd1NlbGZUaW1lQXNQZXJjZW50ID0gIXRoaXMuc2hvd1NlbGZUaW1lQXNQ ZXJjZW50OworICAgICAgICAgICAgdGhpcy5zaG93U2VsZlRpbWVBc1BlcmNlbnQuc2V0KCF0aGlz LnNob3dTZWxmVGltZUFzUGVyY2VudC5nZXQoKSk7CiAgICAgICAgIGVsc2UgaWYgKGNlbGwuaGFz U3R5bGVDbGFzcygiYXZlcmFnZS1jb2x1bW4iKSkKLSAgICAgICAgICAgIHRoaXMuc2hvd0F2ZXJh Z2VUaW1lQXNQZXJjZW50ID0gIXRoaXMuc2hvd0F2ZXJhZ2VUaW1lQXNQZXJjZW50OworICAgICAg ICAgICAgdGhpcy5zaG93QXZlcmFnZVRpbWVBc1BlcmNlbnQuc2V0KCF0aGlzLnNob3dBdmVyYWdl VGltZUFzUGVyY2VudC5nZXQoKSk7CiAKICAgICAgICAgdGhpcy5yZWZyZXNoU2hvd0FzUGVyY2Vu dHMoKTsKIAo=