169588 2017-03-13 22:22:42 -0700 Web Inspector: RTL: add support for Timeline ruler selections/movement 2017-03-15 12:08:03 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 168287 1 hi hi commit-queue inspector-bugzilla-changes oldest_to_newest 1287514 0 hi 2017-03-13 22:22:42 -0700 . 1287802 1 304423 hi 2017-03-14 14:44:08 -0700 Created attachment 304423 Patch 1288156 2 304423 mattbaker 2017-03-15 11:39:55 -0700 Comment on attachment 304423 Patch r=me. I have a feeling we'll want some direction-independent helper functions for tackling these types of situations in the future. 1288171 3 304423 commit-queue 2017-03-15 12:07:58 -0700 Comment on attachment 304423 Patch Clearing flags on attachment: 304423 Committed r213997: <http://trac.webkit.org/changeset/213997> 1288172 4 commit-queue 2017-03-15 12:08:03 -0700 All reviewed patches have been landed. Closing bug. 304423 2017-03-14 14:44:08 -0700 2017-03-15 12:07:58 -0700 Patch bug-169588-20170314154407.patch text/plain 12561 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZhNGYwZTM3NmQyNzc0ZmMyZjQ4Zjg0YzNjM2E4 YWYxZmM3NDU3YjUuLjM3ZjA3MThhZWViZjAxMmJiZDZiYmM2MmQwYmQ2NjEzYWJiOGY4MzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUwIEBACiAyMDE3LTAzLTE0ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJUTDogYWRkIHN1cHBvcnQgZm9yIFRpbWVsaW5lIHJ1bGVyIHNlbGVjdGlvbnMvbW92ZW1l bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTU4 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmNzczoKKyAgICAgICAgKGJvZHlbZGly PWx0cl0gLnRpbWVsaW5lLW92ZXJ2aWV3LmZyYW1lcyA+IC50aW1lbGluZS1ydWxlcjpub3QoLmJv dGgtaGFuZGxlcy1jbGFtcGVkKSA+IC5zZWxlY3Rpb24taGFuZGxlLnJpZ2h0KToKKyAgICAgICAg KGJvZHlbZGlyPXJ0bF0gLnRpbWVsaW5lLW92ZXJ2aWV3LmZyYW1lcyA+IC50aW1lbGluZS1ydWxl cjpub3QoLmJvdGgtaGFuZGxlcy1jbGFtcGVkKSA+IC5zZWxlY3Rpb24taGFuZGxlLmxlZnQpOgor ICAgICAgICAoYm9keVtkaXI9bHRyXSAudGltZWxpbmUtb3ZlcnZpZXcuZnJhbWVzID4gLnRpbWVs aW5lLXJ1bGVyOm5vdCguYm90aC1oYW5kbGVzLWNsYW1wZWQpID4gLnNoYWRlZC1hcmVhLnJpZ2h0 KToKKyAgICAgICAgKGJvZHlbZGlyPXJ0bF0gLnRpbWVsaW5lLW92ZXJ2aWV3LmZyYW1lcyA+IC50 aW1lbGluZS1ydWxlcjpub3QoLmJvdGgtaGFuZGxlcy1jbGFtcGVkKSA+IC5zaGFkZWQtYXJlYS5s ZWZ0KToKKyAgICAgICAgKC50aW1lbGluZS1vdmVydmlldy5mcmFtZXMgPiAudGltZWxpbmUtcnVs ZXI6bm90KC5ib3RoLWhhbmRsZXMtY2xhbXBlZCkgPiAuc2VsZWN0aW9uLWhhbmRsZS5yaWdodCk6 IERlbGV0ZWQuCisgICAgICAgICgudGltZWxpbmUtb3ZlcnZpZXcuZnJhbWVzID4gLnRpbWVsaW5l LXJ1bGVyOm5vdCguYm90aC1oYW5kbGVzLWNsYW1wZWQpID4gLnNoYWRlZC1hcmVhLnJpZ2h0KTog RGVsZXRlZC4KKyAgICAgICAgRml4ZXMgYWxpZ25tZW50IG9mIHNlbGVjdGlvbiBoYW5kbGVzIHdo ZW4gaW4gRnJhbWVzIHZpZXcuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lT3ZlcnZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5w cm90b3R5cGUuX2hhbmRsZVNjcm9sbEV2ZW50KToKKyAgICAgICAgU3VwcG9ydCBob3Jpem9udGFs IHNjcm9sbGluZyBpbiB0aW1lbGluZXMgYnkgdHJlYXRpbmcgdGhlIGN1cnJlbnQgc2Nyb2xsIHZh bHVlIGFzIG5lZ2F0aXZlCisgICAgICAgIHdoZW4gaW4gUlRMLCBmbGlwcGluZyB0aGUgc2Nyb2xs IGRpcmVjdGlvbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxl ci5jc3M6CisgICAgICAgIChib2R5W2Rpcj1sdHJdIC50aW1lbGluZS1ydWxlciA+IC5zZWxlY3Rp b24taGFuZGxlLmxlZnQpOgorICAgICAgICAoYm9keVtkaXI9cnRsXSAudGltZWxpbmUtcnVsZXIg PiAuc2VsZWN0aW9uLWhhbmRsZS5sZWZ0KToKKyAgICAgICAgKGJvZHlbZGlyPWx0cl0gLnRpbWVs aW5lLXJ1bGVyID4gLnNlbGVjdGlvbi1oYW5kbGUucmlnaHQpOgorICAgICAgICAoYm9keVtkaXI9 cnRsXSAudGltZWxpbmUtcnVsZXIgPiAuc2VsZWN0aW9uLWhhbmRsZS5yaWdodCk6CisgICAgICAg IChib2R5W2Rpcj1sdHJdIC50aW1lbGluZS1ydWxlciA+IC5zaGFkZWQtYXJlYS5sZWZ0KToKKyAg ICAgICAgKGJvZHlbZGlyPXJ0bF0gLnRpbWVsaW5lLXJ1bGVyID4gLnNoYWRlZC1hcmVhLmxlZnQp OgorICAgICAgICAoYm9keVtkaXI9bHRyXSAudGltZWxpbmUtcnVsZXIgPiAuc2hhZGVkLWFyZWEu cmlnaHQpOgorICAgICAgICAoYm9keVtkaXI9cnRsXSAudGltZWxpbmUtcnVsZXIgPiAuc2hhZGVk LWFyZWEucmlnaHQpOgorICAgICAgICAoLnRpbWVsaW5lLXJ1bGVyID4gLnNlbGVjdGlvbi1oYW5k bGUubGVmdCk6IERlbGV0ZWQuCisgICAgICAgICgudGltZWxpbmUtcnVsZXIgPiAuc2VsZWN0aW9u LWhhbmRsZS5yaWdodCk6IERlbGV0ZWQuCisgICAgICAgICgudGltZWxpbmUtcnVsZXIgPiAuc2hh ZGVkLWFyZWEubGVmdCk6IERlbGV0ZWQuCisgICAgICAgICgudGltZWxpbmUtcnVsZXIgPiAuc2hh ZGVkLWFyZWEucmlnaHQpOiBEZWxldGVkLgorICAgICAgICBGbGlwIHRoZSBwb3NpdGlvbiBhbGln bm1lbnQgb2YgdGhlIHNlbGVjdGlvbiBoYW5kbGVzIGFuZCBzaGFkZWQgYXJlYXMgd2hlbiBpbiBS VEwuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUuX2hhbmRsZU1vdXNl RG93bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUuX2hh bmRsZU1vdXNlTW92ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90 b3R5cGUuX2hhbmRsZU1vdXNlVXApOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVs ZXIucHJvdG90eXBlLl9oYW5kbGVTZWxlY3Rpb25IYW5kbGVNb3VzZURvd24pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlLl9oYW5kbGVTZWxlY3Rpb25IYW5k bGVNb3VzZU1vdmUpOgorICAgICAgICBUcmVhdCB0aGUgY3VycmVudCBtb3VzZSBwb3NpdGlvbiAo ZXZlbnQucGFnZVgpIGFzIGEgbmVnYXRpdmUgdmFsdWUgd2hlbiBpbiBSVEwsIG1lYW5pbmcgdGhh dAorICAgICAgICB0aGUgZGVsdGEgbW92ZW1lbnQgZnJvbSB0aGUgc3RhcnRpbmcgcG9zaXRpb24g aXMgZmxpcHBlZC4KKworMjAxNy0wMy0xNCAgRGV2aW4gUm91c3NvICA8d2Via2l0QGRldmlucm91 c3NvLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSVEw6IGFkZCBzdXBwb3J0IGZvciBU aW1lbGluZSBncmFwaHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2OTU4NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuY3NzCmluZGV4IDk4NWM1YzRi NjI1NDFkZTk3ZmZhMTE1NzcxZmM1NmRhYjAxMmIyY2YuLjAzMTRlYjcxZmI0N2E4YTYwMjY5NTQ3 Y2JmMGZjNTE3ZDY4ZDcyNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuY3NzCkBAIC0xODMs MTEgKzE4MywxMyBAQCBib2R5LndpbmRvdy1pbmFjdGl2ZSAudGltZWxpbmUtb3ZlcnZpZXcgPiAu dHJlZS1vdXRsaW5lLnRpbWVsaW5lcyAuaXRlbS5zZWxlY3RlZAogICAgIHRyYW5zZm9ybTogdHJh bnNsYXRlWCgwcHgpOwogfQogCi0udGltZWxpbmUtb3ZlcnZpZXcuZnJhbWVzID4gLnRpbWVsaW5l LXJ1bGVyOm5vdCguYm90aC1oYW5kbGVzLWNsYW1wZWQpID4gLnNlbGVjdGlvbi1oYW5kbGUucmln aHQgeworYm9keVtkaXI9bHRyXSAudGltZWxpbmUtb3ZlcnZpZXcuZnJhbWVzID4gLnRpbWVsaW5l LXJ1bGVyOm5vdCguYm90aC1oYW5kbGVzLWNsYW1wZWQpID4gLnNlbGVjdGlvbi1oYW5kbGUucmln aHQsCitib2R5W2Rpcj1ydGxdIC50aW1lbGluZS1vdmVydmlldy5mcmFtZXMgPiAudGltZWxpbmUt cnVsZXI6bm90KC5ib3RoLWhhbmRsZXMtY2xhbXBlZCkgPiAuc2VsZWN0aW9uLWhhbmRsZS5sZWZ0 IHsKICAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVgoNXB4KTsKIH0KIAotLnRpbWVsaW5lLW92ZXJ2 aWV3LmZyYW1lcyA+IC50aW1lbGluZS1ydWxlcjpub3QoLmJvdGgtaGFuZGxlcy1jbGFtcGVkKSA+ IC5zaGFkZWQtYXJlYS5yaWdodCB7Citib2R5W2Rpcj1sdHJdIC50aW1lbGluZS1vdmVydmlldy5m cmFtZXMgPiAudGltZWxpbmUtcnVsZXI6bm90KC5ib3RoLWhhbmRsZXMtY2xhbXBlZCkgPiAuc2hh ZGVkLWFyZWEucmlnaHQsCitib2R5W2Rpcj1ydGxdIC50aW1lbGluZS1vdmVydmlldy5mcmFtZXMg PiAudGltZWxpbmUtcnVsZXI6bm90KC5ib3RoLWhhbmRsZXMtY2xhbXBlZCkgPiAuc2hhZGVkLWFy ZWEubGVmdCB7CiAgICAgdHJhbnNmb3JtOiB0cmFuc2xhdGVYKDFweCk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3Zl cnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZU92ZXJ2aWV3LmpzCmluZGV4IDlmMDlkMDFlZjRlYjA3OWVkYmViNjE2OWI0YjUwODdlMTlj ZDAyZTYuLmZkYmY5MThiNTM0ODk4ZmZjYjY5ZjlkMjExODU3MzFlNzAwZmU2MzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3Zl cnZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVPdmVydmlldy5qcwpAQCAtNTE0LDcgKzUxNCwxMCBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuVmlldwogICAgICAgICB0aGlzLl9kb250VXBkYXRlU2Nyb2xsTGVmdCA9IHRydWU7CiAKICAg ICAgICAgbGV0IHNjcm9sbE9mZnNldCA9IHRoaXMuX3Njcm9sbENvbnRhaW5lckVsZW1lbnQuc2Ny b2xsTGVmdDsKLSAgICAgICAgdGhpcy5zY3JvbGxTdGFydFRpbWUgPSB0aGlzLl9zdGFydFRpbWUg KyAoc2Nyb2xsT2Zmc2V0ICogdGhpcy5zZWNvbmRzUGVyUGl4ZWwpOworICAgICAgICBpZiAoV2Vi SW5zcGVjdG9yLnJlc29sdmVkTGF5b3V0RGlyZWN0aW9uKCkgPT09IFdlYkluc3BlY3Rvci5MYXlv dXREaXJlY3Rpb24uUlRMKQorICAgICAgICAgICAgdGhpcy5zY3JvbGxTdGFydFRpbWUgPSB0aGlz Ll9zdGFydFRpbWUgLSAoc2Nyb2xsT2Zmc2V0ICogdGhpcy5zZWNvbmRzUGVyUGl4ZWwpOworICAg ICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLnNjcm9sbFN0YXJ0VGltZSA9IHRoaXMuX3N0YXJ0 VGltZSArIChzY3JvbGxPZmZzZXQgKiB0aGlzLnNlY29uZHNQZXJQaXhlbCk7CiAKICAgICAgICAg Ly8gRm9yY2UgbGF5b3V0IHNvIHdlIGNhbiB1cGRhdGUgd2l0aCB0aGUgc2Nyb2xsIHBvc2l0aW9u IHN5bmNocm9ub3VzbHkuCiAgICAgICAgIHRoaXMudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUnVsZXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVSdWxlci5jc3MKaW5kZXggZGIxMjZlN2FlOTQyMDM0NjhlNjg4MTU0YjM3NmMwOTI4 OTUwMWIyNy4uMzc4Yzk5MmVhNGE1ODIzODg0M2FhNjIzMTQ2MjMxYmQxMGM3OTlhYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVS dWxlci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVSdWxlci5jc3MKQEAgLTIwOCwxMSArMjA4LDEzIEBAIGJvZHkud2luZG93LWluYWN0 aXZlIC50aW1lbGluZS1ydWxlciA+IC5oZWFkZXIgPiAuZGl2aWRlciB7CiAgICAgZGlzcGxheTog bm9uZTsKIH0KIAotLnRpbWVsaW5lLXJ1bGVyID4gLnNlbGVjdGlvbi1oYW5kbGUubGVmdCB7Citi b2R5W2Rpcj1sdHJdIC50aW1lbGluZS1ydWxlciA+IC5zZWxlY3Rpb24taGFuZGxlLmxlZnQsCiti b2R5W2Rpcj1ydGxdIC50aW1lbGluZS1ydWxlciA+IC5zZWxlY3Rpb24taGFuZGxlLnJpZ2h0IHsK ICAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVgoLTRweCk7CiB9CiAKLS50aW1lbGluZS1ydWxlciA+ IC5zZWxlY3Rpb24taGFuZGxlLnJpZ2h0IHsKK2JvZHlbZGlyPWx0cl0gLnRpbWVsaW5lLXJ1bGVy ID4gLnNlbGVjdGlvbi1oYW5kbGUucmlnaHQsCitib2R5W2Rpcj1ydGxdIC50aW1lbGluZS1ydWxl ciA+IC5zZWxlY3Rpb24taGFuZGxlLmxlZnQgewogICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWCg0 cHgpOwogfQogCkBAIC0yMjQsMTAgKzIyNiwxMiBAQCBib2R5LndpbmRvdy1pbmFjdGl2ZSAudGlt ZWxpbmUtcnVsZXIgPiAuaGVhZGVyID4gLmRpdmlkZXIgewogICAgIHotaW5kZXg6IDE1OwogfQog Ci0udGltZWxpbmUtcnVsZXIgPiAuc2hhZGVkLWFyZWEubGVmdCB7Citib2R5W2Rpcj1sdHJdIC50 aW1lbGluZS1ydWxlciA+IC5zaGFkZWQtYXJlYS5sZWZ0LAorYm9keVtkaXI9cnRsXSAudGltZWxp bmUtcnVsZXIgPiAuc2hhZGVkLWFyZWEucmlnaHQgewogICAgIGxlZnQ6IDA7CiB9CiAKLS50aW1l bGluZS1ydWxlciA+IC5zaGFkZWQtYXJlYS5yaWdodCB7Citib2R5W2Rpcj1sdHJdIC50aW1lbGlu ZS1ydWxlciA+IC5zaGFkZWQtYXJlYS5yaWdodCwKK2JvZHlbZGlyPXJ0bF0gLnRpbWVsaW5lLXJ1 bGVyID4gLnNoYWRlZC1hcmVhLmxlZnQgewogICAgIHJpZ2h0OiAwOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVs ZXIuanMKaW5kZXggNjA2YzNlODUxMDFlNGYzZDA3MGQxZTFiZGUxNmYwNmNjYWU3ZWViMy4uYjE1 MTc3NTkzNDMxNzJhMjBmZWRkMDM3MWVjODQ2YWYyNTMzNjNiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVy LmpzCkBAIC03NTcsOCArNzU3LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyID0gY2xh c3MgVGltZWxpbmVSdWxlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICB2 YXIgc2VsZWN0aW9uRHJhZ0VsZW1lbnRSZWN0ID0gdGhpcy5fc2VsZWN0aW9uRHJhZ0VsZW1lbnQu Z2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CiAgICAgICAgICAgICB0aGlzLl9tb3ZlU2VsZWN0aW9u TWF4aW11bUxlZnRPZmZzZXQgPSB0aGlzLl9ydWxlckJvdW5kaW5nQ2xpZW50UmVjdC5sZWZ0ICsg KGV2ZW50LnBhZ2VYIC0gc2VsZWN0aW9uRHJhZ0VsZW1lbnRSZWN0LmxlZnQpOwogICAgICAgICAg ICAgdGhpcy5fbW92ZVNlbGVjdGlvbk1heGltdW1SaWdodE9mZnNldCA9IHRoaXMuX3J1bGVyQm91 bmRpbmdDbGllbnRSZWN0LnJpZ2h0IC0gKHNlbGVjdGlvbkRyYWdFbGVtZW50UmVjdC5yaWdodCAt IGV2ZW50LnBhZ2VYKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aGlzLl9tb3VzZURv d25Qb3NpdGlvbiA9IGV2ZW50LnBhZ2VYIC0gdGhpcy5fcnVsZXJCb3VuZGluZ0NsaWVudFJlY3Qu bGVmdDsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IucmVz b2x2ZWRMYXlvdXREaXJlY3Rpb24oKSA9PT0gV2ViSW5zcGVjdG9yLkxheW91dERpcmVjdGlvbi5S VEwpCisgICAgICAgICAgICAgICAgdGhpcy5fbW91c2VEb3duUG9zaXRpb24gPSB0aGlzLl9ydWxl ckJvdW5kaW5nQ2xpZW50UmVjdC5yaWdodCAtIGV2ZW50LnBhZ2VYOworICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgIHRoaXMuX21vdXNlRG93blBvc2l0aW9uID0gZXZlbnQucGFnZVgg LSB0aGlzLl9ydWxlckJvdW5kaW5nQ2xpZW50UmVjdC5sZWZ0OworICAgICAgICB9CiAKICAgICAg ICAgdGhpcy5fbW91c2VNb3ZlZCA9IGZhbHNlOwogCkBAIC03NzksMTEgKzc4MywxOSBAQCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVSdWxlciA9IGNsYXNzIFRpbWVsaW5lUnVsZXIgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVmlldwogCiAgICAgICAgIHRoaXMuX21vdXNlTW92ZWQgPSB0cnVlOwogCisgICAg ICAgIGxldCBpc1JUTCA9IFdlYkluc3BlY3Rvci5yZXNvbHZlZExheW91dERpcmVjdGlvbigpID09 PSBXZWJJbnNwZWN0b3IuTGF5b3V0RGlyZWN0aW9uLlJUTDsKKwogICAgICAgICBsZXQgY3VycmVu dE1vdXNlUG9zaXRpb247CiAgICAgICAgIGlmICh0aGlzLl9zZWxlY3Rpb25Jc01vdmUpIHsKICAg ICAgICAgICAgIGN1cnJlbnRNb3VzZVBvc2l0aW9uID0gTWF0aC5tYXgodGhpcy5fbW92ZVNlbGVj dGlvbk1heGltdW1MZWZ0T2Zmc2V0LCBNYXRoLm1pbih0aGlzLl9tb3ZlU2VsZWN0aW9uTWF4aW11 bVJpZ2h0T2Zmc2V0LCBldmVudC5wYWdlWCkpOwogCi0gICAgICAgICAgICBsZXQgb2Zmc2V0VGlt ZSA9IChjdXJyZW50TW91c2VQb3NpdGlvbiAtIHRoaXMuX2xhc3RNb3VzZVBvc2l0aW9uKSAqIHRo aXMuc2Vjb25kc1BlclBpeGVsOworICAgICAgICAgICAgbGV0IHBvc2l0aW9uRGVsdGEgPSAwOwor ICAgICAgICAgICAgaWYgKGlzUlRMKQorICAgICAgICAgICAgICAgIHBvc2l0aW9uRGVsdGEgPSB0 aGlzLl9sYXN0TW91c2VQb3NpdGlvbiAtIGN1cnJlbnRNb3VzZVBvc2l0aW9uOworICAgICAgICAg ICAgZWxzZQorICAgICAgICAgICAgICAgIHBvc2l0aW9uRGVsdGEgPSBjdXJyZW50TW91c2VQb3Np dGlvbiAtIHRoaXMuX2xhc3RNb3VzZVBvc2l0aW9uOworCisgICAgICAgICAgICBsZXQgb2Zmc2V0 VGltZSA9IHBvc2l0aW9uRGVsdGEgKiB0aGlzLnNlY29uZHNQZXJQaXhlbDsKICAgICAgICAgICAg IGxldCBzZWxlY3Rpb25EdXJhdGlvbiA9IHRoaXMuc2VsZWN0aW9uRW5kVGltZSAtIHRoaXMuc2Vs ZWN0aW9uU3RhcnRUaW1lOwogICAgICAgICAgICAgbGV0IG9sZFNlbGVjdGlvblN0YXJ0VGltZSA9 IHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lOwogCkBAIC04MDQsNyArODE2LDEwIEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJ1bGVyID0gY2xhc3MgVGltZWxpbmVSdWxlciBleHRlbmRzIFdlYkluc3Bl Y3Rvci5WaWV3CiAKICAgICAgICAgICAgIHRoaXMuX2xhc3RNb3VzZVBvc2l0aW9uID0gY3VycmVu dE1vdXNlUG9zaXRpb247CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBjdXJyZW50TW91 c2VQb3NpdGlvbiA9IGV2ZW50LnBhZ2VYIC0gdGhpcy5fcnVsZXJCb3VuZGluZ0NsaWVudFJlY3Qu bGVmdDsKKyAgICAgICAgICAgIGlmIChpc1JUTCkKKyAgICAgICAgICAgICAgICBjdXJyZW50TW91 c2VQb3NpdGlvbiA9IHRoaXMuX3J1bGVyQm91bmRpbmdDbGllbnRSZWN0LnJpZ2h0IC0gZXZlbnQu cGFnZVg7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgY3VycmVudE1vdXNlUG9z aXRpb24gPSBldmVudC5wYWdlWCAtIHRoaXMuX3J1bGVyQm91bmRpbmdDbGllbnRSZWN0LmxlZnQ7 CiAKICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lID0gTWF0aC5tYXgodGhpcy5z dGFydFRpbWUsIHRoaXMuc3RhcnRUaW1lICsgKE1hdGgubWluKGN1cnJlbnRNb3VzZVBvc2l0aW9u LCB0aGlzLl9tb3VzZURvd25Qb3NpdGlvbikgKiB0aGlzLnNlY29uZHNQZXJQaXhlbCkpOwogICAg ICAgICAgICAgdGhpcy5zZWxlY3Rpb25FbmRUaW1lID0gTWF0aC5taW4odGhpcy5zdGFydFRpbWUg KyAoTWF0aC5tYXgoY3VycmVudE1vdXNlUG9zaXRpb24sIHRoaXMuX21vdXNlRG93blBvc2l0aW9u KSAqIHRoaXMuc2Vjb25kc1BlclBpeGVsKSwgdGhpcy5lbmRUaW1lKTsKQEAgLTgyOCw3ICs4NDMs MTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIgPSBjbGFzcyBUaW1lbGluZVJ1bGVyIGV4 dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKIAogICAgICAgICAgICAgaWYgKHRoaXMuc2VsZWN0aW9u RW5kVGltZSAtIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lIDwgdGhpcy5taW5pbXVtU2VsZWN0aW9u RHVyYXRpb24pIHsKICAgICAgICAgICAgICAgICAvLyBUaGUgc2VjdGlvbiBpcyBzbWFsbGVyIHRo YW4gYWxsb3dlZCwgZ3JvdyBpbiB0aGUgZGlyZWN0aW9uIG9mIHRoZSBkcmFnIHRvIG1lZXQgdGhl IG1pbnVtdW0uCi0gICAgICAgICAgICAgICAgdmFyIGN1cnJlbnRNb3VzZVBvc2l0aW9uID0gZXZl bnQucGFnZVggLSB0aGlzLl9ydWxlckJvdW5kaW5nQ2xpZW50UmVjdC5sZWZ0OworICAgICAgICAg ICAgICAgIGxldCBjdXJyZW50TW91c2VQb3NpdGlvbiA9IDA7CisgICAgICAgICAgICAgICAgaWYg KFdlYkluc3BlY3Rvci5yZXNvbHZlZExheW91dERpcmVjdGlvbigpID09PSBXZWJJbnNwZWN0b3Iu TGF5b3V0RGlyZWN0aW9uLlJUTCkKKyAgICAgICAgICAgICAgICAgICAgY3VycmVudE1vdXNlUG9z aXRpb24gPSB0aGlzLl9ydWxlckJvdW5kaW5nQ2xpZW50UmVjdC5yaWdodCAtIGV2ZW50LnBhZ2VY OworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgY3VycmVudE1vdXNl UG9zaXRpb24gPSBldmVudC5wYWdlWCAtIHRoaXMuX3J1bGVyQm91bmRpbmdDbGllbnRSZWN0Lmxl ZnQ7CisKICAgICAgICAgICAgICAgICBpZiAoY3VycmVudE1vdXNlUG9zaXRpb24gPiB0aGlzLl9t b3VzZURvd25Qb3NpdGlvbikgewogICAgICAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvbkVu ZFRpbWUgPSBNYXRoLm1pbih0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSArIHRoaXMubWluaW11bVNl bGVjdGlvbkR1cmF0aW9uLCB0aGlzLmVuZFRpbWUpOwogICAgICAgICAgICAgICAgICAgICB0aGlz LnNlbGVjdGlvblN0YXJ0VGltZSA9IHRoaXMuc2VsZWN0aW9uRW5kVGltZSAtIHRoaXMubWluaW11 bVNlbGVjdGlvbkR1cmF0aW9uOwpAQCAtODY0LDcgKzg4NCwxMSBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSdWxlciA9IGNsYXNzIFRpbWVsaW5lUnVsZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmll dwogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRoaXMuX2RyYWdIYW5kbGVJc1N0YXJ0 VGltZSA9IGV2ZW50LnRhcmdldCA9PT0gdGhpcy5fbGVmdFNlbGVjdGlvbkhhbmRsZUVsZW1lbnQ7 Ci0gICAgICAgIHRoaXMuX21vdXNlRG93blBvc2l0aW9uID0gZXZlbnQucGFnZVggLSB0aGlzLmVs ZW1lbnQudG90YWxPZmZzZXRMZWZ0OworCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IucmVzb2x2 ZWRMYXlvdXREaXJlY3Rpb24oKSA9PT0gV2ViSW5zcGVjdG9yLkxheW91dERpcmVjdGlvbi5SVEwp CisgICAgICAgICAgICB0aGlzLl9tb3VzZURvd25Qb3NpdGlvbiA9IHRoaXMuZWxlbWVudC50b3Rh bE9mZnNldFJpZ2h0IC0gZXZlbnQucGFnZVg7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRo aXMuX21vdXNlRG93blBvc2l0aW9uID0gZXZlbnQucGFnZVggLSB0aGlzLmVsZW1lbnQudG90YWxP ZmZzZXRMZWZ0OwogCiAgICAgICAgIHRoaXMuX3NlbGVjdGlvbkhhbmRsZU1vdXNlTW92ZUV2ZW50 TGlzdGVuZXIgPSB0aGlzLl9oYW5kbGVTZWxlY3Rpb25IYW5kbGVNb3VzZU1vdmUuYmluZCh0aGlz KTsKICAgICAgICAgdGhpcy5fc2VsZWN0aW9uSGFuZGxlTW91c2VVcEV2ZW50TGlzdGVuZXIgPSB0 aGlzLl9oYW5kbGVTZWxlY3Rpb25IYW5kbGVNb3VzZVVwLmJpbmQodGhpcyk7CkBAIC04ODMsNyAr OTA3LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyID0gY2xhc3MgVGltZWxpbmVSdWxl ciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2Vy dChldmVudC5idXR0b24gPT09IDApOwogCi0gICAgICAgIGxldCBjdXJyZW50TW91c2VQb3NpdGlv biA9IGV2ZW50LnBhZ2VYIC0gdGhpcy5lbGVtZW50LnRvdGFsT2Zmc2V0TGVmdDsKKyAgICAgICAg bGV0IGN1cnJlbnRNb3VzZVBvc2l0aW9uID0gMDsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5y ZXNvbHZlZExheW91dERpcmVjdGlvbigpID09PSBXZWJJbnNwZWN0b3IuTGF5b3V0RGlyZWN0aW9u LlJUTCkKKyAgICAgICAgICAgIGN1cnJlbnRNb3VzZVBvc2l0aW9uID0gdGhpcy5lbGVtZW50LnRv dGFsT2Zmc2V0UmlnaHQgLSBldmVudC5wYWdlWDsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg Y3VycmVudE1vdXNlUG9zaXRpb24gPSBldmVudC5wYWdlWCAtIHRoaXMuZWxlbWVudC50b3RhbE9m ZnNldExlZnQ7CisKICAgICAgICAgbGV0IGN1cnJlbnRUaW1lID0gdGhpcy5zdGFydFRpbWUgKyAo Y3VycmVudE1vdXNlUG9zaXRpb24gKiB0aGlzLnNlY29uZHNQZXJQaXhlbCk7CiAgICAgICAgIGlm ICh0aGlzLnNuYXBJbnRlcnZhbCkKICAgICAgICAgICAgIGN1cnJlbnRUaW1lID0gdGhpcy5fc25h cFZhbHVlKGN1cnJlbnRUaW1lKTsK