123366 2013-10-25 15:36:29 -0700 Web Inspector: Add support for multiple Timeline recordings 2014-01-20 19:00:17 -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 943792 0 timothy 2013-10-25 15:36:29 -0700 Make it possible to record more than one timeline. 943793 1 webkit-bug-importer 2013-10-25 15:36:46 -0700 <rdar://problem/15324161> 943794 2 215222 timothy 2013-10-25 15:42:30 -0700 Created attachment 215222 Patch 944143 3 215222 joepeck 2013-10-28 10:29:52 -0700 Comment on attachment 215222 Patch r=me 970113 4 timothy 2014-01-20 19:00:17 -0800 https://trac.webkit.org/changeset/162400 215222 2013-10-25 15:42:30 -0700 2013-10-28 10:29:51 -0700 Patch bug-123366-20131025154229.patch text/plain 15249 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 YTc5ZjM2NDA5ZjRiYWE0NjUxNTg3MzlmYTBhMTkxZjY3ZTEwY2ZhLi44MGUzMzFlYjA4ZDcxMzU5 OGM3NDkzNjMwODc5ZmYyMGMzODgxYjJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzOSBAQAogMjAxMy0xMC0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIG11bHRpcGxlIFRpbWVsaW5lIHJlY29yZGlu Z3MuCisKKyAgICAgICAgV2UgYWxzbyBkb24ndCBleHBsaWNpdGx5IGFkZCBSZXNvdXJjZVRpbWVs aW5lUmVjb3JkcyBhbnltb3JlLiBUaGVzZSB3aWxsIGJlIHRyYWNrZWQgYXV0b21hdGljYWxseSBp biBhIGxhdGVyIHBhdGNoLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjMzNjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRGFzaGJvYXJkTWFuYWdlci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EYXNoYm9hcmRNYW5hZ2VyLnByb3RvdHlwZS5fbWFpblJlc291cmNlRGlk Q2hhbmdlKTogQ2hlY2sgZm9yIGN1cnJlbnRSZWNvcmRpbmcuCisgICAgICAgICogVXNlckludGVy ZmFjZS9JbnNwZWN0b3JGcm9udGVuZEFQSS5qczoKKyAgICAgICAgKEluc3BlY3RvckZyb250ZW5k QVBJLmlzVGltZWxpbmVQcm9maWxpbmdFbmFibGVkKTogQ2hlY2sgZm9yIGN1cnJlbnRSZWNvcmRp bmcuCisgICAgICAgICogVXNlckludGVyZmFjZS9NYWluLmh0bWw6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVNYW5hZ2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90 eXBlLmdldCBjdXJyZW50UmVjb3JkaW5nKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5zdGFydFJlY29yZGluZyk6IE1ha2UgYSBuZXcgcmVj b3JkaW5nIGFuZCBwdXNoIGl0IG9udG8gdGhlIHJlY29yZGluZyBhcnJheS4KKyAgICAgICAgQWRk IHRoZSBjdXJyZW50IHJlY29yZGluZyB0byB0aGUgZXZlbnQuCisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5zdG9wUmVjb3JkaW5nKTogQWRkIHRoZSBjdXJy ZW50IHJlY29yZGluZyB0byB0aGUgZXZlbnQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVNYW5hZ2VyLnByb3RvdHlwZS5ldmVudFJlY29yZGVkLnByb2Nlc3NSZWNvcmQpOiBDaGVjayBm b3IgY3VycmVudFJlY29yZGluZy4gQWRkIHRoZSBtYXJrZXJzCisgICAgICAgIHRvIHRoZSBjdXJy ZW50IHJlY29yZGluZy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJv dG90eXBlLl9hZGRSZWNvcmQpOiBBZGQgdGhlIHJlY29yZCB0byB0aGUgY3VycmVudCByZWNvcmRp bmcuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5fc3Rh cnRBdXRvUmVjb3JkaW5nKTogQ2xlYW4gdXAuIERvbid0IGFkZCBSZXNvdXJjZVRpbWVsaW5lUmVj b3JkLiBDbGVhciByZWNvcmRpbmdzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFu YWdlci5wcm90b3R5cGUuX3N0b3BBdXRvUmVjb3JkaW5nU29vbik6IENoZWNrIGZvciBfY3VycmVu dFJlY29yZGluZy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90 eXBlLl9yZXNldEF1dG9SZWNvcmRpbmdEZWFkVGltZVRpbWVvdXQpOiBEaXR0by4KKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLl9tYWluUmVzb3VyY2VEaWRD aGFuZ2UpOiBEb24ndCBhZGQgUmVzb3VyY2VUaW1lbGluZVJlY29yZCBhbnltb3JlLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUuX3Jlc291cmNlV2FzQWRk ZWQpOiBSZW1vdmVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGltZWxpbmVSZWNvcmRpbmcu anM6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nKTogQWRk ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcucHJvdG90eXBlLmFk ZEV2ZW50TWFya2VyKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmRpbmcucHJvdG90eXBlLmFkZFJlY29yZCk6IEFkZGVkLgorCisyMDEzLTEwLTI1ICBUaW1vdGh5 IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwogICAgICAgICBUcmFjayBjYWxsRnJhbWVz IGFuZCBzb3VyY2VDb2RlTG9jYXRpb24gcGVyIFRpbWVsaW5lUmVjb3JkLgogCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzNTkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Rhc2hib2FyZE1hbmFnZXIuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXNoYm9hcmRNYW5hZ2VyLmpz CmluZGV4IGJjMjFlMTEyM2MxMzc4MGZhYzU4ZmQ1OTczNWUzOWRjOWJhNDc0N2IuLjUxOWI2MTYy MTc0MTk3NTYxMmNiMTU0YjNmZmUzODBiNWYwNWE2NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Rhc2hib2FyZE1hbmFnZXIuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGFzaGJvYXJkTWFuYWdlci5qcwpAQCAtNjEs NyArNjEsNyBAQCBXZWJJbnNwZWN0b3IuRGFzaGJvYXJkTWFuYWdlci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuX3ZpZXcucmVzb3VyY2VzU2l6ZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291 cmNlTWFuYWdlci5tYWluRnJhbWUubWFpblJlc291cmNlLnNpemUgfHwgMDsKIAogICAgICAgICAv LyBPbmx5IHVwZGF0ZSB0aGUgdGltZSBpZiB3ZSBhcmUgcmVjb3JkaW5nIHRoZSB0aW1lbGluZS4K LSAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnJlY29yZGluZykgewor ICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuY3VycmVudFJlY29yZGlu ZykgewogICAgICAgICAgICAgdGhpcy5fdmlldy50aW1lID0gMDsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW5zcGVjdG9yRnJvbnRlbmRBUEkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcwppbmRleCAyN2UxNmM2ZjUyYTg3MWQ3 NzNiZTJmNmRjNGIwY2U2ZjlmY2Q1YjY2Li5iYTc0MTQ4NTUyZjhkMjU5ZWI5Y2IwMGYzYTZhOTM3 NjA3ODNiMWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcwpAQCAtNTEsNyArNTEsNyBAQCBJbnNw ZWN0b3JGcm9udGVuZEFQSSA9IHsKIAogICAgIGlzVGltZWxpbmVQcm9maWxpbmdFbmFibGVkOiBm dW5jdGlvbigpCiAgICAgewotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFu YWdlci5yZWNvcmRpbmc7CisgICAgICAgIHJldHVybiAhIVdlYkluc3BlY3Rvci50aW1lbGluZU1h bmFnZXIuY3VycmVudFJlY29yZGluZzsKICAgICB9LAogCiAgICAgc2V0VGltZWxpbmVQcm9maWxp bmdFbmFibGVkOiBmdW5jdGlvbihlbmFibGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTWFpbi5odG1sCmluZGV4IDVkZjcwMzQzNGY1NTQ5OWQzZjUxMDg4NjEyMmJj YzJkNTg4OWQ5ZTAuLmQ1ODMxNzdhMGY2OTkwMjUwMzAwNWI2YzA2ODIxYTg4YzYwZjE3MWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKQEAgLTE4 MSw2ICsxODEsNyBAQAogICAgIDxzY3JpcHQgc3JjPSJBcHBsaWNhdGlvbkNhY2hlT2JzZXJ2ZXIu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJUaW1lbGluZU9ic2VydmVyLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVGltZWxpbmVNYW5hZ2VyLmpzIj48L3NjcmlwdD4KKyAg ICA8c2NyaXB0IHNyYz0iVGltZWxpbmVSZWNvcmRpbmcuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJUaW1lbGluZVJlY29yZC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlRp bWVsaW5lRXZlbnRNYXJrZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJSZXNvdXJj ZVRpbWVsaW5lUmVjb3JkLmpzIj48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lTWFuYWdlci5qcwppbmRleCBiMDgwMDllYTNh OThjZDEyYzA4OTc1NTI5ZWI5YzczNGY1OTUzYzRkLi4xZWRkNjBhM2NkZjk4ZmQzYTBmZTdmZmFm NWE4MDNkZmU4M2Y5ZjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVGltZWxpbmVNYW5hZ2VyLmpzCkBAIC0yOSwxNyArMjksMTQgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lTWFuYWdlciA9IGZ1bmN0aW9uKCkKIAogICAgIFdlYkluc3BlY3Rvci5G cmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5Qcm92aXNpb25h bExvYWRTdGFydGVkLCB0aGlzLl9zdGFydEF1dG9SZWNvcmRpbmcsIHRoaXMpOwogICAgIFdlYklu c3BlY3Rvci5GcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5N YWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMuX21haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcyk7 Ci0gICAgV2ViSW5zcGVjdG9yLkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZy YW1lLkV2ZW50LlJlc291cmNlV2FzQWRkZWQsIHRoaXMuX3Jlc291cmNlV2FzQWRkZWQsIHRoaXMp OwogCi0gICAgdGhpcy5fcmVjb3JkaW5nID0gZmFsc2U7CisgICAgdGhpcy5fcmVjb3JkaW5ncyA9 IFtdOworICAgIHRoaXMuX2N1cnJlbnRSZWNvcmRpbmcgPSBudWxsOwogfTsKIAogV2ViSW5zcGVj dG9yLlRpbWVsaW5lTWFuYWdlci5FdmVudCA9IHsKLSAgICBSZWNvcmRzQ2xlYXJlZDogInRpbWVs aW5lLW1hbmFnZXItcmVjb3Jkcy1jbGVhcmVkIiwKICAgICBSZWNvcmRpbmdTdGFydGVkOiAidGlt ZWxpbmUtbWFuYWdlci1yZWNvcmRpbmctc3RhcnRlZCIsCi0gICAgUmVjb3JkaW5nU3RvcHBlZDog InRpbWVsaW5lLW1hbmFnZXItcmVjb3JkaW5nLXN0b3BwZWQiLAotICAgIFJlY29yZEFkZGVkOiAi dGltZWxpbmUtbWFuYWdlci1yZWNvcmQtYWRkZWQiLAotICAgIFJlY29yZGVkRXZlbnRNYXJrZXI6 ICJ0aW1lbGluZS1tYW5hZ2VyLXJlY29yZGVkLWV2ZW50LW1hcmtlciIsCisgICAgUmVjb3JkaW5n U3RvcHBlZDogInRpbWVsaW5lLW1hbmFnZXItcmVjb3JkaW5nLXN0b3BwZWQiCiB9OwogCiBXZWJJ bnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLk1heGltdW1BdXRvUmVjb3JkRHVyYXRpb24gPSA5MDAw MDsgLy8gOTAgc2Vjb25kcwpAQCAtNTEsMjYgKzQ4LDI3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZU1hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAgLy8gUHVibGljCiAKLSAgICBnZXQgcmVjb3Jk aW5nKCkKKyAgICBnZXQgY3VycmVudFJlY29yZGluZygpCiAgICAgewotICAgICAgICByZXR1cm4g dGhpcy5fcmVjb3JkaW5nOworICAgICAgICByZXR1cm4gdGhpcy5fY3VycmVudFJlY29yZGluZzsK ICAgICB9LAogCiAgICAgc3RhcnRSZWNvcmRpbmc6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAg IGlmICh0aGlzLl9yZWNvcmRpbmcpCisgICAgICAgIGlmICh0aGlzLl9jdXJyZW50UmVjb3JkaW5n KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3JlY29yZGluZyA9IHRydWU7 CisgICAgICAgIHRoaXMuX2N1cnJlbnRSZWNvcmRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkaW5nOworICAgICAgICB0aGlzLl9yZWNvcmRpbmdzLnB1c2godGhpcy5fY3VycmVu dFJlY29yZGluZyk7CiAKICAgICAgICAgVGltZWxpbmVBZ2VudC5zdGFydCgpOwogCi0gICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFn ZXIuRXZlbnQuUmVjb3JkaW5nU3RhcnRlZCk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIuRXZlbnQuUmVjb3JkaW5nU3Rh cnRlZCwge3JlY29yZGluZzogdGhpcy5fY3VycmVudFJlY29yZGluZ30pOwogICAgIH0sCiAKICAg ICBzdG9wUmVjb3JkaW5nOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX3Jl Y29yZGluZykKKyAgICAgICAgaWYgKCF0aGlzLl9jdXJyZW50UmVjb3JkaW5nKQogICAgICAgICAg ICAgcmV0dXJuOwogCiAgICAgICAgIGlmICh0aGlzLl9zdG9wUmVjb3JkaW5nVGltZW91dCkgewpA QCAtODUsMTcgKzgzLDE5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBl ID0gewogCiAgICAgICAgIFRpbWVsaW5lQWdlbnQuc3RvcCgpOwogCi0gICAgICAgIHRoaXMuX3Jl Y29yZGluZyA9IGZhbHNlOworICAgICAgICB2YXIgcmVjb3JkaW5nID0gdGhpcy5fY3VycmVudFJl Y29yZGluZzsKKworICAgICAgICB0aGlzLl9jdXJyZW50UmVjb3JkaW5nID0gbnVsbDsKICAgICAg ICAgdGhpcy5fYXV0b1JlY29yZGluZ01haW5SZXNvdXJjZSA9IG51bGw7CiAKLSAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5F dmVudC5SZWNvcmRpbmdTdG9wcGVkKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5FdmVudC5SZWNvcmRpbmdTdG9wcGVk LCB7cmVjb3JkaW5nOiByZWNvcmRpbmd9KTsKICAgICB9LAogCiAgICAgZXZlbnRSZWNvcmRlZDog ZnVuY3Rpb24ob3JpZ2luYWxSZWNvcmRQYXlsb2FkKQogICAgIHsKICAgICAgICAgLy8gQ2FsbGVk IGZyb20gV2ViSW5zcGVjdG9yLlRpbWVsaW5lT2JzZXJ2ZXIuCiAKLSAgICAgICAgaWYgKCF0aGlz Ll9yZWNvcmRpbmcpCisgICAgICAgIGlmICghdGhpcy5fY3VycmVudFJlY29yZGluZykKICAgICAg ICAgICAgIHJldHVybjsKIAogICAgICAgICBmdW5jdGlvbiBwcm9jZXNzUmVjb3JkKHJlY29yZFBh eWxvYWQsIHBhcmVudFJlY29yZFBheWxvYWQpCkBAIC0xMzMsOCArMTMzLDggQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwogCiAgICAgICAgICAgICAgICAgdmFyIGV2ZW50TWFya2VyID0gbmV3IFdlYkluc3BlY3Rv ci5UaW1lbGluZUV2ZW50TWFya2VyKHN0YXJ0VGltZSwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZl bnRNYXJrZXIuVHlwZS5Mb2FkRXZlbnQpOwotICAgICAgICAgICAgICAgIHRoaXMuX2V2ZW50TWFy a2Vycy5wdXNoKGV2ZW50TWFya2VyKTsKLSAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LlJlY29yZGVk RXZlbnRNYXJrZXIsIHtldmVudE1hcmtlcjogZXZlbnRNYXJrZXJ9KTsKKyAgICAgICAgICAgICAg ICB0aGlzLl9jdXJyZW50UmVjb3JkaW5nLmFkZEV2ZW50TWFya2VyKGV2ZW50TWFya2VyKTsKKwog ICAgICAgICAgICAgICAgIHRoaXMuX3N0b3BBdXRvUmVjb3JkaW5nU29vbigpOwogICAgICAgICAg ICAgICAgIGJyZWFrOwogCkBAIC0xNTIsOCArMTUyLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l TWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAg ICAgICAgICAgICAgdmFyIGV2ZW50TWFya2VyID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUV2 ZW50TWFya2VyKHN0YXJ0VGltZSwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRNYXJrZXIuVHlw ZS5ET01Db250ZW50RXZlbnQpOwotICAgICAgICAgICAgICAgIHRoaXMuX2V2ZW50TWFya2Vycy5w dXNoKGV2ZW50TWFya2VyKTsKLSAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LlJlY29yZGVkRXZlbnRN YXJrZXIsIHtldmVudE1hcmtlcjogZXZlbnRNYXJrZXJ9KTsKKyAgICAgICAgICAgICAgICB0aGlz Ll9jdXJyZW50UmVjb3JkaW5nLmFkZEV2ZW50TWFya2VyKGV2ZW50TWFya2VyKTsKICAgICAgICAg ICAgICAgICBicmVhazsKIAogICAgICAgICAgICAgY2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlw ZS5TY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbjoKQEAgLTIxNyw4ICsyMTYsNyBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgY2FzZSBU aW1lbGluZUFnZW50LkV2ZW50VHlwZS5UaW1lU3RhbXA6CiAgICAgICAgICAgICAgICAgdmFyIGV2 ZW50TWFya2VyID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50TWFya2VyKHN0YXJ0VGlt ZSwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRNYXJrZXIuVHlwZS5UaW1lU3RhbXApOwotICAg ICAgICAgICAgICAgIHRoaXMuX2V2ZW50TWFya2Vycy5wdXNoKGV2ZW50TWFya2VyKTsKLSAgICAg ICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGlt ZWxpbmVNYW5hZ2VyLkV2ZW50LlJlY29yZGVkRXZlbnRNYXJrZXIsIHtldmVudE1hcmtlcjogZXZl bnRNYXJrZXJ9KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9jdXJyZW50UmVjb3JkaW5nLmFkZEV2 ZW50TWFya2VyKGV2ZW50TWFya2VyKTsKICAgICAgICAgICAgICAgICBicmVhazsKIAogICAgICAg ICAgICAgY2FzZSBUaW1lbGluZUFnZW50LkV2ZW50VHlwZS5GdW5jdGlvbkNhbGw6CkBAIC0zMjYs NDEgKzMyNCwzOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZSA9IHsK IAogICAgIF9hZGRSZWNvcmQ6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7Ci0gICAgICAgIC8vIEZJ WE1FOiBJbXBsZW1lbnQuCisgICAgICAgIHRoaXMuX2N1cnJlbnRSZWNvcmRpbmcuYWRkUmVjb3Jk KHJlY29yZCk7CiAKICAgICAgICAgLy8gT25seSB3b3JyeSBhYm91dCBkZWFkIHRpbWUgYWZ0ZXIg dGhlIGxvYWQgZXZlbnQuCiAgICAgICAgIGlmICghaXNOYU4oV2ViSW5zcGVjdG9yLmZyYW1lUmVz b3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5sb2FkRXZlbnRUaW1lc3RhbXApKQogICAgICAgICAgICAg dGhpcy5fcmVzZXRBdXRvUmVjb3JkaW5nRGVhZFRpbWVUaW1lb3V0KCk7CiAgICAgfSwKIAotICAg IF9zdGFydEF1dG9SZWNvcmRpbmc6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9zdGFydEF1dG9SZWNv cmRpbmc6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICghZXZlbnQudGFyZ2V0LmlzTWFp bkZyYW1lKCkgfHwgKHRoaXMuX3JlY29yZGluZyAmJiAhdGhpcy5fYXV0b1JlY29yZGluZ01haW5S ZXNvdXJjZSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICh0aGlzLl9j dXJyZW50UmVjb3JkaW5nICYmICF0aGlzLl9hdXRvUmVjb3JkaW5nTWFpblJlc291cmNlKQorICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBtYWluUmVzb3VyY2UgPSBldmVudC50YXJn ZXQucHJvdmlzaW9uYWxNYWluUmVzb3VyY2UgfHwgZXZlbnQudGFyZ2V0Lm1haW5SZXNvdXJjZTsK KyAgICAgICAgdmFyIG1haW5GcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdl ci5tYWluRnJhbWU7CisgICAgICAgIHZhciBtYWluUmVzb3VyY2UgPSBtYWluRnJhbWUucHJvdmlz aW9uYWxNYWluUmVzb3VyY2UgfHwgbWFpbkZyYW1lLm1haW5SZXNvdXJjZTsKICAgICAgICAgaWYg KG1haW5SZXNvdXJjZSA9PT0gdGhpcy5fYXV0b1JlY29yZGluZ01haW5SZXNvdXJjZSkKLSAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlz LnN0b3BSZWNvcmRpbmcoKTsKIAorICAgICAgICB0aGlzLl9yZWNvcmRpbmdzID0gW107CiAgICAg ICAgIHRoaXMuX2F1dG9SZWNvcmRpbmdNYWluUmVzb3VyY2UgPSBtYWluUmVzb3VyY2U7CiAKICAg ICAgICAgdGhpcy5zdGFydFJlY29yZGluZygpOwogCi0gICAgICAgIHRoaXMuX2FkZFJlY29yZChu ZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVGltZWxpbmVSZWNvcmQobWFpblJlc291cmNlKSk7Ci0K ICAgICAgICAgaWYgKHRoaXMuX3N0b3BSZWNvcmRpbmdUaW1lb3V0KQogICAgICAgICAgICAgY2xl YXJUaW1lb3V0KHRoaXMuX3N0b3BSZWNvcmRpbmdUaW1lb3V0KTsKICAgICAgICAgdGhpcy5fc3Rv cFJlY29yZGluZ1RpbWVvdXQgPSBzZXRUaW1lb3V0KHRoaXMuc3RvcFJlY29yZGluZy5iaW5kKHRo aXMpLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLk1heGltdW1BdXRvUmVjb3JkRHVyYXRp b24pOwotCi0gICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAKICAgICBfc3RvcEF1dG9SZWNv cmRpbmdTb29uOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICAvLyBPbmx5IGF1dG8gc3RvcCB3 aGVuIGF1dG8gcmVjb3JkaW5nLgotICAgICAgICBpZiAoIXRoaXMuX3JlY29yZGluZyB8fCAhdGhp cy5fYXV0b1JlY29yZGluZ01haW5SZXNvdXJjZSkKKyAgICAgICAgaWYgKCF0aGlzLl9jdXJyZW50 UmVjb3JkaW5nIHx8ICF0aGlzLl9hdXRvUmVjb3JkaW5nTWFpblJlc291cmNlKQogICAgICAgICAg ICAgcmV0dXJuOwogCiAgICAgICAgIGlmICh0aGlzLl9zdG9wUmVjb3JkaW5nVGltZW91dCkKQEAg LTM3MSw3ICszNjcsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZSA9 IHsKICAgICBfcmVzZXRBdXRvUmVjb3JkaW5nRGVhZFRpbWVUaW1lb3V0OiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICAvLyBPbmx5IG1vbml0b3IgZGVhZCB0aW1lIHdoZW4gYXV0byByZWNvcmRp bmcuCi0gICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nIHx8ICF0aGlzLl9hdXRvUmVjb3JkaW5n TWFpblJlc291cmNlKQorICAgICAgICBpZiAoIXRoaXMuX2N1cnJlbnRSZWNvcmRpbmcgfHwgIXRo aXMuX2F1dG9SZWNvcmRpbmdNYWluUmVzb3VyY2UpCiAgICAgICAgICAgICByZXR1cm47CiAKICAg ICAgICAgaWYgKHRoaXMuX2RlYWRUaW1lVGltZW91dCkKQEAgLTM4MywzMyArMzc5LDEwIEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAg Ly8gSWdub3JlIHJlc291cmNlIGV2ZW50cyB3aGVuIHRoZXJlIGlzbid0IGEgbWFpbiBmcmFtZSB5 ZXQuIFRob3NlIGV2ZW50cyBhcmUgdHJpZ2dlcmVkIGJ5CiAgICAgICAgIC8vIGxvYWRpbmcgdGhl IGNhY2hlZCByZXNvdXJjZXMgd2hlbiB0aGUgaW5zcGVjdG9yIG9wZW5zLCBhbmQgdGhleSBkbyBu b3QgaGF2ZSB0aW1pbmcgaW5mb3JtYXRpb24uCi0gICAgICAgIGlmICghV2ViSW5zcGVjdG9yLmZy YW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAg ICAgICBpZiAodGhpcy5fc3RhcnRBdXRvUmVjb3JkaW5nKGV2ZW50KSkKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICBpZiAoIXRoaXMuX3JlY29yZGluZykKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICB2YXIgbWFpblJlc291cmNlID0gZXZlbnQudGFyZ2V0Lm1haW5SZXNvdXJj ZTsKLSAgICAgICAgaWYgKG1haW5SZXNvdXJjZSA9PT0gdGhpcy5fYXV0b1JlY29yZGluZ01haW5S ZXNvdXJjZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9hZGRSZWNvcmQo bmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZVRpbWVsaW5lUmVjb3JkKG1haW5SZXNvdXJjZSkpOwot ICAgIH0sCi0KLSAgICBfcmVzb3VyY2VXYXNBZGRlZDogZnVuY3Rpb24oZXZlbnQpCi0gICAgewot ICAgICAgICAvLyBJZ25vcmUgcmVzb3VyY2UgZXZlbnRzIHdoZW4gdGhlcmUgaXNuJ3QgYSBtYWlu IGZyYW1lIHlldC4gVGhvc2UgZXZlbnRzIGFyZSB0cmlnZ2VyZWQgYnkKLSAgICAgICAgLy8gbG9h ZGluZyB0aGUgY2FjaGVkIHJlc291cmNlcyB3aGVuIHRoZSBpbnNwZWN0b3Igb3BlbnMsIGFuZCB0 aGV5IGRvIG5vdCBoYXZlIHRpbWluZyBpbmZvcm1hdGlvbi4KLSAgICAgICAgaWYgKCFXZWJJbnNw ZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lKQotICAgICAgICAgICAgcmV0dXJu OwotCi0gICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nKQorICAgICAgICBpZiAoIVdlYkluc3Bl Y3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUgfHwgIWV2ZW50LnRhcmdldC5pc01h aW5GcmFtZSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX2FkZFJlY29y ZChuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVGltZWxpbmVSZWNvcmQoZXZlbnQuZGF0YS5yZXNv dXJjZSkpOworICAgICAgICB0aGlzLl9zdGFydEF1dG9SZWNvcmRpbmcoKTsKICAgICB9CiB9Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGlu ZVJlY29yZGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVs aW5lUmVjb3JkaW5nLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjIyOGM5NmI3OTViODc4NTMzMDZmMmY1YTNmZTQ0 YmM1MzlhZGQ0MzkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9UaW1lbGluZVJlY29yZGluZy5qcwpAQCAtMCwwICsxLDQ2IEBACisvKgorICog Q29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1 Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRh dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlv bi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElU UyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBX QVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVE IFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VM QVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElO Qy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YK KyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQ Uk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0Up CisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisg Ki8KKworV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nID0gZnVuY3Rpb24oKQoreworICAg IFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsKK307CisKK1dlYkluc3BlY3Rvci5UaW1l bGluZVJlY29yZGluZy5wcm90b3R5cGUgPSB7CisgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rv ci5UaW1lbGluZVJlY29yZGluZywKKyAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5PYmplY3Qu cHJvdG90eXBlLAorCisgICAgLy8gUHVibGljCisKKyAgICBhZGRFdmVudE1hcmtlcjogZnVuY3Rp b24oZXZlbnRNYXJrZXIpCisgICAgeworICAgICAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAg IH0sCisKKyAgICBhZGRSZWNvcmQ6IGZ1bmN0aW9uKHJlY29yZCkKKyAgICB7CisgICAgICAgIC8v IEZJWE1FOiBJbXBsZW1lbnQuCisgICAgfQorfTsK