113503 2013-03-28 05:58:56 -0700 Web Inspector: name timeline overview controls consistently 2013-03-28 06:44:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 113501 1 caseq caseq apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 865407 0 caseq 2013-03-28 05:58:56 -0700 Rename HeapGraph to TimelineMemoryOverview, TimelineCategoryStrips to TimelineEventOverview. 865412 1 195546 caseq 2013-03-28 06:01:59 -0700 Created attachment 195546 Patch 865455 2 caseq 2013-03-28 06:44:37 -0700 Committed r147109: <http://trac.webkit.org/changeset/147109> 195546 2013-03-28 06:01:59 -0700 2013-03-28 06:14:36 -0700 Patch bug-113503-20130328170156.patch text/plain 11166 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWExYWVlNjMzMzY2MDU2 YjI3NGVlYTk5NDgyYTdiMTcwYWEwNThiNC4uYzFjYzU3NjkyY2RkZDM0ZjMxMmQ1ZDk4MmZhZGM2 NDY2N2U0N2FkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAzLTI4ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogbmFtZSB0aW1lbGluZSBvdmVydmlldyBjb250cm9scyBjb25zaXN0ZW50bHkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzUwMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yaW5nLCBjb3Zl cmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgIC0gcmVuYW1lIEhlYXBHcmFwaCB0byBU aW1lbGluZU1lbW9yeU92ZXJ2aWV3OworICAgICAgICAtIHJlbmFtZSBUaW1lbGluZUNhdGVnb3J5 U3RyaXBzIHRvIFRpbWVsaW5lRXZlbnRPdnJ2aWV3LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3UGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlld1BhbmUucHJvdG90eXBlLnNldE1vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5fc2V0RnJhbWVNb2RlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX29uQ2F0ZWdvcnlWaXNpYmls aXR5Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUu cHJvdG90eXBlLl91cGRhdGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXdQYW5lLnByb3RvdHlwZS5zZXRNaW5pbXVtUmVjb3JkRHVyYXRpb24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lTWVtb3J5T3ZlcnZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lRXZlbnRPdmVydmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVF dmVudE92ZXJ2aWV3LnByb3RvdHlwZS5fcmVuZGVyQmFyKToKKwogMjAxMy0wMy0yNSAgQW5kcmV5 IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IERPTUNvbnRlbnRMb2FkZWQgZXZlbnQgZGl2aWRlciBpcyBub3Qgc2hvd24gb24gVGltZWxpbmUn cyBtYWluIHZpZXcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCmluZGV4IDA4OWVhNGZjYWUzMmI0ZGY1MmQ1 MDZiNDUzYzJkMWIwNDA4MTk0MmIuLmU4Mjk4ZmI5NWJiOGUyZDdlYzhiNTEyZmE1ZWUzOGFjZjE3 MmMxODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGlt ZWxpbmVPdmVydmlld1BhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcwpAQCAtNzcsMTYgKzc3LDE2IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZSA9IGZ1bmN0aW9uKG1vZGVsKQogICAgIHRoaXMuX292 ZXJ2aWV3R3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkKCJ0aW1lbGluZSIpOwog ICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudCk7 CiAKLSAgICB0aGlzLl9oZWFwR3JhcGggPSBuZXcgV2ViSW5zcGVjdG9yLkhlYXBHcmFwaCh0aGlz Ll9tb2RlbCk7Ci0gICAgdGhpcy5faGVhcEdyYXBoLmVsZW1lbnQuaWQgPSAidGltZWxpbmUtb3Zl cnZpZXctbWVtb3J5IjsKLSAgICB0aGlzLl9vdmVydmlld0dyaWQuaW5zZXJ0QmVmb3JlSXRlbXNH cmFwaHNFbGVtZW50KHRoaXMuX2hlYXBHcmFwaC5lbGVtZW50KTsKKyAgICB0aGlzLl9tZW1vcnlP dmVydmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVNZW1vcnlPdmVydmlldyh0aGlzLl9t b2RlbCk7CisgICAgdGhpcy5fbWVtb3J5T3ZlcnZpZXcuZWxlbWVudC5pZCA9ICJ0aW1lbGluZS1v dmVydmlldy1tZW1vcnkiOworICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5pbnNlcnRCZWZvcmVJdGVt c0dyYXBoc0VsZW1lbnQodGhpcy5fbWVtb3J5T3ZlcnZpZXcuZWxlbWVudCk7CiAKICAgICB2YXIg c2VwYXJhdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHNl cGFyYXRvckVsZW1lbnQuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctc2VwYXJhdG9yIjsKICAgICB0 aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VwYXJhdG9yRWxlbWVudCk7CiAKLSAgICB0aGlzLl9j YXRlZ29yeVN0cmlwcyA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcyh0 aGlzLl9tb2RlbCk7Ci0gICAgdGhpcy5fb3ZlcnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudCgp LmFwcGVuZENoaWxkKHRoaXMuX2NhdGVnb3J5U3RyaXBzLmVsZW1lbnQpOworICAgIHRoaXMuX2V2 ZW50T3ZlcnZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldyh0aGlz Ll9tb2RlbCk7CisgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudCgpLmFw cGVuZENoaWxkKHRoaXMuX2V2ZW50T3ZlcnZpZXcuZWxlbWVudCk7CiAgCiAgICAgdmFyIGNhdGVn b3JpZXMgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRlZ29yaWVz KCk7CiAgICAgZm9yICh2YXIgY2F0ZWdvcnkgaW4gY2F0ZWdvcmllcykKQEAgLTEzMSwxMiArMTMx LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHN3aXRjaCAodGhpcy5fY3VycmVudE1vZGUpIHsKICAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1vZGUuRXZlbnRzOgogICAgICAgICAgICAg Y2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuTW9kZS5GcmFtZXM6Ci0gICAg ICAgICAgICAgICAgdGhpcy5faGVhcEdyYXBoLmhpZGUoKTsKKyAgICAgICAgICAgICAgICB0aGlz Ll9tZW1vcnlPdmVydmlldy5oaWRlKCk7CiAgICAgICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdH cmlkLnNob3dJdGVtc0dyYXBoc0VsZW1lbnQoKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1vZGUuTWVt b3J5OgogICAgICAgICAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5oaWRlSXRlbXNHcmFwaHNF bGVtZW50KCk7Ci0gICAgICAgICAgICAgICAgdGhpcy5faGVhcEdyYXBoLnNob3coKTsKKyAgICAg ICAgICAgICAgICB0aGlzLl9tZW1vcnlPdmVydmlldy5zaG93KCk7CiAgICAgICAgIH0KICAgICAg ICAgdGhpcy5fb3ZlcnZpZXdJdGVtc1t0aGlzLl9jdXJyZW50TW9kZV0ucmV2ZWFsQW5kU2VsZWN0 KGZhbHNlKTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLkV2ZW50cy5Nb2RlQ2hhbmdlZCwgdGhpcy5fY3VycmVu dE1vZGUpOwpAQCAtMTU0LDE0ICsxNTQsMTQgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2ZyYW1lT3ZlcnZpZXcuZGV0 YWNoKCk7CiAgICAgICAgICAgICB0aGlzLl9mcmFtZU92ZXJ2aWV3ID0gbnVsbDsKICAgICAgICAg ICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5zaG93SXRlbXNHcmFwaHNFbGVtZW50KCk7Ci0gICAgICAg ICAgICB0aGlzLl9jYXRlZ29yeVN0cmlwcy51cGRhdGUoKTsKKyAgICAgICAgICAgIHRoaXMuX2V2 ZW50T3ZlcnZpZXcudXBkYXRlKCk7CiAgICAgICAgIH0KICAgICB9LAogCiAgICAgX29uQ2F0ZWdv cnlWaXNpYmlsaXR5Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICBpZiAo dGhpcy5fY3VycmVudE1vZGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5N b2RlLkV2ZW50cykKLSAgICAgICAgICAgIHRoaXMuX2NhdGVnb3J5U3RyaXBzLnVwZGF0ZSgpOwor ICAgICAgICAgICAgdGhpcy5fZXZlbnRPdmVydmlldy51cGRhdGUoKTsKICAgICB9LAogCiAgICAg X3VwZGF0ZTogZnVuY3Rpb24oKQpAQCAtMTcyLDEyICsxNzIsMTIgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdD YWxjdWxhdG9yLnNldFdpbmRvdyh0aGlzLl9tb2RlbC5taW5pbXVtUmVjb3JkVGltZSgpLCB0aGlz Ll9tb2RlbC5tYXhpbXVtUmVjb3JkVGltZSgpKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxj dWxhdG9yLnNldERpc3BsYXlXaW5kb3coMCwgdGhpcy5fb3ZlcnZpZXdHcmlkLmNsaWVudFdpZHRo KCkpOwogCi0gICAgICAgIGlmICh0aGlzLl9oZWFwR3JhcGgudmlzaWJsZSkKLSAgICAgICAgICAg IHRoaXMuX2hlYXBHcmFwaC51cGRhdGUoKTsKKyAgICAgICAgaWYgKHRoaXMuX21lbW9yeU92ZXJ2 aWV3LnZpc2libGUpCisgICAgICAgICAgICB0aGlzLl9tZW1vcnlPdmVydmlldy51cGRhdGUoKTsK ICAgICAgICAgZWxzZSBpZiAodGhpcy5fZnJhbWVPdmVydmlldykKICAgICAgICAgICAgIHRoaXMu X2ZyYW1lT3ZlcnZpZXcudXBkYXRlKCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMu X2NhdGVnb3J5U3RyaXBzLnVwZGF0ZSgpOworICAgICAgICAgICAgdGhpcy5fZXZlbnRPdmVydmll dy51cGRhdGUoKTsKIAogICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQudXBkYXRlRGl2aWRlcnMo dGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yKTsKICAgICAgICAgdGhpcy5fdXBkYXRlRXZlbnREaXZp ZGVycygpOwpAQCAtMzIyLDcgKzMyMiw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgc2V0TWluaW11bVJlY29yZER1cmF0aW9u OiBmdW5jdGlvbih2YWx1ZSkKICAgICB7Ci0gICAgICAgIHRoaXMuX2NhdGVnb3J5U3RyaXBzLnNl dE1pbmltdW1SZWNvcmREdXJhdGlvbih2YWx1ZSk7CisgICAgICAgIHRoaXMuX2V2ZW50T3ZlcnZp ZXcuc2V0TWluaW11bVJlY29yZER1cmF0aW9uKHZhbHVlKTsKICAgICB9LAogCiAgICAgX3NjaGVk dWxlUmVmcmVzaDogZnVuY3Rpb24oKQpAQCAtNDE2LDcgKzQxNiw3IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3Q2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgKiBAY29uc3RydWN0b3IK ICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWx9IG1vZGVsCiAgKi8KLVdlYklu c3BlY3Rvci5IZWFwR3JhcGggPSBmdW5jdGlvbihtb2RlbCkKK1dlYkluc3BlY3Rvci5UaW1lbGlu ZU1lbW9yeU92ZXJ2aWV3ID0gZnVuY3Rpb24obW9kZWwpCiB7CiAgICAgdGhpcy5fY2FudmFzID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CiAgICAgdGhpcy5fbW9kZWwgPSBtb2Rl bDsKQEAgLTQzNSw3ICs0MzUsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcEdyYXBoID0gZnVuY3Rpb24o bW9kZWwpCiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9taW5IZWFwU2l6ZUxh YmVsKTsKIH0KIAotV2ViSW5zcGVjdG9yLkhlYXBHcmFwaC5wcm90b3R5cGUgPSB7CitXZWJJbnNw ZWN0b3IuVGltZWxpbmVNZW1vcnlPdmVydmlldy5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAg ICogQHJldHVybiB7Tm9kZX0KICAgICAgKi8KQEAgLTU0NSw3ICs1NDUsNyBAQCBXZWJJbnNwZWN0 b3IuSGVhcEdyYXBoLnByb3RvdHlwZSA9IHsKICAqIEBjb25zdHJ1Y3RvcgogICogQHBhcmFtIHtX ZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbH0gbW9kZWwKICAqLwotV2ViSW5zcGVjdG9yLlRpbWVs aW5lQ2F0ZWdvcnlTdHJpcHMgPSBmdW5jdGlvbihtb2RlbCkKK1dlYkluc3BlY3Rvci5UaW1lbGlu ZUV2ZW50T3ZlcnZpZXcgPSBmdW5jdGlvbihtb2RlbCkKIHsKICAgICB0aGlzLl9tb2RlbCA9IG1v ZGVsOwogICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNhbnZhcyIp OwpAQCAtNTU1LDMxICs1NTUsMzEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlTdHJp cHMgPSBmdW5jdGlvbihtb2RlbCkKICAgICB0aGlzLl9maWxsU3R5bGVzID0ge307CiAgICAgdmFy IGNhdGVnb3JpZXMgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRl Z29yaWVzKCk7CiAgICAgZm9yICh2YXIgY2F0ZWdvcnkgaW4gY2F0ZWdvcmllcykKLSAgICAgICAg dGhpcy5fZmlsbFN0eWxlc1tjYXRlZ29yeV0gPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50 YXRpb25Nb2RlbC5jcmVhdGVGaWxsU3R5bGVGb3JDYXRlZ29yeSh0aGlzLl9jb250ZXh0LCAwLCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcy5faW5uZXJTdHJpcEhlaWdodCwgY2F0 ZWdvcmllc1tjYXRlZ29yeV0pOworICAgICAgICB0aGlzLl9maWxsU3R5bGVzW2NhdGVnb3J5XSA9 IFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmNyZWF0ZUZpbGxTdHlsZUZv ckNhdGVnb3J5KHRoaXMuX2NvbnRleHQsIDAsIFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3Zl cnZpZXcuX2lubmVyU3RyaXBIZWlnaHQsIGNhdGVnb3JpZXNbY2F0ZWdvcnldKTsKIAotICAgIHRo aXMuX2Rpc2FibGVkQ2F0ZWdvcnlGaWxsU3R5bGUgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVz ZW50YXRpb25Nb2RlbC5jcmVhdGVGaWxsU3R5bGUodGhpcy5fY29udGV4dCwgMCwgV2ViSW5zcGVj dG9yLlRpbWVsaW5lQ2F0ZWdvcnlTdHJpcHMuX2lubmVyU3RyaXBIZWlnaHQsCisgICAgdGhpcy5f ZGlzYWJsZWRDYXRlZ29yeUZpbGxTdHlsZSA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRh dGlvbk1vZGVsLmNyZWF0ZUZpbGxTdHlsZSh0aGlzLl9jb250ZXh0LCAwLCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVFdmVudE92ZXJ2aWV3Ll9pbm5lclN0cmlwSGVpZ2h0LAogICAgICAgICAicmdiKDIx OCwgMjE4LCAyMTgpIiwgInJnYigxNzAsIDE3MCwgMTcwKSIsICJyZ2IoMTQzLCAxNDMsIDE0Myki KTsKIAogICAgIHRoaXMuX2Rpc2FibGVkQ2F0ZWdvcnlCb3JkZXJTdHlsZSA9ICJyZ2IoMTQzLCAx NDMsIDE0MykiOwogfQogCiAvKiogQGNvbnN0ICovCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRl Z29yeVN0cmlwcy5fY2FudmFzSGVpZ2h0ID0gNjA7CitXZWJJbnNwZWN0b3IuVGltZWxpbmVFdmVu dE92ZXJ2aWV3Ll9jYW52YXNIZWlnaHQgPSA2MDsKIC8qKiBAY29uc3QgKi8KLVdlYkluc3BlY3Rv ci5UaW1lbGluZUNhdGVnb3J5U3RyaXBzLl9udW1iZXJPZlN0cmlwcyA9IDM7CitXZWJJbnNwZWN0 b3IuVGltZWxpbmVFdmVudE92ZXJ2aWV3Ll9udW1iZXJPZlN0cmlwcyA9IDM7CiAvKiogQGNvbnN0 ICovCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcy5fc3RyaXBIZWlnaHQgPSBN YXRoLnJvdW5kKFdlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5U3RyaXBzLl9jYW52YXNIZWln aHQgIC8gV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlTdHJpcHMuX251bWJlck9mU3RyaXBz KTsKK1dlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcuX3N0cmlwSGVpZ2h0ID0gTWF0 aC5yb3VuZChXZWJJbnNwZWN0b3IuVGltZWxpbmVFdmVudE92ZXJ2aWV3Ll9jYW52YXNIZWlnaHQg IC8gV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5fbnVtYmVyT2ZTdHJpcHMpOwog LyoqIEBjb25zdCAqLwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlTdHJpcHMuX3N0cmlw UGFkZGluZyA9IDQ7CitXZWJJbnNwZWN0b3IuVGltZWxpbmVFdmVudE92ZXJ2aWV3Ll9zdHJpcFBh ZGRpbmcgPSA0OwogLyoqIEBjb25zdCAqLwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlT dHJpcHMuX2lubmVyU3RyaXBIZWlnaHQgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0 cmlwcy5fc3RyaXBIZWlnaHQgLSAyICogV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlTdHJp cHMuX3N0cmlwUGFkZGluZzsKK1dlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcuX2lu bmVyU3RyaXBIZWlnaHQgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVFdmVudE92ZXJ2aWV3Ll9zdHJp cEhlaWdodCAtIDIgKiBXZWJJbnNwZWN0b3IuVGltZWxpbmVFdmVudE92ZXJ2aWV3Ll9zdHJpcFBh ZGRpbmc7CiAKLVdlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5U3RyaXBzLnByb3RvdHlwZSA9 IHsKK1dlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcucHJvdG90eXBlID0gewogICAg IHVwZGF0ZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgLy8gVXNlIHJlYWwgd29ybGQsIDE6 MSBjb29yZGluYXRlcyBpbiBjYW52YXMuIFRoaXMgd2lsbCBhbHNvIHRha2UgY2FyZSBvZiBjbGVh cmluZyBpdC4KICAgICAgICAgdGhpcy5lbGVtZW50LndpZHRoID0gdGhpcy5lbGVtZW50LnBhcmVu dEVsZW1lbnQuY2xpZW50V2lkdGg7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5oZWlnaHQgPSBXZWJJ bnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcy5fY2FudmFzSGVpZ2h0OworICAgICAgICB0 aGlzLmVsZW1lbnQuaGVpZ2h0ID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5f Y2FudmFzSGVpZ2h0OwogCiAgICAgICAgIHZhciB0aW1lT2Zmc2V0ID0gdGhpcy5fbW9kZWwubWlu aW11bVJlY29yZFRpbWUoKTsKICAgICAgICAgdmFyIHRpbWVTcGFuID0gdGhpcy5fbW9kZWwubWF4 aW11bVJlY29yZFRpbWUoKSAtIHRpbWVPZmZzZXQ7CkBAIC01ODgsOCArNTg4LDggQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlTdHJpcHMucHJvdG90eXBlID0gewogICAgICAgICB2YXIg bGFzdEJhckJ5R3JvdXAgPSBbXTsKIAogICAgICAgICB0aGlzLl9jb250ZXh0LmZpbGxTdHlsZSA9 ICJyZ2JhKDAsIDAsIDAsIDAuMDUpIjsKLSAgICAgICAgZm9yICh2YXIgaSA9IDE7IGkgPCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcy5fbnVtYmVyT2ZTdHJpcHM7IGkgKz0gMikK LSAgICAgICAgICAgIHRoaXMuX2NvbnRleHQuZmlsbFJlY3QoMC41LCBpICogV2ViSW5zcGVjdG9y LlRpbWVsaW5lQ2F0ZWdvcnlTdHJpcHMuX3N0cmlwSGVpZ2h0ICsgMC41LCB0aGlzLmVsZW1lbnQu d2lkdGgsIFdlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5U3RyaXBzLl9zdHJpcEhlaWdodCk7 CisgICAgICAgIGZvciAodmFyIGkgPSAxOyBpIDwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRP dmVydmlldy5fbnVtYmVyT2ZTdHJpcHM7IGkgKz0gMikKKyAgICAgICAgICAgIHRoaXMuX2NvbnRl eHQuZmlsbFJlY3QoMC41LCBpICogV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5f c3RyaXBIZWlnaHQgKyAwLjUsIHRoaXMuZWxlbWVudC53aWR0aCwgV2ViSW5zcGVjdG9yLlRpbWVs aW5lRXZlbnRPdmVydmlldy5fc3RyaXBIZWlnaHQpOwogCiAgICAgICAgIGZ1bmN0aW9uIGFwcGVu ZFJlY29yZChyZWNvcmQpCiAgICAgICAgIHsKQEAgLTYzMywxNSArNjMzLDE1IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZUNhdGVnb3J5U3RyaXBzLnByb3RvdHlwZSA9IHsKICAgICBfcmVuZGVyQmFy OiBmdW5jdGlvbihiZWdpbiwgZW5kLCBjYXRlZ29yeSkKICAgICB7CiAgICAgICAgIHZhciB4ID0g YmVnaW4gKyAwLjU7Ci0gICAgICAgIHZhciB5ID0gY2F0ZWdvcnkub3ZlcnZpZXdTdHJpcEdyb3Vw SW5kZXggKiBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcy5fc3RyaXBIZWlnaHQg KyBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcy5fc3RyaXBQYWRkaW5nICsgMC41 OworICAgICAgICB2YXIgeSA9IGNhdGVnb3J5Lm92ZXJ2aWV3U3RyaXBHcm91cEluZGV4ICogV2Vi SW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5fc3RyaXBIZWlnaHQgKyBXZWJJbnNwZWN0 b3IuVGltZWxpbmVFdmVudE92ZXJ2aWV3Ll9zdHJpcFBhZGRpbmcgKyAwLjU7CiAgICAgICAgIHZh ciB3aWR0aCA9IE1hdGgubWF4KGVuZCAtIGJlZ2luLCAxKTsKIAogICAgICAgICB0aGlzLl9jb250 ZXh0LnNhdmUoKTsKICAgICAgICAgdGhpcy5fY29udGV4dC50cmFuc2xhdGUoeCwgeSk7CiAgICAg ICAgIHRoaXMuX2NvbnRleHQuZmlsbFN0eWxlID0gY2F0ZWdvcnkuaGlkZGVuID8gdGhpcy5fZGlz YWJsZWRDYXRlZ29yeUZpbGxTdHlsZSA6IHRoaXMuX2ZpbGxTdHlsZXNbY2F0ZWdvcnkubmFtZV07 Ci0gICAgICAgIHRoaXMuX2NvbnRleHQuZmlsbFJlY3QoMCwgMCwgd2lkdGgsIFdlYkluc3BlY3Rv ci5UaW1lbGluZUNhdGVnb3J5U3RyaXBzLl9pbm5lclN0cmlwSGVpZ2h0KTsKKyAgICAgICAgdGhp cy5fY29udGV4dC5maWxsUmVjdCgwLCAwLCB3aWR0aCwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZl bnRPdmVydmlldy5faW5uZXJTdHJpcEhlaWdodCk7CiAgICAgICAgIHRoaXMuX2NvbnRleHQuc3Ry b2tlU3R5bGUgPSBjYXRlZ29yeS5oaWRkZW4gPyB0aGlzLl9kaXNhYmxlZENhdGVnb3J5Qm9yZGVy U3R5bGUgOiBjYXRlZ29yeS5ib3JkZXJDb2xvcjsKLSAgICAgICAgdGhpcy5fY29udGV4dC5zdHJv a2VSZWN0KDAsIDAsIHdpZHRoLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcy5f aW5uZXJTdHJpcEhlaWdodCk7CisgICAgICAgIHRoaXMuX2NvbnRleHQuc3Ryb2tlUmVjdCgwLCAw LCB3aWR0aCwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5faW5uZXJTdHJpcEhl aWdodCk7CiAgICAgICAgIHRoaXMuX2NvbnRleHQucmVzdG9yZSgpOwogICAgIH0KIH0K