113708 2013-04-01 10:04:17 -0700 Web Inspector: [Timeline] unify logic for 3 overview modes in Timeline 2013-04-02 07:43:03 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 113705 113501 1 caseq caseq apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 867197 0 caseq 2013-04-01 10:04:17 -0700 Now that the 3 modes implement a common interface, remove all custom logic in overview pane itself and handle them in a consistent manner. 867199 1 195984 caseq 2013-04-01 10:09:20 -0700 Created attachment 195984 Patch 867799 2 195984 yurys 2013-04-02 07:07:52 -0700 Comment on attachment 195984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195984&action=review > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:148 > + return null; Why not just throw if the mode is invalid, you would anyway fail on the first attempt to call a method on the controll at line 131? 867804 3 195984 pfeldman 2013-04-02 07:16:51 -0700 Comment on attachment 195984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195984&action=review > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:410 > + getWindowTimes: function(windowLeft, windowRight) windowTimes (since you touch it...) 867819 4 195984 caseq 2013-04-02 07:37:25 -0700 Comment on attachment 195984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195984&action=review >> Source/WebCore/inspector/front-end/TimelineOverviewPane.js:148 >> + return null; > > Why not just throw if the mode is invalid, you would anyway fail on the first attempt to call a method on the controll at line 131? Fixed! >> Source/WebCore/inspector/front-end/TimelineOverviewPane.js:410 >> + getWindowTimes: function(windowLeft, windowRight) > > windowTimes (since you touch it...) Fixed as well. 867827 5 caseq 2013-04-02 07:43:03 -0700 Committed r147431: <http://trac.webkit.org/changeset/147431> 195984 2013-04-01 10:09:20 -0700 2013-04-02 07:37:25 -0700 Patch bug-113708-20130401210912.patch text/plain 13384 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUzZDNmMjBiY2YxODRl MjY4MzE0MjZjYTViYjEwNWJhZWYwZGQ4NC4uMmIyNjljYjVjNzZmZWViZjk4YjQ2NTMyZWZlOTAw ZTU2ZGYxMDFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDEzLTA0LTAxICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW1RpbWVsaW5lXSB1bmlmeSBsb2dpYyBmb3IgMyBvdmVydmlldyBtb2RlcyBpbiBUaW1lbGlu ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNzA4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBtYWtl IFRpbWVsaW5lT3ZlcnZpZXdQYW5lIGxvZ2ljIGluZGVwZW5kZW50IG9uIG92ZXJ2aWV3IG1vZGU7 CisgICAgICAgIC0gc2hvdyBvbmx5IG9uZSBvZiAzIGNvbnRyb2xzIGF0IG9uZSB0aW1lOworICAg ICAgICAtIGF0dGFjaCBvdmVydmlldyBjb250cm9scyB0byB0aGUgc2FtZSBwYXJlbnQuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJ2aWV3R3JpZC5qczogcmVtb3ZlIGdyaWRF bGVtZW50KCkgYW5kIGl0ZW1zR3JhcGhzRWxlbWVudCgpLCBubyBsb25nZXIgbmVlZGVkLgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3UGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlld1BhbmUucHJvdG90eXBlLnNldE1vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5faW5uZXJTZXRNb2RlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX2NyZWF0ZU92ZXJ2aWV3Q29u dHJvbCk6IAorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3Rv dHlwZS5fb25DYXRlZ29yeVZpc2liaWxpdHlDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX3VwZGF0ZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlLmFkZEZyYW1lKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuem9vbVRvRnJh bWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlw ZS5fcmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnBy b3RvdHlwZS5fb25XaW5kb3dDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZU92ZXJ2aWV3QmFzZS5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3QmFzZS5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlLnByb3RvdHlwZS5jYXRlZ29yeVZpc2liaWxpdHlDaGFu Z2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3QmFzZS5wcm90b3R5 cGUuYWRkRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNl LnByb3RvdHlwZS5nZXRXaW5kb3dUaW1lcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVFdmVudE92ZXJ2aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3Zl cnZpZXcucHJvdG90eXBlLmNhdGVnb3J5VmlzaWJpbGl0eUNoYW5nZWQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3M6CisKKzIwMTMtMDQtMDEgIEFuZHJl eSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9y OiBpZ25vcmUgbWluaW11bSByZWNvcmQgZHVyYXRpb24gZmlsdGVyIGluIFRpbWVsaW5lIG92ZXJ2 aWV3CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM3 MDUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PdmVy dmlld0dyaWQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJ2aWV3 R3JpZC5qcwppbmRleCAwMjg0MGM2NzZmYTJjZDQyYTZiMTA2MjhkNWQ5ODhiYWIwYzVjNDIzLi4y MTc5ZjhlN2I3YWRiZTIxZTYyMWU2MTQyMzVmMGQxZDgwMDExODM4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJ2aWV3R3JpZC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJ2aWV3R3JpZC5qcwpAQCAtNDAsNyAr NDAsNiBAQCBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkID0gZnVuY3Rpb24ocHJlZml4KQogCiAg ICAgdGhpcy5fZ3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkKCk7CiAgICAgdGhp cy5fZ3JpZC5lbGVtZW50LmlkID0gcHJlZml4ICsgIi1vdmVydmlldy1ncmlkIjsKLSAgICB0aGlz Ll9ncmlkLml0ZW1zR3JhcGhzRWxlbWVudC5pZCA9IHByZWZpeCArICItb3ZlcnZpZXctdGltZWxp bmVzIjsKICAgICB0aGlzLl9ncmlkLnNldFNjcm9sbEFuZERpdmlkZXJUb3AoMCwgMCk7CiAKICAg ICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZ3JpZC5lbGVtZW50KTsKQEAgLTQ5LDE2 ICs0OCw2IEBAIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQgPSBmdW5jdGlvbihwcmVmaXgpCiB9 CiAKIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlID0gewotICAgIGdyaWRFbGVt ZW50OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fZ3JpZC5lbGVtZW50 OwotICAgIH0sCi0KLSAgICBpdGVtc0dyYXBoc0VsZW1lbnQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLl9ncmlkLml0ZW1zR3JhcGhzRWxlbWVudDsKLSAgICB9LAotCiAg ICAgLyoqCiAgICAgICogQHJldHVybiB7bnVtYmVyfQogICAgICAqLwpAQCAtNjcsMTYgKzU2LDYg QEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVy biB0aGlzLmVsZW1lbnQuY2xpZW50V2lkdGg7CiAgICAgfSwKIAotICAgIHNob3dJdGVtc0dyYXBo c0VsZW1lbnQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2dyaWQuaXRlbXNHcmFw aHNFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgIH0sCi0KLSAgICBoaWRl SXRlbXNHcmFwaHNFbGVtZW50OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLl9ncmlk Lml0ZW1zR3JhcGhzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLSAgICB9LAotCiAg ICAgLyoqCiAgICAgICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLlRpbWVsaW5lR3JpZC5DYWxjdWxh dG9yfSBjYWxjdWxhdG9yCiAgICAgICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcwppbmRleCAxYzFiNDVi YTU5ODg0ZmNlOGY1ZTFkZGQyMGQ3OTY4MDIwOTNjYTk1Li5jMzA4YzI3ZmYyNDY3ZGRlNWVkYjky MjRlNDhjN2RhYTI1OGFlNDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKQEAgLTEsNSArMSw1IEBA CiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTU0LDggKzU0LDYgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lID0gZnVuY3Rpb24obW9kZWwpCiAKICAg ICB2YXIgdG9wUGFuZVNpZGViYXJUcmVlID0gbmV3IFRyZWVPdXRsaW5lKG92ZXJ2aWV3VHJlZUVs ZW1lbnQpOwogCi0gICAgdGhpcy5fY3VycmVudE1vZGUgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld1BhbmUuTW9kZS5FdmVudHM7Ci0KICAgICB0aGlzLl9vdmVydmlld0l0ZW1zID0ge307 CiAgICAgdGhpcy5fb3ZlcnZpZXdJdGVtc1tXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1Bh bmUuTW9kZS5FdmVudHNdID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyVHJlZUVsZW1lbnQoInRp bWVsaW5lLW92ZXJ2aWV3LXNpZGViYXItZXZlbnRzIiwKICAgICAgICAgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJFdmVudHMiKSk7CkBAIC03MiwyMCArNzAsMTUgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdQYW5lID0gZnVuY3Rpb24obW9kZWwpCiAgICAgICAgIHRvcFBhbmVTaWRlYmFy VHJlZS5hcHBlbmRDaGlsZChpdGVtKTsKICAgICB9CiAgICAgCi0gICAgdGhpcy5fb3ZlcnZpZXdJ dGVtc1t0aGlzLl9jdXJyZW50TW9kZV0ucmV2ZWFsQW5kU2VsZWN0KGZhbHNlKTsKLQogICAgIHRo aXMuX292ZXJ2aWV3R3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkKCJ0aW1lbGlu ZSIpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9vdmVydmlld0dyaWQuZWxl bWVudCk7CiAKLSAgICB0aGlzLl9tZW1vcnlPdmVydmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVNZW1vcnlPdmVydmlldyh0aGlzLl9tb2RlbCk7Ci0KICAgICB2YXIgc2VwYXJhdG9yRWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHNlcGFyYXRvckVsZW1l bnQuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctc2VwYXJhdG9yIjsKICAgICB0aGlzLmVsZW1lbnQu YXBwZW5kQ2hpbGQoc2VwYXJhdG9yRWxlbWVudCk7CiAKLSAgICB0aGlzLl9ldmVudE92ZXJ2aWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcodGhpcy5fbW9kZWwpOwot ICAgIHRoaXMuX2V2ZW50T3ZlcnZpZXcuc2hvdyh0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFw aHNFbGVtZW50KCkpOwotIAorICAgIHRoaXMuX2lubmVyU2V0TW9kZShXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUuTW9kZS5FdmVudHMpOworCiAgICAgdmFyIGNhdGVnb3JpZXMgPSBX ZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRlZ29yaWVzKCk7CiAgICAg Zm9yICh2YXIgY2F0ZWdvcnkgaW4gY2F0ZWdvcmllcykKICAgICAgICAgY2F0ZWdvcmllc1tjYXRl Z29yeV0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeS5FdmVu dHMuVmlzaWJpbGl0eUNoYW5nZWQsIHRoaXMuX29uQ2F0ZWdvcnlWaXNpYmlsaXR5Q2hhbmdlZCwg dGhpcyk7CkBAIC0xMjMsNDMgKzExNiw0MSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmll d1BhbmUucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRNb2Rl ID09PSBuZXdNb2RlKQogICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLl9pbm5lclNl dE1vZGUobmV3TW9kZSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5FdmVudHMuTW9kZUNoYW5nZWQsIHRoaXMu X2N1cnJlbnRNb2RlKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlKCk7CisgICAgfSwKKworICAgIF9p bm5lclNldE1vZGU6IGZ1bmN0aW9uKG5ld01vZGUpCisgICAgeworICAgICAgICBpZiAodGhpcy5f b3ZlcnZpZXdDb250cm9sKQorICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDb250cm9sLmRldGFj aCgpOwogCiAgICAgICAgIHRoaXMuX2N1cnJlbnRNb2RlID0gbmV3TW9kZTsKLSAgICAgICAgdGhp cy5fc2V0RnJhbWVNb2RlKHRoaXMuX2N1cnJlbnRNb2RlID09PSBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld1BhbmUuTW9kZS5GcmFtZXMpOwotICAgICAgICBzd2l0Y2ggKHRoaXMuX2N1cnJl bnRNb2RlKSB7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 UGFuZS5Nb2RlLkV2ZW50czoKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXdQYW5lLk1vZGUuRnJhbWVzOgotICAgICAgICAgICAgICAgIHRoaXMuX21lbW9yeU92 ZXJ2aWV3LmRldGFjaCgpOwotICAgICAgICAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5zaG93 SXRlbXNHcmFwaHNFbGVtZW50KCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2RlLk1lbW9yeToKLSAg ICAgICAgICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuaGlkZUl0ZW1zR3JhcGhzRWxlbWVudCgp OwotICAgICAgICAgICAgICAgIHRoaXMuX21lbW9yeU92ZXJ2aWV3LnNob3codGhpcy5fb3ZlcnZp ZXdHcmlkLmdyaWRFbGVtZW50KCksIHRoaXMuX292ZXJ2aWV3R3JpZC5pdGVtc0dyYXBoc0VsZW1l bnQoKSk7Ci0gICAgICAgIH0KKyAgICAgICAgdGhpcy5fb3ZlcnZpZXdDb250cm9sID0gdGhpcy5f Y3JlYXRlT3ZlcnZpZXdDb250cm9sKCk7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3Q29udHJvbC5z aG93KHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50KTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdJ dGVtc1t0aGlzLl9jdXJyZW50TW9kZV0ucmV2ZWFsQW5kU2VsZWN0KGZhbHNlKTsKLSAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXdQYW5lLkV2ZW50cy5Nb2RlQ2hhbmdlZCwgdGhpcy5fY3VycmVudE1vZGUpOwotICAgICAgICB0 aGlzLl91cGRhdGUoKTsKICAgICB9LAogCi0gICAgX3NldEZyYW1lTW9kZTogZnVuY3Rpb24oZW5h YmxlZCkKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlld0Jhc2V8bnVsbH0KKyAgICAgKi8KKyAgICBfY3JlYXRlT3ZlcnZpZXdDb250cm9sOiBmdW5j dGlvbigpCiAgICAgewotICAgICAgICBpZiAoIWVuYWJsZWQgPT09ICF0aGlzLl9mcmFtZU92ZXJ2 aWV3KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBpZiAoZW5hYmxlZCkgewotICAgICAg ICAgICAgdGhpcy5fZnJhbWVPdmVydmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVGcmFt ZU92ZXJ2aWV3KHRoaXMuX21vZGVsKTsKLSAgICAgICAgICAgIHRoaXMuX2ZyYW1lT3ZlcnZpZXcu c2hvdyh0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICB0aGlzLl9mcmFtZU92ZXJ2aWV3LmRldGFjaCgpOwotICAgICAgICAgICAgdGhpcy5f ZnJhbWVPdmVydmlldyA9IG51bGw7Ci0gICAgICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2hv d0l0ZW1zR3JhcGhzRWxlbWVudCgpOwotICAgICAgICAgICAgdGhpcy5fZXZlbnRPdmVydmlldy51 cGRhdGUoKTsKKyAgICAgICAgc3dpdGNoICh0aGlzLl9jdXJyZW50TW9kZSkgeworICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2RlLkV2ZW50czoKKyAgICAg ICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldyh0aGlz Ll9tb2RlbCk7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5l Lk1vZGUuRnJhbWVzOgorICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVGltZWxp bmVGcmFtZU92ZXJ2aWV3KHRoaXMuX21vZGVsKTsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld1BhbmUuTW9kZS5NZW1vcnk6CisgICAgICAgICAgICByZXR1cm4gbmV3 IFdlYkluc3BlY3Rvci5UaW1lbGluZU1lbW9yeU92ZXJ2aWV3KHRoaXMuX21vZGVsKTsKICAgICAg ICAgfQorICAgICAgICByZXR1cm4gbnVsbDsKICAgICB9LAogCiAgICAgX29uQ2F0ZWdvcnlWaXNp YmlsaXR5Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICBpZiAodGhpcy5f Y3VycmVudE1vZGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2RlLkV2 ZW50cykKLSAgICAgICAgICAgIHRoaXMuX2V2ZW50T3ZlcnZpZXcudXBkYXRlKCk7CisgICAgICAg IHRoaXMuX292ZXJ2aWV3Q29udHJvbC5jYXRlZ29yeVZpc2liaWxpdHlDaGFuZ2VkKCk7CiAgICAg fSwKIAogICAgIF91cGRhdGU6IGZ1bmN0aW9uKCkKQEAgLTE3MCwxMyArMTYxLDcgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f b3ZlcnZpZXdDYWxjdWxhdG9yLnNldFdpbmRvdyh0aGlzLl9tb2RlbC5taW5pbXVtUmVjb3JkVGlt ZSgpLCB0aGlzLl9tb2RlbC5tYXhpbXVtUmVjb3JkVGltZSgpKTsKICAgICAgICAgdGhpcy5fb3Zl cnZpZXdDYWxjdWxhdG9yLnNldERpc3BsYXlXaW5kb3coMCwgdGhpcy5fb3ZlcnZpZXdHcmlkLmNs aWVudFdpZHRoKCkpOwogCi0gICAgICAgIGlmICh0aGlzLl9tZW1vcnlPdmVydmlldy5pc1Nob3dp bmcoKSkKLSAgICAgICAgICAgIHRoaXMuX21lbW9yeU92ZXJ2aWV3LnVwZGF0ZSgpOwotICAgICAg ICBlbHNlIGlmICh0aGlzLl9mcmFtZU92ZXJ2aWV3KQotICAgICAgICAgICAgdGhpcy5fZnJhbWVP dmVydmlldy51cGRhdGUoKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fZXZlbnRP dmVydmlldy51cGRhdGUoKTsKLQorICAgICAgICB0aGlzLl9vdmVydmlld0NvbnRyb2wudXBkYXRl KCk7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC51cGRhdGVEaXZpZGVycyh0aGlzLl9vdmVy dmlld0NhbGN1bGF0b3IpOwogICAgICAgICB0aGlzLl91cGRhdGVFdmVudERpdmlkZXJzKCk7CiAg ICAgfSwKQEAgLTIxNCw3ICsxOTksNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1Bh bmUucHJvdG90eXBlID0gewogICAgICAqLwogICAgIGFkZEZyYW1lOiBmdW5jdGlvbihmcmFtZSkK ICAgICB7Ci0gICAgICAgIHRoaXMuX2ZyYW1lT3ZlcnZpZXcuYWRkRnJhbWUoZnJhbWUpOworICAg ICAgICB0aGlzLl9vdmVydmlld0NvbnRyb2wuYWRkRnJhbWUoZnJhbWUpOwogICAgICAgICB0aGlz Ll9zY2hlZHVsZVJlZnJlc2goKTsKICAgICB9LAogCkBAIC0yMjMsNyArMjA4LDggQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICB6 b29tVG9GcmFtZTogZnVuY3Rpb24oZnJhbWUpCiAgICAgewotICAgICAgICB2YXIgd2luZG93ID0g dGhpcy5fZnJhbWVPdmVydmlldy5mcmFtZVBvc2l0aW9uKGZyYW1lKTsKKyAgICAgICAgdmFyIGZy YW1lT3ZlcnZpZXcgPSAvKiogQHR5cGUgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRnJhbWVPdmVydmll dyAqLyAodGhpcy5fb3ZlcnZpZXdDb250cm9sKTsKKyAgICAgICAgdmFyIHdpbmRvdyA9IGZyYW1l T3ZlcnZpZXcuZnJhbWVQb3NpdGlvbihmcmFtZSk7CiAgICAgICAgIGlmICghd2luZG93KQogICAg ICAgICAgICAgcmV0dXJuOwogCkBAIC0yNTEsOCArMjM3LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmlk LnJlc2V0KCk7CiAgICAgICAgIHRoaXMuX2V2ZW50RGl2aWRlcnMgPSBbXTsKICAgICAgICAgdGhp cy5fb3ZlcnZpZXdHcmlkLnVwZGF0ZURpdmlkZXJzKHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvcik7 Ci0gICAgICAgIGlmICh0aGlzLl9mcmFtZU92ZXJ2aWV3KQotICAgICAgICAgICAgdGhpcy5fZnJh bWVPdmVydmlldy5yZXNldCgpOworICAgICAgICB0aGlzLl9vdmVydmlld0NvbnRyb2wucmVzZXQo KTsKICAgICAgICAgdGhpcy5fdXBkYXRlKCk7CiAgICAgfSwKIApAQCAtMjgwLDE2ICsyNjUsOSBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogICAgIHsK ICAgICAgICAgaWYgKHRoaXMuX2lnbm9yZVdpbmRvd0NoYW5nZWRFdmVudCkKICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgaWYgKHRoaXMuX2ZyYW1lT3ZlcnZpZXcpIHsKLSAgICAgICAgICAg IHZhciB0aW1lcyA9IHRoaXMuX2ZyYW1lT3ZlcnZpZXcuZ2V0V2luZG93VGltZXModGhpcy53aW5k b3dMZWZ0KCksIHRoaXMud2luZG93UmlnaHQoKSk7Ci0gICAgICAgICAgICB0aGlzLl93aW5kb3dT dGFydFRpbWUgPSB0aW1lcy5zdGFydFRpbWU7Ci0gICAgICAgICAgICB0aGlzLl93aW5kb3dFbmRU aW1lID0gdGltZXMuZW5kVGltZTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHZhciBh YnNvbHV0ZU1pbiA9IHRoaXMuX21vZGVsLm1pbmltdW1SZWNvcmRUaW1lKCk7Ci0gICAgICAgICAg ICB2YXIgYWJzb2x1dGVNYXggPSB0aGlzLl9tb2RlbC5tYXhpbXVtUmVjb3JkVGltZSgpOwotICAg ICAgICAgICAgdGhpcy5fd2luZG93U3RhcnRUaW1lID0gYWJzb2x1dGVNaW4gKyAoYWJzb2x1dGVN YXggLSBhYnNvbHV0ZU1pbikgKiB0aGlzLndpbmRvd0xlZnQoKTsKLSAgICAgICAgICAgIHRoaXMu X3dpbmRvd0VuZFRpbWUgPSBhYnNvbHV0ZU1pbiArIChhYnNvbHV0ZU1heCAtIGFic29sdXRlTWlu KSAqIHRoaXMud2luZG93UmlnaHQoKTsKLSAgICAgICAgfQorICAgICAgICB2YXIgdGltZXMgPSB0 aGlzLl9vdmVydmlld0NvbnRyb2wuZ2V0V2luZG93VGltZXModGhpcy53aW5kb3dMZWZ0KCksIHRo aXMud2luZG93UmlnaHQoKSk7CisgICAgICAgIHRoaXMuX3dpbmRvd1N0YXJ0VGltZSA9IHRpbWVz LnN0YXJ0VGltZTsKKyAgICAgICAgdGhpcy5fd2luZG93RW5kVGltZSA9IHRpbWVzLmVuZFRpbWU7 CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1l bGluZU92ZXJ2aWV3UGFuZS5FdmVudHMuV2luZG93Q2hhbmdlZCk7CiAgICAgfSwKIApAQCAtNDE1 LDcgKzM5MywyOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0Jhc2UgPSBmdW5jdGlv bihtb2RlbCkKIH0KIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlLnByb3RvdHlw ZSA9IHsKLSAgICB1cGRhdGU6IGZ1bmN0aW9uKCkge30sCisgICAgdXBkYXRlOiBmdW5jdGlvbigp IHsgfSwKKyAgICByZXNldDogZnVuY3Rpb24oKSB7IH0sCisKKyAgICBjYXRlZ29yeVZpc2liaWxp dHlDaGFuZ2VkOiBmdW5jdGlvbigpIHsgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlRpbWVsaW5lRnJhbWV9IGZyYW1lCisgICAgICovCisgICAgYWRkRnJhbWU6IGZ1 bmN0aW9uKGZyYW1lKSB7IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gd2lu ZG93TGVmdAorICAgICAqIEBwYXJhbSB7bnVtYmVyfSB3aW5kb3dSaWdodAorICAgICAqLworICAg IGdldFdpbmRvd1RpbWVzOiBmdW5jdGlvbih3aW5kb3dMZWZ0LCB3aW5kb3dSaWdodCkKKyAgICB7 CisgICAgICAgIHZhciBhYnNvbHV0ZU1pbiA9IHRoaXMuX21vZGVsLm1pbmltdW1SZWNvcmRUaW1l KCk7CisgICAgICAgIHZhciBhYnNvbHV0ZU1heCA9IHRoaXMuX21vZGVsLm1heGltdW1SZWNvcmRU aW1lKCk7CisgICAgICAgIHJldHVybiB7CisgICAgICAgICAgICBzdGFydFRpbWU6IGFic29sdXRl TWluICsgKGFic29sdXRlTWF4IC0gYWJzb2x1dGVNaW4pICogd2luZG93TGVmdCwKKyAgICAgICAg ICAgIGVuZFRpbWU6IGFic29sdXRlTWluICsgKGFic29sdXRlTWF4IC0gYWJzb2x1dGVNaW4pICog d2luZG93UmlnaHQKKyAgICAgICAgfTsKKyAgICB9LAogCiAgICAgX19wcm90b19fOiBXZWJJbnNw ZWN0b3IuVmlldy5wcm90b3R5cGUKIH0KQEAgLTUyNiw2ICs1MjYsNyBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVFdmVudE92ZXJ2aWV3ID0gZnVuY3Rpb24obW9kZWwpCiB7CiAgICAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlLmNhbGwodGhpcywgbW9kZWwpOwogCisgICAgdGhpcy5l bGVtZW50LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3LWV2ZW50cyI7CiAgICAgdGhpcy5fY29udGV4 dCA9IHRoaXMuX2NhbnZhcy5nZXRDb250ZXh0KCIyZCIpOwogCiAgICAgdGhpcy5fZmlsbFN0eWxl cyA9IHt9OwpAQCAtNTk1LDYgKzU5NiwxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVFdmVudE92 ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKKyAgICBjYXRlZ29yeVZp c2liaWxpdHlDaGFuZ2VkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLnVwZGF0ZSgp OworICAgIH0sCisKICAgICBfcmVuZGVyQmFyOiBmdW5jdGlvbihiZWdpbiwgZW5kLCBjYXRlZ29y eSkKICAgICB7CiAgICAgICAgIHZhciB4ID0gYmVnaW4gKyAwLjU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFuZWwuY3NzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVsLmNzcwppbmRleCBhY2U0 NjU0NTMzZGMzM2RlNGU1OTkxNjdlZmVjMjE0ZjllZWU3NDBlLi5iNGFmODZmMTEzMmEzYTc4Mjdm NjA3MmMxOTIzNjY2YjcxMTEzNzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3MKQEAgLTI0OSw3ICsyNDksNyBAQAogICAg IGNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuNyk7CiB9CiAKLSN0aW1lbGluZS1vdmVydmlldy10aW1l bGluZXMsCisjdGltZWxpbmUtb3ZlcnZpZXctZXZlbnRzLAogI3RpbWVsaW5lLW92ZXJ2aWV3LW1l bW9yeSB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGxlZnQ6IDA7Cg==