123356 2013-10-25 13:14:46 -0700 Web Inspector: Change how the load and content ready event timestamps are tracked. 2014-01-20 18:59:49 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy graouts joepeck timothy webkit-bug-importer oldest_to_newest 943713 0 timothy 2013-10-25 13:14:46 -0700 We should track the timestamps per frame. This will be needed by some up coming Timeline changes. 943714 1 webkit-bug-importer 2013-10-25 13:14:56 -0700 <rdar://problem/15322597> 943719 2 215202 timothy 2013-10-25 13:16:50 -0700 Created attachment 215202 Patch 943731 3 215207 timothy 2013-10-25 13:37:03 -0700 Created attachment 215207 Patch 943791 4 215207 joepeck 2013-10-25 15:33:30 -0700 Comment on attachment 215207 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215207&action=review r=me > Source/WebInspectorUI/UserInterface/TimelineManager.js:-61 > - return this._loadEventTime; You are removing this._loadEventTime, you can remove this instance variable from: 1. The constructor 2. _clear 3. Replace the use in _addRecord to look at the MainFrame On IRC you've handled these. 970111 5 timothy 2014-01-20 18:59:49 -0800 https://trac.webkit.org/changeset/162398 215202 2013-10-25 13:16:50 -0700 2013-10-25 13:37:01 -0700 Patch bug-123356-20131025131649.patch text/plain 7302 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi ZDRkYmE4NTZkNjYwZmNmZjNmNTY3MWRlZDQ0NTZlNjQxNTQxNjQzLi5iMjE0YjU2MWY3ODBjYzhl ZTkyM2VkNmU4MjdlZGE0NTJhZmJiZDJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxMy0xMC0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgQ2hhbmdlIGhvdyB0aGUgbG9hZCBhbmQgY29udGVudCByZWFkeSBldmVu dCB0aW1lc3RhbXBzIGFyZSB0cmFja2VkLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRGFzaGJvYXJkTWFuYWdlci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXNoYm9hcmRNYW5hZ2VyLnByb3RvdHlwZS5fdXBkYXRl VGltZSk6IFVzZSB0aGUgdGltZXN0YW1wcyBvbiB0aGUgbWFpbiBmcmFtZS4KKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0ZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZS5wcm90b3R5cGUuZ2V0IGRvbUNvbnRlbnRSZWFkeUV2 ZW50VGltZXN0YW1wKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWUucHJvdG90 eXBlLmdldCBsb2FkRXZlbnRUaW1lc3RhbXApOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5GcmFtZS5wcm90b3R5cGUubWFya0RPTUNvbnRlbnRSZWFkeUV2ZW50KTogQWRkZWQuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuRnJhbWUucHJvdG90eXBlLm1hcmtMb2FkRXZlbnQpOiBBZGRlZC4K KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lTWFuYWdlci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLmV2ZW50UmVjb3JkZWQucHJvY2Vz c1JlY29yZCk6IFVzZSBtYXJrTG9hZEV2ZW50IGFuZCBtYXJrRE9NQ29udGVudFJlYWR5RXZlbnQu CisgICAgICAgIERvIGl0IGZvciBhbGwgZnJhbWVzLCBub3QganVzdCB0aGUgbWFpbiBmcmFtZS4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLnBhZ2VEaWRM b2FkKTogQ2FsbCBtYXJrTG9hZEV2ZW50IG9uIHRoZSBGcmFtZS4KKwogMjAxMy0xMC0yMSAgQWxl eGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogW0NTUyBSZWdpb25zXSBGbG93cyBhcmUgbm90IGxvYWRpbmcgaWYgeW91IHJlZnJlc2gg dGhlIHBhZ2Ugc2V2ZXJhbCB0aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvRGFzaGJvYXJkTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Rhc2hib2FyZE1hbmFnZXIuanMKaW5kZXggMDc5NTI1YTgwYjFkMWU0 ODI1OGM2MjcxNmViNWI1MGRhNGY4YTA0ZS4uNWE1ZmY5MThlNjdjMDZmMGJlMzRlMjM3OGRkMjMy ZWZhMjQwMDA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvRGFzaGJvYXJkTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9EYXNoYm9hcmRNYW5hZ2VyLmpzCkBAIC0xMzUsMTYgKzEzNSwxNiBAQCBXZWJJbnNw ZWN0b3IuRGFzaGJvYXJkTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90 aW1lSW50ZXJ2YWxJZGVudGlmaWVyID0gc2V0SW50ZXJ2YWwodGhpcy5fdXBkYXRlVGltZS5iaW5k KHRoaXMpLCB0aGlzLl90aW1lSW50ZXJ2YWxEZWxheSk7CiAgICAgICAgIH0KIAotICAgICAgICB2 YXIgdGltZWxpbmVNYW5hZ2VyID0gV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlcjsKLSAgICAg ICAgdmFyIG1haW5GcmFtZUxvYWRFdmVudFRpbWUgPSB0aW1lbGluZU1hbmFnZXIubWFpbkZyYW1l TG9hZEV2ZW50VGltZTsKKyAgICAgICAgdmFyIG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFt ZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7CisgICAgICAgIHZhciBtYWluRnJhbWVTdGFydFRp bWUgPSBtYWluRnJhbWUubWFpblJlc291cmNlLmZpcnN0VGltZXN0YW1wOworICAgICAgICB2YXIg bWFpbkZyYW1lTG9hZEV2ZW50VGltZSA9IG1haW5GcmFtZS5sb2FkZWRUaW1lc3RhbXA7CiAKLSAg ICAgICAgaWYgKGlzTmFOKG1haW5GcmFtZUxvYWRFdmVudFRpbWUpKSB7Ci0gICAgICAgICAgICB0 aGlzLl92aWV3LnRpbWUgPSAoRGF0ZS5ub3coKSAtIHRoaXMuX3RpbWVsaW5lQmFzZVRpbWUpIC8g MTAwMDsKKyAgICAgICAgaWYgKGlzTmFOKG1haW5GcmFtZVN0YXJ0VGltZSkgfHwgaXNOYU4obWFp bkZyYW1lTG9hZEV2ZW50VGltZSkpIHsKKyAgICAgICAgICAgIHRoaXMuX3ZpZXcudGltZSA9IGR1 cmF0aW9uIC8gMTAwMDsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAg IHZhciBuZXR3b3JrUmVjb3JkcyA9IHRpbWVsaW5lTWFuYWdlci5yZWNvcmRzV2l0aFR5cGUoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29yayk7Ci0gICAgICAgIHRoaXMuX3Zp ZXcudGltZSA9IG1haW5GcmFtZUxvYWRFdmVudFRpbWUgLSBuZXR3b3JrUmVjb3Jkc1swXS5zdGFy dFRpbWU7CisgICAgICAgIHRoaXMuX3ZpZXcudGltZSA9IG1haW5GcmFtZUxvYWRFdmVudFRpbWUg LSBtYWluRnJhbWVTdGFydFRpbWU7CiAKICAgICAgICAgdGhpcy5fc3RvcFVwZGF0aW5nVGltZSgp OwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9GcmFtZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1lLmpz CmluZGV4IDU5OGZmZTEwODdjYjQyZWMyZTVhN2MxNDAzZmZjNzljMzIwY2Q2ZDguLjk2NmU1Y2I2 ZGQ3ZTc3NTE1ODA3NjI0MWE3ZGY1ODk2NjlmOTJjYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1lLmpzCkBAIC00Myw2ICs0Myw5IEBAIFdlYkluc3BlY3Rv ci5GcmFtZSA9IGZ1bmN0aW9uKGlkLCBuYW1lLCBzZWN1cml0eU9yaWdpbiwgbG9hZGVySWRlbnRp ZmllciwgbWFpblJlCiAgICAgdGhpcy5fcGFyZW50RnJhbWUgPSBudWxsOwogICAgIHRoaXMuX2lz TWFpbkZyYW1lID0gZmFsc2U7CiAKKyAgICB0aGlzLl9kb21Db250ZW50UmVhZHlFdmVudFRpbWVz dGFtcCA9IE5hTjsKKyAgICB0aGlzLl9sb2FkRXZlbnRUaW1lc3RhbXAgPSBOYU47CisKICAgICB0 aGlzLl9leGVjdXRpb25Db250ZXh0TGlzdCA9IG5ldyBXZWJJbnNwZWN0b3IuRXhlY3V0aW9uQ29u dGV4dExpc3Q7CiAKICAgICB0aGlzLmluaXRpYWxpemUobmFtZSwgc2VjdXJpdHlPcmlnaW4sIGxv YWRlcklkZW50aWZpZXIsIG1haW5SZXNvdXJjZSk7CkBAIC0yNTEsNiArMjU0LDE2IEBAIFdlYklu c3BlY3Rvci5GcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9jaGlsZEZy YW1lczsKICAgICB9LAogCisgICAgZ2V0IGRvbUNvbnRlbnRSZWFkeUV2ZW50VGltZXN0YW1wKCkK KyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9kb21Db250ZW50UmVhZHlFdmVudFRpbWVzdGFt cDsKKyAgICB9LAorCisgICAgZ2V0IGxvYWRFdmVudFRpbWVzdGFtcCgpCisgICAgeworICAgICAg ICByZXR1cm4gdGhpcy5fbG9hZEV2ZW50VGltZXN0YW1wOworICAgIH0sCisKICAgICBpc01haW5G cmFtZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2lzTWFpbkZyYW1l OwpAQCAtMjY2LDYgKzI3OSwxNiBAQCBXZWJJbnNwZWN0b3IuRnJhbWUucHJvdG90eXBlID0gewog ICAgICAgICB0aGlzLl9pc01haW5GcmFtZSA9IGZhbHNlOwogICAgIH0sCiAKKyAgICBtYXJrRE9N Q29udGVudFJlYWR5RXZlbnQ6IGZ1bmN0aW9uKHRpbWVzdGFtcCkKKyAgICB7CisgICAgICAgIHRo aXMuX2RvbUNvbnRlbnRSZWFkeUV2ZW50VGltZXN0YW1wID0gdGltZXN0YW1wIHx8IE5hTjsKKyAg ICB9LAorCisgICAgbWFya0xvYWRFdmVudDogZnVuY3Rpb24odGltZXN0YW1wKQorICAgIHsKKyAg ICAgICAgdGhpcy5fbG9hZEV2ZW50VGltZXN0YW1wID0gdGltZXN0YW1wIHx8IE5hTjsKKyAgICB9 LAorCiAgICAgaXNEZXRhY2hlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIGZyYW1l ID0gdGhpczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1RpbWVsaW5lTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1RpbWVsaW5lTWFuYWdlci5qcwppbmRleCAwMTlkNzAzOGM3ZjIwNzE5MzQzYTEzMWZjNmU3NmU1 MGQ4M2QzODNlLi5mZDgxZjk2NTQxZGUwZDMzNzdlMGYyOTBjZWY5NTBlMDM5NzFkYzUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZU1hbmFn ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVN YW5hZ2VyLmpzCkBAIC01NiwxMSArNTYsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2Vy LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3JlY29yZGluZzsKICAgICB9LAog Ci0gICAgZ2V0IG1haW5GcmFtZUxvYWRFdmVudFRpbWUoKQotICAgIHsKLSAgICAgICAgcmV0dXJu IHRoaXMuX2xvYWRFdmVudFRpbWU7Ci0gICAgfSwKLQogICAgIHN0YXJ0UmVjb3JkaW5nOiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nKQpAQCAtMTEzLDEzICsx MDgsMTcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUgPSB7CiAKICAg ICAgICAgICAgIHN3aXRjaCAocmVjb3JkLnR5cGUpIHsKICAgICAgICAgICAgIGNhc2UgVGltZWxp bmVBZ2VudC5FdmVudFR5cGUuTWFya0xvYWQ6Ci0gICAgICAgICAgICAgICAgdmFyIG1haW5GcmFt ZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7Ci0gICAgICAg ICAgICAgICAgY29uc29sZS5hc3NlcnQobWFpbkZyYW1lKTsKKyAgICAgICAgICAgICAgICBjb25z b2xlLmFzc2VydChpc05hTihlbmRUaW1lKSk7CiAKLSAgICAgICAgICAgICAgICBpZiAoIW1haW5G cmFtZSB8fCByZWNvcmQuZnJhbWVJZCAhPT0gbWFpbkZyYW1lLmlkKQorICAgICAgICAgICAgICAg IHZhciBmcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5mcmFtZUZvcklk ZW50aWZpZXIocmVjb3JkUGF5bG9hZC5mcmFtZUlkKTsKKyAgICAgICAgICAgICAgICBjb25zb2xl LmFzc2VydChmcmFtZSk7CisgICAgICAgICAgICAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgICAgICAgICB0aGlzLl9sb2FkRXZlbnRUaW1lID0g c3RhcnRUaW1lOworICAgICAgICAgICAgICAgIGZyYW1lLm1hcmtMb2FkRXZlbnQoc3RhcnRUaW1l KTsKKworICAgICAgICAgICAgICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSkKKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgICAgICB2YXIgZXZlbnRNYXJrZXIgPSBu ZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRNYXJrZXIoc3RhcnRUaW1lLCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVFdmVudE1hcmtlci5UeXBlLkxvYWRFdmVudCk7CiAgICAgICAgICAgICAgICAg dGhpcy5fZXZlbnRNYXJrZXJzLnB1c2goZXZlbnRNYXJrZXIpOwpAQCAtMTI4LDEwICsxMjcsMTYg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5cGUu TWFya0RPTUNvbnRlbnQ6Ci0gICAgICAgICAgICAgICAgdmFyIG1haW5GcmFtZSA9IFdlYkluc3Bl Y3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7Ci0gICAgICAgICAgICAgICAgY29u c29sZS5hc3NlcnQobWFpbkZyYW1lKTsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChp c05hTihlbmRUaW1lKSk7CisKKyAgICAgICAgICAgICAgICB2YXIgZnJhbWUgPSBXZWJJbnNwZWN0 b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIuZnJhbWVGb3JJZGVudGlmaWVyKHJlY29yZFBheWxvYWQu ZnJhbWVJZCk7CisgICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoZnJhbWUpOworICAgICAg ICAgICAgICAgIGlmICghZnJhbWUpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAg ICAgICAgICAgICAgZnJhbWUubWFya0RPTUNvbnRlbnRSZWFkeUV2ZW50KHN0YXJ0VGltZSk7CiAK LSAgICAgICAgICAgICAgICBpZiAoIW1haW5GcmFtZSB8fCByZWNvcmQuZnJhbWVJZCAhPT0gbWFp bkZyYW1lLmlkKQorICAgICAgICAgICAgICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSkKICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgICAgICB2YXIgZXZlbnRNYXJr ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRNYXJrZXIoc3RhcnRUaW1lLCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVFdmVudE1hcmtlci5UeXBlLkRPTUNvbnRlbnRFdmVudCk7CkBAIC0y NzgsOCArMjgzLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUgPSB7 CiAKICAgICBwYWdlRGlkTG9hZDogZnVuY3Rpb24odGltZXN0YW1wKQogICAgIHsKLSAgICAgICAg aWYgKGlzTmFOKHRoaXMuX2xvYWRFdmVudFRpbWUpKQotICAgICAgICAgICAgdGhpcy5fbG9hZEV2 ZW50VGltZSA9IHRpbWVzdGFtcDsKKyAgICAgICAgaWYgKGlzTmFOKFdlYkluc3BlY3Rvci5mcmFt ZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUubG9hZGVkVGltZXN0YW1wKSkKKyAgICAgICAgICAg IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUubWFya0xvYWRFdmVu dCh0aW1lc3RhbXApOwogICAgIH0sCiAKICAgICBvYmplY3RGb3JDb29raWU6IGZ1bmN0aW9uKGNv b2tpZSkK 215207 2013-10-25 13:37:03 -0700 2013-10-25 15:33:30 -0700 Patch bug-123356-20131025133702.patch text/plain 7308 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi ZDRkYmE4NTZkNjYwZmNmZjNmNTY3MWRlZDQ0NTZlNjQxNTQxNjQzLi5iMjE0YjU2MWY3ODBjYzhl ZTkyM2VkNmU4MjdlZGE0NTJhZmJiZDJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxMy0xMC0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgQ2hhbmdlIGhvdyB0aGUgbG9hZCBhbmQgY29udGVudCByZWFkeSBldmVu dCB0aW1lc3RhbXBzIGFyZSB0cmFja2VkLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRGFzaGJvYXJkTWFuYWdlci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXNoYm9hcmRNYW5hZ2VyLnByb3RvdHlwZS5fdXBkYXRl VGltZSk6IFVzZSB0aGUgdGltZXN0YW1wcyBvbiB0aGUgbWFpbiBmcmFtZS4KKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0ZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZS5wcm90b3R5cGUuZ2V0IGRvbUNvbnRlbnRSZWFkeUV2 ZW50VGltZXN0YW1wKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWUucHJvdG90 eXBlLmdldCBsb2FkRXZlbnRUaW1lc3RhbXApOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5GcmFtZS5wcm90b3R5cGUubWFya0RPTUNvbnRlbnRSZWFkeUV2ZW50KTogQWRkZWQuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuRnJhbWUucHJvdG90eXBlLm1hcmtMb2FkRXZlbnQpOiBBZGRlZC4K KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lTWFuYWdlci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLmV2ZW50UmVjb3JkZWQucHJvY2Vz c1JlY29yZCk6IFVzZSBtYXJrTG9hZEV2ZW50IGFuZCBtYXJrRE9NQ29udGVudFJlYWR5RXZlbnQu CisgICAgICAgIERvIGl0IGZvciBhbGwgZnJhbWVzLCBub3QganVzdCB0aGUgbWFpbiBmcmFtZS4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLnBhZ2VEaWRM b2FkKTogQ2FsbCBtYXJrTG9hZEV2ZW50IG9uIHRoZSBGcmFtZS4KKwogMjAxMy0xMC0yMSAgQWxl eGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogW0NTUyBSZWdpb25zXSBGbG93cyBhcmUgbm90IGxvYWRpbmcgaWYgeW91IHJlZnJlc2gg dGhlIHBhZ2Ugc2V2ZXJhbCB0aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvRGFzaGJvYXJkTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Rhc2hib2FyZE1hbmFnZXIuanMKaW5kZXggMDc5NTI1YTgwYjFkMWU0 ODI1OGM2MjcxNmViNWI1MGRhNGY4YTA0ZS4uYmMyMWUxMTIzYzEzNzgwZmFjNThmZDU5NzM1ZTM5 ZGM5YmE0NzQ3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvRGFzaGJvYXJkTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9EYXNoYm9hcmRNYW5hZ2VyLmpzCkBAIC0xMzUsMTYgKzEzNSwxNiBAQCBXZWJJbnNw ZWN0b3IuRGFzaGJvYXJkTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90 aW1lSW50ZXJ2YWxJZGVudGlmaWVyID0gc2V0SW50ZXJ2YWwodGhpcy5fdXBkYXRlVGltZS5iaW5k KHRoaXMpLCB0aGlzLl90aW1lSW50ZXJ2YWxEZWxheSk7CiAgICAgICAgIH0KIAotICAgICAgICB2 YXIgdGltZWxpbmVNYW5hZ2VyID0gV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlcjsKLSAgICAg ICAgdmFyIG1haW5GcmFtZUxvYWRFdmVudFRpbWUgPSB0aW1lbGluZU1hbmFnZXIubWFpbkZyYW1l TG9hZEV2ZW50VGltZTsKKyAgICAgICAgdmFyIG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFt ZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7CisgICAgICAgIHZhciBtYWluRnJhbWVTdGFydFRp bWUgPSBtYWluRnJhbWUubWFpblJlc291cmNlLmZpcnN0VGltZXN0YW1wOworICAgICAgICB2YXIg bWFpbkZyYW1lTG9hZEV2ZW50VGltZSA9IG1haW5GcmFtZS5sb2FkRXZlbnRUaW1lc3RhbXA7CiAK LSAgICAgICAgaWYgKGlzTmFOKG1haW5GcmFtZUxvYWRFdmVudFRpbWUpKSB7Ci0gICAgICAgICAg ICB0aGlzLl92aWV3LnRpbWUgPSAoRGF0ZS5ub3coKSAtIHRoaXMuX3RpbWVsaW5lQmFzZVRpbWUp IC8gMTAwMDsKKyAgICAgICAgaWYgKGlzTmFOKG1haW5GcmFtZVN0YXJ0VGltZSkgfHwgaXNOYU4o bWFpbkZyYW1lTG9hZEV2ZW50VGltZSkpIHsKKyAgICAgICAgICAgIHRoaXMuX3ZpZXcudGltZSA9 IGR1cmF0aW9uIC8gMTAwMDsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAg ICAgIHZhciBuZXR3b3JrUmVjb3JkcyA9IHRpbWVsaW5lTWFuYWdlci5yZWNvcmRzV2l0aFR5cGUo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29yayk7Ci0gICAgICAgIHRoaXMu X3ZpZXcudGltZSA9IG1haW5GcmFtZUxvYWRFdmVudFRpbWUgLSBuZXR3b3JrUmVjb3Jkc1swXS5z dGFydFRpbWU7CisgICAgICAgIHRoaXMuX3ZpZXcudGltZSA9IG1haW5GcmFtZUxvYWRFdmVudFRp bWUgLSBtYWluRnJhbWVTdGFydFRpbWU7CiAKICAgICAgICAgdGhpcy5fc3RvcFVwZGF0aW5nVGlt ZSgpOwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9GcmFtZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1l LmpzCmluZGV4IDU5OGZmZTEwODdjYjQyZWMyZTVhN2MxNDAzZmZjNzljMzIwY2Q2ZDguLjk2NmU1 Y2I2ZGQ3ZTc3NTE1ODA3NjI0MWE3ZGY1ODk2NjlmOTJjYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ZyYW1lLmpzCkBAIC00Myw2ICs0Myw5IEBAIFdlYkluc3Bl Y3Rvci5GcmFtZSA9IGZ1bmN0aW9uKGlkLCBuYW1lLCBzZWN1cml0eU9yaWdpbiwgbG9hZGVySWRl bnRpZmllciwgbWFpblJlCiAgICAgdGhpcy5fcGFyZW50RnJhbWUgPSBudWxsOwogICAgIHRoaXMu X2lzTWFpbkZyYW1lID0gZmFsc2U7CiAKKyAgICB0aGlzLl9kb21Db250ZW50UmVhZHlFdmVudFRp bWVzdGFtcCA9IE5hTjsKKyAgICB0aGlzLl9sb2FkRXZlbnRUaW1lc3RhbXAgPSBOYU47CisKICAg ICB0aGlzLl9leGVjdXRpb25Db250ZXh0TGlzdCA9IG5ldyBXZWJJbnNwZWN0b3IuRXhlY3V0aW9u Q29udGV4dExpc3Q7CiAKICAgICB0aGlzLmluaXRpYWxpemUobmFtZSwgc2VjdXJpdHlPcmlnaW4s IGxvYWRlcklkZW50aWZpZXIsIG1haW5SZXNvdXJjZSk7CkBAIC0yNTEsNiArMjU0LDE2IEBAIFdl Ykluc3BlY3Rvci5GcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9jaGls ZEZyYW1lczsKICAgICB9LAogCisgICAgZ2V0IGRvbUNvbnRlbnRSZWFkeUV2ZW50VGltZXN0YW1w KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9kb21Db250ZW50UmVhZHlFdmVudFRpbWVz dGFtcDsKKyAgICB9LAorCisgICAgZ2V0IGxvYWRFdmVudFRpbWVzdGFtcCgpCisgICAgeworICAg ICAgICByZXR1cm4gdGhpcy5fbG9hZEV2ZW50VGltZXN0YW1wOworICAgIH0sCisKICAgICBpc01h aW5GcmFtZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2lzTWFpbkZy YW1lOwpAQCAtMjY2LDYgKzI3OSwxNiBAQCBXZWJJbnNwZWN0b3IuRnJhbWUucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLl9pc01haW5GcmFtZSA9IGZhbHNlOwogICAgIH0sCiAKKyAgICBtYXJr RE9NQ29udGVudFJlYWR5RXZlbnQ6IGZ1bmN0aW9uKHRpbWVzdGFtcCkKKyAgICB7CisgICAgICAg IHRoaXMuX2RvbUNvbnRlbnRSZWFkeUV2ZW50VGltZXN0YW1wID0gdGltZXN0YW1wIHx8IE5hTjsK KyAgICB9LAorCisgICAgbWFya0xvYWRFdmVudDogZnVuY3Rpb24odGltZXN0YW1wKQorICAgIHsK KyAgICAgICAgdGhpcy5fbG9hZEV2ZW50VGltZXN0YW1wID0gdGltZXN0YW1wIHx8IE5hTjsKKyAg ICB9LAorCiAgICAgaXNEZXRhY2hlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIGZy YW1lID0gdGhpczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1RpbWVsaW5lTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1RpbWVsaW5lTWFuYWdlci5qcwppbmRleCAwMTlkNzAzOGM3ZjIwNzE5MzQzYTEzMWZjNmU3 NmU1MGQ4M2QzODNlLi44Y2VmYWVjN2EzYTk0Yzg4OWVkNGJlNjgwMTMwYjZmYWIxMmMwZWJhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZU1h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxp bmVNYW5hZ2VyLmpzCkBAIC01NiwxMSArNTYsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5h Z2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3JlY29yZGluZzsKICAgICB9 LAogCi0gICAgZ2V0IG1haW5GcmFtZUxvYWRFdmVudFRpbWUoKQotICAgIHsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX2xvYWRFdmVudFRpbWU7Ci0gICAgfSwKLQogICAgIHN0YXJ0UmVjb3JkaW5nOiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nKQpAQCAtMTEzLDEz ICsxMDgsMTcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUgPSB7CiAK ICAgICAgICAgICAgIHN3aXRjaCAocmVjb3JkLnR5cGUpIHsKICAgICAgICAgICAgIGNhc2UgVGlt ZWxpbmVBZ2VudC5FdmVudFR5cGUuTWFya0xvYWQ6Ci0gICAgICAgICAgICAgICAgdmFyIG1haW5G cmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7Ci0gICAg ICAgICAgICAgICAgY29uc29sZS5hc3NlcnQobWFpbkZyYW1lKTsKKyAgICAgICAgICAgICAgICBj b25zb2xlLmFzc2VydChpc05hTihlbmRUaW1lKSk7CiAKLSAgICAgICAgICAgICAgICBpZiAoIW1h aW5GcmFtZSB8fCByZWNvcmQuZnJhbWVJZCAhPT0gbWFpbkZyYW1lLmlkKQorICAgICAgICAgICAg ICAgIHZhciBmcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5mcmFtZUZv cklkZW50aWZpZXIocmVjb3JkUGF5bG9hZC5mcmFtZUlkKTsKKyAgICAgICAgICAgICAgICBjb25z b2xlLmFzc2VydChmcmFtZSk7CisgICAgICAgICAgICAgICAgaWYgKCFmcmFtZSkKICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgICAgICAgICB0aGlzLl9sb2FkRXZlbnRUaW1l ID0gc3RhcnRUaW1lOworICAgICAgICAgICAgICAgIGZyYW1lLm1hcmtMb2FkRXZlbnQoc3RhcnRU aW1lKTsKKworICAgICAgICAgICAgICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSkKKyAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgICAgICB2YXIgZXZlbnRNYXJrZXIg PSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRNYXJrZXIoc3RhcnRUaW1lLCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVFdmVudE1hcmtlci5UeXBlLkxvYWRFdmVudCk7CiAgICAgICAgICAgICAg ICAgdGhpcy5fZXZlbnRNYXJrZXJzLnB1c2goZXZlbnRNYXJrZXIpOwpAQCAtMTI4LDEwICsxMjcs MTYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgIGNhc2UgVGltZWxpbmVBZ2VudC5FdmVudFR5 cGUuTWFya0RPTUNvbnRlbnQ6Ci0gICAgICAgICAgICAgICAgdmFyIG1haW5GcmFtZSA9IFdlYklu c3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWU7Ci0gICAgICAgICAgICAgICAg Y29uc29sZS5hc3NlcnQobWFpbkZyYW1lKTsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2Vy dChpc05hTihlbmRUaW1lKSk7CisKKyAgICAgICAgICAgICAgICB2YXIgZnJhbWUgPSBXZWJJbnNw ZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIuZnJhbWVGb3JJZGVudGlmaWVyKHJlY29yZFBheWxv YWQuZnJhbWVJZCk7CisgICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoZnJhbWUpOworICAg ICAgICAgICAgICAgIGlmICghZnJhbWUpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworCisg ICAgICAgICAgICAgICAgZnJhbWUubWFya0RPTUNvbnRlbnRSZWFkeUV2ZW50KHN0YXJ0VGltZSk7 CiAKLSAgICAgICAgICAgICAgICBpZiAoIW1haW5GcmFtZSB8fCByZWNvcmQuZnJhbWVJZCAhPT0g bWFpbkZyYW1lLmlkKQorICAgICAgICAgICAgICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSkK ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgICAgICB2YXIgZXZlbnRN YXJrZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRNYXJrZXIoc3RhcnRUaW1lLCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVFdmVudE1hcmtlci5UeXBlLkRPTUNvbnRlbnRFdmVudCk7CkBA IC0yNzgsOCArMjgzLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUg PSB7CiAKICAgICBwYWdlRGlkTG9hZDogZnVuY3Rpb24odGltZXN0YW1wKQogICAgIHsKLSAgICAg ICAgaWYgKGlzTmFOKHRoaXMuX2xvYWRFdmVudFRpbWUpKQotICAgICAgICAgICAgdGhpcy5fbG9h ZEV2ZW50VGltZSA9IHRpbWVzdGFtcDsKKyAgICAgICAgaWYgKGlzTmFOKFdlYkluc3BlY3Rvci5m cmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUubG9hZEV2ZW50VGltZXN0YW1wKSkKKyAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUubWFya0xv YWRFdmVudCh0aW1lc3RhbXApOwogICAgIH0sCiAKICAgICBvYmplY3RGb3JDb29raWU6IGZ1bmN0 aW9uKGNvb2tpZSkK