152811 2016-01-06 15:00:00 -0800 Web Inspector: Make Timelines view also remember sort order 2016-01-11 17:35:18 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1153250 0 hi 2016-01-06 15:00:00 -0800 See https://bugs.webkit.org/show_bug.cgi?id=152626#c12. The selected column was saved, but not the sort order (ascending, descending, etc.) for that column. 1153251 1 webkit-bug-importer 2016-01-06 15:00:14 -0800 <rdar://problem/24080317> 1154323 2 268675 hi 2016-01-10 23:12:02 -0800 Created attachment 268675 Patch 1154582 3 268675 commit-queue 2016-01-11 17:35:15 -0800 Comment on attachment 268675 Patch Clearing flags on attachment: 268675 Committed r194878: <http://trac.webkit.org/changeset/194878> 1154583 4 commit-queue 2016-01-11 17:35:18 -0800 All reviewed patches have been landed. Closing bug. 268675 2016-01-10 23:12:02 -0800 2016-01-11 17:35:15 -0800 Patch bug-152811-20160110231130.patch text/plain 13854 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcyZDk5M2UxYjRjMDM5MzNkMDI4OGRlNDZiOWE2 NzRiYjI4N2ZhMzguLmQ1ZmU3ZTUwYTI1YTZhZTNkNWJkZjkzODMzNDg4ZjdlZjQyNjliMjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDE2LTAxLTEwICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE1ha2UgVGltZWxpbmVzIHZpZXcgYWxzbyByZW1lbWJlciBzb3J0IG9yZGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI4MTEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFuZ2VzZXQgcjE5 NDU3NCBpbnRyb2R1Y2VkIHRoZSBhYmlsaXR5IGZvciBXZWJJbnNwZWN0b3IuU2V0dGluZyBvYmpl Y3RzIHRvCisgICAgICAgIGJlIHBhc3NlZCB0byBEYXRhR3JpZCBpbnN0YW5jZXMgdG8gc2F2ZSB0 aGUgc29ydCBjb2x1bW4gZm9yIHRoYXQgZ3JpZC4gVGhlc2UKKyAgICAgICAgY2hhbmdlcyBhbHNv IGFkZCB0aGUgYWJpbGl0eSBmb3IgdGhlIHNvcnQgb3JkZXIgdG8gYmUgc2F2ZSBhcyB3ZWxsLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250 ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJhbWVD b250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZURhdGFHcmlkKToKKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuX3JlYnVpbGRUYWJs ZSk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcpOgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EYXRhR3JpZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90 eXBlLnNldCBzb3J0T3JkZXIpOgorICAgICAgICBJZiBhIFdlYkluc3BlY3Rvci5TZXR0aW5nIG9i amVjdCBoYXMgYmVlbiBnaXZlbiwgc2F2ZSB0aGUgbmV3IHNvcnQgb3JkZXIuCisKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuc2V0IHNvcnRPcmRlclNldHRpbmcpOgor ICAgICAgICBTYXZlcyB0aGUgZ2l2ZW4gV2ViSW5zcGVjdG9yLlNldHRpbmcgb2JqZWN0IGZvciBt b2RpZmljYXRpb24gd2hlbmV2ZXIgdGhlIHVzZXIKKyAgICAgICAgY2hhbmdlcyB0aGUgc29ydCBv cmRlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1Np ZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXllclRyZWVEZXRhaWxzU2lk ZWJhclBhbmVsLnByb3RvdHlwZS5fYnVpbGREYXRhR3JpZFNlY3Rpb24pOgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrR3JpZENvbnRlbnRWaWV3KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGlt ZWxpbmVWaWV3KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJh bWVUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVU aW1lbGluZVZpZXcpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1l bGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3KToK KwogMjAxNi0wMS0xMCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFVuY2F1Z2h0IEV4Y2VwdGlvbiBzZWxlY3RpbmcgSW5kZXhl ZERCIGhvc3QgZm9sZGVyIGluIFN0b3JhZ2UgdGFiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxp Y2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LmpzCmluZGV4IDljOGMxOGI0NDIzNDM2NzZiMWZk YTkyMDRhMzYwOTVhMDYxMTViMzguLmU1NjAwMTRmODY2YTA2YzQ0YWM4MjliYzUxYjJlMDQxOWFi YzhlNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZUNvbnRl bnRWaWV3LmpzCkBAIC0xNjMsNyArMTYzLDcgQEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2Fj aGVGcmFtZUNvbnRlbnRWaWV3ID0gY2xhc3MgQXBwbGljYXRpb25DYWNoZUZyYW1lQ29udGUKICAg ICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdy aWQuRXZlbnQuU29ydENoYW5nZWQsIHRoaXMuX3NvcnREYXRhR3JpZCwgdGhpcyk7CiAKICAgICAg ICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYklu c3BlY3Rvci5TZXR0aW5nKCJhcHBsaWNhdGlvbi1jYWNoZS1mcmFtZS1jb250ZW50LXZpZXctc29y dCIsICJ1cmwiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVj dG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2RhdGFHcmlk LnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImFwcGxpY2F0aW9u LWNhY2hlLWZyYW1lLWNvbnRlbnQtdmlldy1zb3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFH cmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOwogCiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlz Ll9kYXRhR3JpZCk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZUxheW91dCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2ll U3RvcmFnZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCmluZGV4IDExNWY5Yzc2YTZlYWM0 Zjg1NTNiZjdiZDllZDkwMWE2N2I4MzAwMDAuLjEwMzc3MzRkYjE1YzFmOTZiNDRhNWUzYmRiYzY0 ZjQxOTBlOWM2YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMK QEAgLTE0Myw2ICsxNDMsNyBAQCBXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3 ID0gY2xhc3MgQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgVwogICAgICAgICB9CiAK ICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0gbmV3 IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJjb29raWUtc3RvcmFnZS1jb250ZW50LXZpZXctc29ydCIs ICJuYW1lIik7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcg V2ViSW5zcGVjdG9yLlNldHRpbmcoImNvb2tpZS1zdG9yYWdlLWNvbnRlbnQtdmlldy1zb3J0LW9y ZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5JbmRldGVybWluYXRlKTsKICAg ICB9CiAKICAgICBfZmlsdGVyQ29va2llcyhjb29raWVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNv bnRlbnRWaWV3LmpzCmluZGV4IDJhMjUwZDMwODI2MTZlMjg2YTBjY2IwYTNiYjI5NDRmZDZmZTE4 YjkuLmQ4MDk0MjBlMzg0Y2I5YTZjMWRhZjE0MzJiNzk2NTdmNWMyYzU4ZGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMKQEAgLTQyLDcgKzQyLDcgQEAgV2ViSW5zcGVjdG9y LkRPTVN0b3JhZ2VDb250ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50VmlldyBleHRl bmRzIFdlYkluc3AKICAgICAgICAgY29sdW1ucy52YWx1ZSA9IHt0aXRsZTogV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJWYWx1ZSIpLCBzb3J0YWJsZTogdHJ1ZX07CiAKICAgICAgICAgdGhpcy5fZGF0 YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMsIHRoaXMuX2VkaXRpbmdD YWxsYmFjay5iaW5kKHRoaXMpLCB0aGlzLl9kZWxldGVDYWxsYmFjay5iaW5kKHRoaXMpKTsKLSAg ICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNv cnRPcmRlci5Bc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRPcmRlclNldHRp bmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImRvbS1zdG9yYWdlLWNvbnRlbnQtdmlldy1z b3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOwog ICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllclNldHRpbmcgPSBuZXcg V2ViSW5zcGVjdG9yLlNldHRpbmcoImRvbS1zdG9yYWdlLWNvbnRlbnQtdmlldy1zb3J0IiwgImtl eSIpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5EYXRhR3JpZC5FdmVudC5Tb3J0Q2hhbmdlZCwgdGhpcy5fc29ydERhdGFHcmlkLCB0aGlzKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E YXRhR3JpZC5qcwppbmRleCA1ZjY3NGE0NmMyMjY1ODIwMTA3N2M4Zjk1MWExOTlkYzc2NmUwM2Vk Li4xODBkZmQ5MjExMDIxNzExMGVlZDBhNjVkMGNiZjk1NWY5ZjY3MDJmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5qcwpA QCAtMzUsNiArMzUsNyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBjbGFzcyBEYXRhR3JpZCBl eHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHRoaXMuX3NvcnRDb2x1bW5JZGVudGlm aWVyID0gbnVsbDsKICAgICAgICAgdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXJTZXR0aW5nID0g bnVsbDsKICAgICAgICAgdGhpcy5fc29ydE9yZGVyID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlNv cnRPcmRlci5JbmRldGVybWluYXRlOworICAgICAgICB0aGlzLl9zb3J0T3JkZXJTZXR0aW5nID0g bnVsbDsKIAogICAgICAgICB0aGlzLmNoaWxkcmVuID0gW107CiAgICAgICAgIHRoaXMuc2VsZWN0 ZWROb2RlID0gbnVsbDsKQEAgLTE4NSw2ICsxODYsOSBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQg PSBjbGFzcyBEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAKICAgICAgICAgdGhp cy5fc29ydE9yZGVyID0gb3JkZXI7CiAKKyAgICAgICAgaWYgKHRoaXMuX3NvcnRPcmRlclNldHRp bmcpCisgICAgICAgICAgICB0aGlzLl9zb3J0T3JkZXJTZXR0aW5nLnZhbHVlID0gdGhpcy5fc29y dE9yZGVyOworCiAgICAgICAgIGlmICghdGhpcy5fc29ydENvbHVtbklkZW50aWZpZXIpCiAgICAg ICAgICAgICByZXR1cm47CiAKQEAgLTE5Niw2ICsyMDAsMTUgQEAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkID0gY2xhc3MgRGF0YUdyaWQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0 aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQu U29ydENoYW5nZWQpOwogICAgIH0KIAorICAgIHNldCBzb3J0T3JkZXJTZXR0aW5nKHNldHRpbmcp CisgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydChzZXR0aW5nIGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLlNldHRpbmcpOworCisgICAgICAgIHRoaXMuX3NvcnRPcmRlclNldHRpbmcgPSBzZXR0 aW5nOworICAgICAgICBpZiAodGhpcy5fc29ydE9yZGVyU2V0dGluZy52YWx1ZSkKKyAgICAgICAg ICAgIHRoaXMuc29ydE9yZGVyID0gdGhpcy5fc29ydE9yZGVyU2V0dGluZy52YWx1ZTsKKyAgICB9 CisKICAgICBnZXQgc29ydENvbHVtbklkZW50aWZpZXIoKQogICAgIHsKICAgICAgICAgcmV0dXJu IHRoaXMuX3NvcnRDb2x1bW5JZGVudGlmaWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURl dGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggM2E5ZTBmY2NmZDdlZWY3YjlmYmEyMThmMmQ0NjY1 ZDc3NmUxZTU1NC4uMWJlNzExZDAyNTQwNDMwNzk0ZjY1Y2FkZmIzMmUyYzc5ZmJhNWU5YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJU cmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC0xNDIs NyArMTQyLDcgQEAgV2ViSW5zcGVjdG9yLkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgPSBj bGFzcyBMYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgdGhpcy5fZGF0YUdy aWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWRO b2RlQ2hhbmdlZCwgdGhpcy5fc2VsZWN0ZWREYXRhR3JpZE5vZGVDaGFuZ2VkLCB0aGlzKTsKIAog ICAgICAgICB0aGlzLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0 b3IuU2V0dGluZygibGF5ZXItdHJlZS1kZXRhaWxzLXNpZGViYXItcGFuZWwtc29ydCIsICJtZW1v cnkiKTsKLSAgICAgICAgdGhpcy5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29y dE9yZGVyLkRlc2NlbmRpbmc7CisgICAgICAgIHRoaXMuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBX ZWJJbnNwZWN0b3IuU2V0dGluZygibGF5ZXItdHJlZS1kZXRhaWxzLXNpZGViYXItcGFuZWwtc29y dC1vcmRlciIsIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuRGVzY2VuZGluZyk7CiAK ICAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl9kYXRhR3JpZC5lbGVtZW50OwogICAgICAgICBl bGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGluZSIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3 LmpzCmluZGV4IGQzODU1OTcxYmMwMjQ0YWZkZGUyZDFiMTkyNTIxMWNmZjU5YWIyYjQuLmJkZTY0 YjcyNzNhYzc1NTViZDdmYmJkYzU2YzNjYjcxY2IzYjVjYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1l bGluZVZpZXcuanMKQEAgLTczLDcgKzczLDcgQEAgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l VmlldyA9IGNsYXNzIExheW91dFRpbWVsaW5lVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAg ICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdy aWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2RlU2VsZWN0ZWQs IHRoaXMpOwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVyU2V0 dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygibGF5b3V0LXRpbWVsaW5lLXZpZXctc29y dCIsICJzdGFydFRpbWUiKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyID0gV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmc7CisgICAgICAgIHRoaXMuX2Rh dGFHcmlkLnNvcnRPcmRlclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImxheW91 dC10aW1lbGluZS12aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9y ZGVyLkFzY2VuZGluZyk7CiAKICAgICAgICAgdGhpcy5faG92ZXJlZFRyZWVFbGVtZW50ID0gbnVs bDsKICAgICAgICAgdGhpcy5faG92ZXJlZERhdGFHcmlkTm9kZSA9IG51bGw7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya0dyaWRDb250ZW50Vmlldy5qcwppbmRleCA5NjcyZTY4MTg4NzZhYzMwYTM2NjgxYzcz MjY3MTQxYTRhNWJhMzAzLi4wNmUwMmZlODYzOGUwODQwYmYzNzBiM2JlY2QyM2YxMjhmMTRjZjYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKQEAgLTgzLDcgKzgzLDcg QEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrR3Jp ZENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcg V2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQodGhpcy5fY29udGVudFRyZWVPdXRsaW5lLCBj b2x1bW5zKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWRO b2RlU2VsZWN0ZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRl bnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoIm5ldHdvcmstZ3JpZC1j b250ZW50LXZpZXctc29ydCIsICJyZXF1ZXN0U2VudCIpOwotICAgICAgICB0aGlzLl9kYXRhR3Jp ZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsK KyAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0 b3IuU2V0dGluZygibmV0d29yay1ncmlkLWNvbnRlbnQtdmlldy1zb3J0LW9yZGVyIiwgV2ViSW5z cGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOwogCiAgICAgICAgIHRoaXMuZWxl bWVudC5jbGFzc0xpc3QuYWRkKCJuZXR3b3JrLWdyaWQiKTsKICAgICAgICAgdGhpcy5hZGRTdWJ2 aWV3KHRoaXMuX2RhdGFHcmlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4 IGIzNzVhNWIzZjU1ZTdlYjc1OThhN2JkYWI5NjYxYmMxMWQxMjQ2MzkuLjI3OTA4YWFkYzJiNzg1 YzUyZGUwMDhjNWI5NTk1NjI0M2QwM2ViNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmll dy5qcwpAQCAtOTAsNyArOTAsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyA9 IGNsYXNzIE5ldHdvcmtUaW1lbGluZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICB0 aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFH cmlkLkV2ZW50LkZpbHRlcnNEaWRDaGFuZ2UsIHRoaXMuX2RhdGFHcmlkRmlsdGVyc0RpZENoYW5n ZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2RhdGFHcmlk Tm9kZVNlbGVjdGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklk ZW50aWZpZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJuZXR3b3JrLXRpbWVs aW5lLXZpZXctc29ydCIsICJyZXF1ZXN0U2VudCIpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5z b3J0T3JkZXIgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKKyAg ICAgICAgdGhpcy5fZGF0YUdyaWQuc29ydE9yZGVyU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3Iu U2V0dGluZygibmV0d29yay10aW1lbGluZS12aWV3LXNvcnQtb3JkZXIiLCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZyk7CiAKICAgICAgICAgdGhpcy5lbGVtZW50LmNs YXNzTGlzdC5hZGQoIm5ldHdvcmsiKTsKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2Rh dGFHcmlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMKaW5k ZXggZjExNzBmMWRiYjFmYmI5ZWUzZTVlMzY0MDFjZGEwZGY4NDZhZmEzMC4uYjBjN2IxOWJiZjJj Njc3YWI2OWU2ZjI5NWQyYTU5ZDA3OTRlYWU0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5n RnJhbWVUaW1lbGluZVZpZXcuanMKQEAgLTc2LDcgKzc2LDcgQEAgV2ViSW5zcGVjdG9yLlJlbmRl cmluZ0ZyYW1lVGltZWxpbmVWaWV3ID0gY2xhc3MgUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcg ZXh0ZW4KICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5l RGF0YUdyaWQodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLCBjb2x1bW5zLCB0aGlz KTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu RGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2RlU2Vs ZWN0ZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmll clNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInJlbmRlcmluZy1mcmFtZS10aW1l bGluZS12aWV3LXNvcnQiLCAic3RhcnRUaW1lIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNv cnRPcmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOworICAg ICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5T ZXR0aW5nKCJyZW5kZXJpbmctZnJhbWUtdGltZWxpbmUtdmlldy1zb3J0LW9yZGVyIiwgV2ViSW5z cGVjdG9yLkRhdGFHcmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOwogCiAgICAgICAgIHRoaXMuZWxl bWVudC5jbGFzc0xpc3QuYWRkKCJyZW5kZXJpbmctZnJhbWUiKTsKICAgICAgICAgdGhpcy5hZGRT dWJ2aWV3KHRoaXMuX2RhdGFHcmlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcwppbmRl eCBkMzhiZDFmYTZjYWJiM2EyNThlNzBjNTA0YzZiYThiN2IwNDg4YTljLi42MWExMjcxZGI3MmVm NWRhNzFkYmQyNmI5NmY5YThkMDgxNDFlN2FlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3 LmpzCkBAIC02NSw3ICs2NSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcgPSBj bGFzcyBTY3JpcHRUaW1lbGluZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuCiAgICAgICAgIHRo aXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdy aWQuRXZlbnQuRmlsdGVyc0RpZENoYW5nZSwgdGhpcy5fZGF0YUdyaWRGaWx0ZXJzRGlkQ2hhbmdl LCB0aGlzKTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWRO b2RlU2VsZWN0ZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRl bnRpZmllclNldHRpbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoInNjcmlwdC10aW1lbGlu ZS12aWV3LXNvcnQiLCAic3RhcnRUaW1lIik7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnNvcnRP cmRlciA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5Tb3J0T3JkZXIuQXNjZW5kaW5nOworICAgICAg ICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXJTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0 aW5nKCJzY3JpcHQtdGltZWxpbmUtdmlldy1zb3J0LW9yZGVyIiwgV2ViSW5zcGVjdG9yLkRhdGFH cmlkLlNvcnRPcmRlci5Bc2NlbmRpbmcpOwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xp c3QuYWRkKCJzY3JpcHQiKTsKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2RhdGFHcmlk KTsK