142290 2015-03-04 09:49:12 -0800 Web Inspector: TimelineViews should be displayed in a ContentViewContainer 2015-03-04 12:24:32 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1074104 0 burg 2015-03-04 09:49:12 -0800 TimelineRecordingContentView duplicates a bunch of logic for managing sub-views. We can give it a real ContentViewContainer to manage switching out the TimelineViews. 1074105 1 webkit-bug-importer 2015-03-04 09:49:35 -0800 <rdar://problem/20039418> 1074125 2 247870 burg 2015-03-04 10:58:41 -0800 Created attachment 247870 Proposed Fix 1074143 3 247870 timothy 2015-03-04 11:32:16 -0800 Comment on attachment 247870 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=247870&action=review Very nice. > Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js:165 > + return (contentView instanceof WebInspector.TimelineView) ? contentView : null; Nit: No need for (). 1074172 4 247870 commit-queue 2015-03-04 12:24:27 -0800 Comment on attachment 247870 Proposed Fix Clearing flags on attachment: 247870 Committed r181011: <http://trac.webkit.org/changeset/181011> 1074173 5 commit-queue 2015-03-04 12:24:32 -0800 All reviewed patches have been landed. Closing bug. 247870 2015-03-04 10:58:41 -0800 2015-03-04 12:24:27 -0800 Proposed Fix bug-142290-20150304105822.patch text/plain 37104 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxMDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi MzgzMjBiNWNjZTU4NDA4Mjg0ZDQ0NjhhZmY5OTUyMTIzNDY4ZjE4Li5jMjg2ZmY4Y2M2NzhiZmNl MDJiNjU2NmI5NGE0ZjU3NzYzNTVjNDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw4OCBAQAorMjAxNS0wMy0wNCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmVWaWV3cyBzaG91bGQgYmUg ZGlzcGxheWVkIGluIGEgQ29udGVudFZpZXdDb250YWluZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjI5MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcg aGFzIGEgYnVuY2ggb2YgbG9naWMgdG8gbWFuYWdlIHRoZSBjdXJyZW50bHkgdmlzaWJsZSBUaW1l bGluZVZpZXcuCisgICAgICAgIFRoaXMgY291bGQgYmUgZGVsZWdhdGVkIHRvIGEgQ29udGVudFZp ZXdDb250YWluZXIgdG8gc2ltcGxpZnkgdGhlIGxvZ2ljLiBJdCBhbHNvIG9wZW5zIHRoZSBwb3Nz aWJpbGl0eQorICAgICAgICBmb3Igb3RoZXIgdmlld3MgdG8gYmUgZGlzcGxheWVkIGJlbmVhdGgg dGhlIHRpbWVsaW5lIG92ZXJ2aWV3IGdyYXBocyB3aGVuIGl0IG1ha2VzIHNlbnNlIHRvIGRvIHNv LgorCisgICAgICAgIEluIG9yZGVyIHRvIGJlIGRpc3BsYXlhYmxlIGluIHRoZSBjb250YWluZXIs IFRpbWVsaW5lVmlldyBhbmQgaXRzIHN1YmNsYXNzZXMgaGF2ZSBiZWVuIHVwZ3JhZGVkIHRvCisg ICAgICAgIGJlIENvbnRlbnRWaWV3IHN1YmNsYXNzZXMuIFRoaXMgYWxzbyByZWR1Y2VzIHNvbWUg Y29kZSBkdXBsaWNhdGlvbiBmb3IgYmFzaWMgdmlldyBtYW5hZ2VtZW50LgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db250ZW50Vmlldyk6IE1vdmUgYmFzZSBjbGFzcyBpbnN0YW50aWF0aW9uIHBhdHRlcm4gZnJv bSBUaW1lbGluZVZpZXcgdG8gaGVyZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50Vmll dy5pc1ZpZXdhYmxlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVs aW5lVmlldy5qczogVXNlIENvbnRlbnRWaWV3IGV2ZW50cyBhbmQgYmFzZSBtZXRob2RzLgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUuc2hvd24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUuaGlkZGVu KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlLl9k YXRhR3JpZE5vZGVTZWxlY3RlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrVGltZWxpbmVWaWV3LmpzOiBVc2UgQ29udGVudFZpZXcgZXZlbnRzIGFuZCBiYXNlIG1ldGhv ZHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5cGUu c2hvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcucHJvdG90 eXBlLmhpZGRlbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5w cm90b3R5cGUuX2RhdGFHcmlkTm9kZVNlbGVjdGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzOiBVc2UgQ29udGVudFZpZXcgZXZlbnRzIGFu ZCBiYXNlIG1ldGhvZHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZp ZXcucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVs aW5lVmlldy5wcm90b3R5cGUuX2RhdGFHcmlkTm9kZVNlbGVjdGVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUuX3RyZWVFbGVtZW50U2VsZWN0 ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3Lmpz OiBVc2UgQ29udGVudFZpZXcgZXZlbnRzIGFuZCBiYXNlIG1ldGhvZHMuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5oaWRkZW4pOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUuX2RhdGFHcmlkTm9k ZVNlbGVjdGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3Jk aW5nQ29udGVudFZpZXcuY3NzOiBVc2UgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3Q29udGFpbmVy IGNsYXNzLgorICAgICAgICAoLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRpbmcgPiAuY29u dGVudC12aWV3LWNvbnRhaW5lcik6CisgICAgICAgICguY29udGVudC12aWV3LnRpbWVsaW5lLXJl Y29yZGluZyA+IC5jb250ZW50LXZpZXctY29udGFpbmVyID4gLnRpbWVsaW5lLXZpZXcgPiAuZGF0 YS1ncmlkIHRkKToKKyAgICAgICAgKC5jb250ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4g LmNvbnRlbnQtdmlldy1jb250YWluZXIgPiAudGltZWxpbmUtdmlldyA+IC5kYXRhLWdyaWQgdGFi bGUuZGF0YSk6CisgICAgICAgICguY29udGVudC12aWV3LnRpbWVsaW5lLXJlY29yZGluZyA+IC52 aWV3LWNvbnRhaW5lcik6IERlbGV0ZWQuCisgICAgICAgICguY29udGVudC12aWV3LnRpbWVsaW5l LXJlY29yZGluZyA+IC52aWV3LWNvbnRhaW5lciA+IC50aW1lbGluZS12aWV3ID4gLmRhdGEtZ3Jp ZCB0ZCk6IERlbGV0ZWQuCisgICAgICAgICguY29udGVudC12aWV3LnRpbWVsaW5lLXJlY29yZGlu ZyA+IC52aWV3LWNvbnRhaW5lciA+IC50aW1lbGluZS12aWV3ID4gLmRhdGEtZ3JpZCB0YWJsZS5k YXRhKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVS ZWNvcmRpbmdDb250ZW50Vmlldy5qczoKKyAgICAgICAgTWFueSBvZiB0aGUgY2hhbmdlcyBoZXJl IG1pcnJvciB0aGUgaW1wbGVtZW50YXRpb24gb2YgQ2x1c3RlckNvbnRlbnRWaWV3LiBTZWFyY2hp bmcgaXMgZGlzYWJsZWQgc2luY2UKKyAgICAgICAgbm9uZSBvZiB0aGUgdGltZWxpbmUgdmlld3Mg YXJlIGN1cnJlbnRseSBzZWFyY2hhYmxlIHVzaW5nIENvbnRlbnRWaWV3Q29udGFpbmVyJ3MgZnVs bC10ZXh0IHNlYXJjaC4KKworICAgICAgICBJbiBjYXNlcyB3aGVyZSB3ZSB1cGRhdGUgdGhlIGN1 cnJlbnQgdGltZWxpbmUgdmlldywgdGhlIGN1cnJlbnRUaW1lbGluZVZpZXcgYWNjZXNzb3IgcmV0 dXJucyB0aGUKKyAgICAgICAgY29udGVudCB2aWV3IGlmIGEgVGltZWxpbmVWaWV3IGlzIHNob3du IGluIHRoZSBjb250ZW50IHZpZXcgY29udGFpbmVyLCBvdGhlcndpc2UgbnVsbC4KKworICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLnNob3dP dmVydmlld1RpbWVsaW5lVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuc2hvd1RpbWVsaW5lVmlld0ZvclRpbWVsaW5lKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3Rv dHlwZS5nZXQgc3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgaGFuZGxl Q29weUV2ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LnByb3RvdHlwZS5nZXQgc3VwcG9ydHNTYXZlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgc2F2ZURhdGEpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90 eXBlLmdldCBjdXJyZW50VGltZWxpbmVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuaGlkZGVuKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3Rv dHlwZS5jbG9zZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29u dGVudFZpZXcucHJvdG90eXBlLmNhbkdvQmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuY2FuR29Gb3J3YXJkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5n b0JhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZp ZXcucHJvdG90eXBlLmdvRm9yd2FyZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUudXBkYXRlTGF5b3V0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5zYXZlVG9D b29raWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZp ZXcucHJvdG90eXBlLmdldCBmaWx0ZXJEaWRDaGFuZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLl9jdXJyZW50Q29udGVudFZp ZXdEaWRDaGFuZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29u dGVudFZpZXcucHJvdG90eXBlLl9jb250ZW50Vmlld1NlbGVjdGlvblBhdGhDb21wb25lbnREaWRD aGFuZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZp ZXcucHJvdG90eXBlLl9jb250ZW50Vmlld1N1cHBsZW1lbnRhbFJlcHJlc2VudGVkT2JqZWN0c0Rp ZENoYW5nZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50 Vmlldy5wcm90b3R5cGUuX3VwZGF0ZVRpbWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fdGltZWxpbmVSZW1vdmVkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlw ZS5fdGltZWxpbmVDb3VudENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLl90aW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2Vk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnBy b3RvdHlwZS5maWx0ZXJEaWRDaGFuZ2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLl90aW1lbGluZVZpZXdTZWxl Y3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX3Nob3dUaW1lbGlu ZVZpZXcpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVW aWV3LmpzOiBSZW1vdmUgZHVwbGljYXRlZCBmdW5jdGlvbmFsaXR5IGFuZCB1c2UgQ29udGVudFZp ZXcgZXF1aXZhbGVudHMgaW5zdGVhZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVZp ZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuZmlsdGVy VXBkYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5u ZWVkc0xheW91dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlw ZS5nZXQgcmVwcmVzZW50ZWRPYmplY3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lVmlldy5wcm90b3R5cGUuZ2V0IHZpc2libGUpOiBEZWxldGVkLgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuc2hvd24pOiBEZWxldGVkLgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuaGlkZGVuKTogRGVsZXRl ZC4KKwogMjAxNS0wMy0wMyAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+ CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjogc2VsZWN0aW5nIG92ZXJ2aWV3IHRpbWVsaW5lIHRy ZWUgZWxlbWVudHMgd2l0aG91dCBzb3VyY2UgbG9jYXRpb25zIGRvZXNuJ3QgdXBkYXRlIHNlbGVj dGlvbiBjb21wb25lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzCmluZGV4IDRmZWE2NjA5ZGYyNWU3MDVmMjUw NThlNDUyZDZkZTJlNGFlZTI5YmEuLmNiMzJhZTc5ZGRkYWMxYzU1ODBiNzQ1ZGU1ZTU3NjA5ZDA0 NmNlYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzCkBAIC00Miw2ICs0MiwxOCBAQCBXZWJJbnNwZWN0b3Iu Q29udGVudFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKICAgICAgICAgaWYgKHJl cHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5n KQogICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdD b250ZW50VmlldyhyZXByZXNlbnRlZE9iamVjdCk7CiAKKyAgICAgICAgaWYgKHJlcHJlc2VudGVk T2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lKSB7CisgICAgICAgICAgICB2 YXIgdGltZWxpbmVUeXBlID0gcmVwcmVzZW50ZWRPYmplY3QudHlwZTsKKyAgICAgICAgICAgIGlm ICh0aW1lbGluZVR5cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLk5ldHdv cmspCisgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVs aW5lVmlldyhyZXByZXNlbnRlZE9iamVjdCk7CisKKyAgICAgICAgICAgIGlmICh0aW1lbGluZVR5 cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dCkKKyAgICAgICAg ICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcocmVwcmVz ZW50ZWRPYmplY3QpOworCisgICAgICAgICAgICBpZiAodGltZWxpbmVUeXBlID09PSBXZWJJbnNw ZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQpCisgICAgICAgICAgICAgICAgcmV0dXJu IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsK KyAgICAgICAgfQorCiAgICAgICAgIGlmIChyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdl Ykluc3BlY3Rvci5ET01TdG9yYWdlT2JqZWN0KQogICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJ bnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsKIApAQCAt MTA2LDYgKzExOCw4IEBAIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5pc1ZpZXdhYmxlID0gZnVu Y3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGlmIChy ZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGlu ZykKICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0IGluc3Rh bmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lKQorICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBp ZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZU9i amVjdCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0IGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VPYmplY3QpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRU aW1lbGluZVZpZXcuanMKaW5kZXggNzljYmM5NjQ4Y2Q3YzQzOTMzZDI4NDY4ZDdjZDBiYjk5OTQ4 ZDc2MS4uMDViNDZkNWE4NWM5OWM3ZWVjMjdkOWM3ZThlN2M4MDIxMzU3NDEwNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxp bmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xheW91dFRpbWVsaW5lVmlldy5qcwpAQCAtMTA5LDcgKzEwOSw3IEBAIFdlYkluc3BlY3Rvci5M YXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgc2hvd246IGZ1bmN0aW9uKCkK ICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnNob3du LmNhbGwodGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5wcm90b3R5cGUu c2hvd24uY2FsbCh0aGlzKTsKIAogICAgICAgICB0aGlzLl91cGRhdGVIaWdobGlnaHQoKTsKIApA QCAtMTIyLDcgKzEyMiw3IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90 eXBlID0gewogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmhpZGRlbigpOwogCi0gICAgICAgIFdl Ykluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLmhpZGRlbi5jYWxsKHRoaXMpOworICAg ICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcucHJvdG90eXBlLmhpZGRlbi5jYWxsKHRoaXMp OwogICAgIH0sCiAKICAgICBmaWx0ZXJEaWRDaGFuZ2U6IGZ1bmN0aW9uKCkKQEAgLTE5OSw3ICsx OTksNyBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKIAog ICAgIF9kYXRhR3JpZE5vZGVTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3 LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKKyAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50LlNl bGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKICAgICB9LAogCiAgICAgX3RyZWVFbGVt ZW50RGVzZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVs aW5lVmlldy5qcwppbmRleCAwZGZmNDkyNmQ3NjYxMjJlOGJmNDMzYmZkODViMmM5MTI2ZDliMmJh Li44NDNlM2M3NDRhMzAzZDY0MWQyMWMxZjY3MmNmMDFmYzllODQ5NDE2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05l dHdvcmtUaW1lbGluZVZpZXcuanMKQEAgLTExNSw3ICsxMTUsNyBAQCBXZWJJbnNwZWN0b3IuTmV0 d29ya1RpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBzaG93bjogZnVuY3Rpb24oKQog ICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuc2hvd24u Y2FsbCh0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LnByb3RvdHlwZS5z aG93bi5jYWxsKHRoaXMpOwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3duKCk7CiAgICAg fSwKQEAgLTEyNCw3ICsxMjQsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5w cm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLl9kYXRhR3JpZC5oaWRkZW4oKTsKIAot ICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5oaWRkZW4uY2FsbCh0 aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4u Y2FsbCh0aGlzKTsKICAgICB9LAogCiAgICAgdXBkYXRlTGF5b3V0OiBmdW5jdGlvbigpCkBAIC0x OTcsNyArMTk3LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcucHJvdG90eXBl ID0gewogCiAgICAgX2RhdGFHcmlkTm9kZVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7 Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1l bGluZVZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOworICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcu RXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOwogICAgIH0sCiAKICAgICBf dHJlZUVsZW1lbnREZXNlbGVjdGVkOiBmdW5jdGlvbih0cmVlRWxlbWVudCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxp bmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3Zl cnZpZXdUaW1lbGluZVZpZXcuanMKaW5kZXggZmQ5YTlhMDhiODQ0NTAzNWYxNzRjODgyZjYwMTVm NGExODY3NjIyNC4uYmQ4MGVkMjM5YjY3MTM5YTg1YzZmNDZhNGFlMjRjYWVkN2Y3Nzc3MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3ZlcnZp ZXdUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKQEAgLTgzLDcgKzgzLDcgQEAgV2ViSW5z cGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIHNob3duOiBm dW5jdGlvbigpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3Rv dHlwZS5zaG93bi5jYWxsKHRoaXMpOworICAgICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcu cHJvdG90eXBlLnNob3duLmNhbGwodGhpcyk7CiAKICAgICAgICAgdGhpcy5fdHJlZU91dGxpbmVE YXRhR3JpZFN5bmNocm9uaXplci5zeW5jaHJvbml6ZSgpOwogICAgIH0sCkBAIC0zMjIsNyArMzIy LDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKIAog ICAgIF9kYXRhR3JpZE5vZGVTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3 LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKKyAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50LlNl bGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKICAgICB9LAogCiAgICAgX3RyZWVFbGVt ZW50RGVzZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQpCkBAIC0zNTIsNyArMzUyLDcgQEAg V2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAg ICBpZiAoIXRyZWVFbGVtZW50LnNvdXJjZUNvZGVUaW1lbGluZS5zb3VyY2VDb2RlTG9jYXRpb24p IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5zaG93VGlt ZWxpbmVPdmVydmlldygpOwotICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50 c0RpZENoYW5nZSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRD aGFuZ2UpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRp bWVsaW5lVmlldy5qcwppbmRleCA5NTAyZjg3MWI1ZmYzZDkxZDAyNTE0MTQ1NjQ1YzEzNmVlMDMx NjIzLi5jM2E0ZDc3YTkxOWZiMjk0MGFmMGQwYTY2NjAwYmNmMjM4YzFlNjY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NyaXB0VGltZWxpbmVWaWV3LmpzCkBAIC05MSw3ICs5MSw3IEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgc2hvd246IGZ1bmN0aW9uKCkKICAg ICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnNob3duLmNh bGwodGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5wcm90b3R5cGUuc2hv d24uY2FsbCh0aGlzKTsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZC5zaG93bigpOwogICAgIH0s CkBAIC0xMDAsNyArMTAwLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLl9kYXRhR3JpZC5oaWRkZW4oKTsKIAotICAg ICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5oaWRkZW4uY2FsbCh0aGlz KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4uY2Fs bCh0aGlzKTsKICAgICB9LAogCiAgICAgdXBkYXRlTGF5b3V0OiBmdW5jdGlvbigpCkBAIC0yNDMs NyArMjQzLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7 CiAKICAgICBfZGF0YUdyaWROb2RlU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5l Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CisgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5FdmVu dC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CiAgICAgfSwKIAogICAgIF90cmVl RWxlbWVudERlc2VsZWN0ZWQ6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdD b250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmNzcwppbmRleCAzOTJiZWJkMzE4MjVhMmNh ZmFhNzk3ZWNhNTlkMWM5N2Y1MDYzNjhhLi4yYzJhMWEzZjFkMTRhY2QzZWFjNTg4M2U0MzQzNjk4 NGZjOGUyYzYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRW aWV3LmNzcwpAQCAtMzAsNyArMzAsNyBAQAogICAgIHJpZ2h0OiAwOwogfQogCi0uY29udGVudC12 aWV3LnRpbWVsaW5lLXJlY29yZGluZyA+IC52aWV3LWNvbnRhaW5lciB7CisuY29udGVudC12aWV3 LnRpbWVsaW5lLXJlY29yZGluZyA+IC5jb250ZW50LXZpZXctY29udGFpbmVyIHsKICAgICBwb3Np dGlvbjogYWJzb2x1dGU7CiAgICAgbGVmdDogMDsKICAgICByaWdodDogMDsKQEAgLTM4LDEyICsz OCwxMiBAQAogICAgIG92ZXJmbG93OiBoaWRkZW47CiB9CiAKLS5jb250ZW50LXZpZXcudGltZWxp bmUtcmVjb3JkaW5nID4gLnZpZXctY29udGFpbmVyID4gLnRpbWVsaW5lLXZpZXcgPiAuZGF0YS1n cmlkIHRkIHsKKy5jb250ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRlbnQtdmll dy1jb250YWluZXIgPiAudGltZWxpbmUtdmlldyA+IC5kYXRhLWdyaWQgdGQgewogICAgIGhlaWdo dDogMTZweDsKICAgICBsaW5lLWhlaWdodDogMTZweDsKIH0KIAotLmNvbnRlbnQtdmlldy50aW1l bGluZS1yZWNvcmRpbmcgPiAudmlldy1jb250YWluZXIgPiAudGltZWxpbmUtdmlldyA+IC5kYXRh LWdyaWQgdGFibGUuZGF0YSB7CisuY29udGVudC12aWV3LnRpbWVsaW5lLXJlY29yZGluZyA+IC5j b250ZW50LXZpZXctY29udGFpbmVyID4gLnRpbWVsaW5lLXZpZXcgPiAuZGF0YS1ncmlkIHRhYmxl LmRhdGEgewogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20s IHdoaXRlLCB3aGl0ZSA1MCUsIHJnYigyNDMsIDI0MywgMjQzKSA1MCUsIHJnYigyNDMsIDI0Mywg MjQzKSk7CiAgICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDQwcHg7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwppbmRleCA2YjFiNDQxMjg3OTM3YzA2 MTFhZDcxYTE3MGJkZDQ4MzZhMjNhMmE1Li4xNDE5NzU1NGQ5MDE4NTcyMTZmYzJkMjk1NTFhZWRh NjU2MzgyZGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZp ZXcuanMKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNSBVbml2ZXJzaXR5 IG9mIFdhc2hpbmd0b24uCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM1LDkg KzM2LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBmdW5j dGlvbihyZWNvcmRpbmcpCiAgICAgdGhpcy5fdGltZWxpbmVPdmVydmlldy5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LkV2ZW50LlRpbWVSYW5nZVNlbGVjdGlv bkNoYW5nZWQsIHRoaXMuX3RpbWVSYW5nZVNlbGVjdGlvbkNoYW5nZWQsIHRoaXMpOwogICAgIHRo aXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl90aW1lbGluZU92ZXJ2aWV3LmVsZW1lbnQpOwog Ci0gICAgdGhpcy5fdmlld0NvbnRhaW5lckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKLSAgICB0aGlzLl92aWV3Q29udGFpbmVyRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LlZpZXdDb250YWluZXJTdHls ZUNsYXNzTmFtZSk7Ci0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3ZpZXdDb250 YWluZXJFbGVtZW50KTsKKyAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lciA9IG5ldyBXZWJJ bnNwZWN0b3IuQ29udGVudFZpZXdDb250YWluZXIoKTsKKyAgICB0aGlzLl9jb250ZW50Vmlld0Nv bnRhaW5lci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db250ZW50Vmlld0NvbnRhaW5l ci5FdmVudC5DdXJyZW50Q29udGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMuX2N1cnJlbnRDb250ZW50 Vmlld0RpZENoYW5nZSwgdGhpcyk7CisgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X2NvbnRlbnRWaWV3Q29udGFpbmVyLmVsZW1lbnQpOwogCiAgICAgdmFyIHRyYXNoSW1hZ2U7CiAg ICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5pc0xlZ2FjeU1hY09TKQpAQCAtNTQsOSArNTUs NiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGZ1bmN0aW9u KHJlY29yZGluZykKICAgICB0aGlzLl90aW1lbGluZVZpZXdNYXAgPSBuZXcgTWFwOwogICAgIHRo aXMuX3BhdGhDb21wb25lbnRNYXAgPSBuZXcgTWFwOwogCi0gICAgdGhpcy5fY3VycmVudFRpbWVs aW5lVmlldyA9IG51bGw7Ci0gICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlld0lkZW50aWZpZXIg PSBudWxsOwotCiAgICAgdGhpcy5fdXBkYXRpbmcgPSBmYWxzZTsKICAgICB0aGlzLl9jdXJyZW50 VGltZSA9IE5hTjsKICAgICB0aGlzLl9sYXN0VXBkYXRlVGltZXN0YW1wID0gTmFOOwpAQCAtNzMs NiArNzEsOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGZ1 bmN0aW9uKHJlY29yZGluZykKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5QYXVzZWQsIHRo aXMuX2RlYnVnZ2VyUGF1c2VkLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5h Z2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5S ZXN1bWVkLCB0aGlzLl9kZWJ1Z2dlclJlc3VtZWQsIHRoaXMpOwogCisgICAgV2ViSW5zcGVjdG9y LkNvbnRlbnRWaWV3LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2 ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlLCB0aGlzLl9jb250ZW50Vmlld1Nl bGVjdGlvblBhdGhDb21wb25lbnREaWRDaGFuZ2UsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5D b250ZW50Vmlldy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5FdmVu dC5TdXBwbGVtZW50YWxSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2UsIHRoaXMuX2NvbnRlbnRW aWV3U3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlLCB0aGlzKTsKKwogICAg IGZvciAodmFyIHRpbWVsaW5lIG9mIHRoaXMuX3JlY29yZGluZy50aW1lbGluZXMudmFsdWVzKCkp CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lQWRkZWQodGltZWxpbmUpOwogCkBAIC04MCw3ICs4MSw2 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3ID0gZnVuY3Rpb24o cmVjb3JkaW5nKQogfTsKIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZp ZXcuU3R5bGVDbGFzc05hbWUgPSAidGltZWxpbmUtcmVjb3JkaW5nIjsKLVdlYkluc3BlY3Rvci5U aW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LlZpZXdDb250YWluZXJTdHlsZUNsYXNzTmFtZSA9 ICJ2aWV3LWNvbnRhaW5lciI7CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LlNlbGVjdGVkVGltZWxpbmVUeXBlQ29va2llS2V5ID0gInRpbWVsaW5lLXJlY29yZGlu Zy1jb250ZW50LXZpZXctc2VsZWN0ZWQtdGltZWxpbmUtdHlwZSI7CiBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5PdmVydmlld1RpbWVsaW5lVmlld0Nvb2tpZVZhbHVl ID0gInRpbWVsaW5lLXJlY29yZGluZy1jb250ZW50LXZpZXctb3ZlcnZpZXctdGltZWxpbmUtdmll dyI7CkBAIC05Myw3ICs5Myw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIHNob3dPdmVydmlld1RpbWVsaW5lVmlldzogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fc2hvd1RpbWVsaW5lVmlldyh0aGlzLl9vdmVy dmlld1RpbWVsaW5lVmlldyk7CisgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLnNo b3dDb250ZW50Vmlldyh0aGlzLl9vdmVydmlld1RpbWVsaW5lVmlldyk7CiAgICAgfSwKIAogICAg IHNob3dUaW1lbGluZVZpZXdGb3JUaW1lbGluZTogZnVuY3Rpb24odGltZWxpbmUpCkBAIC0xMDMs NyArMTAzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJv dG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3RpbWVsaW5lVmlld01hcC5oYXModGltZWxp bmUpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3Nob3dUaW1lbGluZVZp ZXcodGhpcy5fdGltZWxpbmVWaWV3TWFwLmdldCh0aW1lbGluZSkpOworICAgICAgICB0aGlzLl9j b250ZW50Vmlld0NvbnRhaW5lci5zaG93Q29udGVudFZpZXcodGhpcy5fdGltZWxpbmVWaWV3TWFw LmdldCh0aW1lbGluZSkpOwogICAgIH0sCiAKICAgICBnZXQgYWxsb3dlZE5hdmlnYXRpb25TaWRl YmFyUGFuZWxzKCkKQEAgLTExOSwzMCArMTE5LDU2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJl Y29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIGdldCBzZWxlY3Rpb25QYXRo Q29tcG9uZW50cygpCiAgICAgewotICAgICAgICB2YXIgcGF0aENvbXBvbmVudHMgPSBbXTsKLSAg ICAgICAgaWYgKHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcucmVwcmVzZW50ZWRPYmplY3QgaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuVGltZWxpbmUpCi0gICAgICAgICAgICBwYXRoQ29tcG9uZW50 cy5wdXNoKHRoaXMuX3BhdGhDb21wb25lbnRNYXAuZ2V0KHRoaXMuX2N1cnJlbnRUaW1lbGluZVZp ZXcucmVwcmVzZW50ZWRPYmplY3QpKTsKLSAgICAgICAgcGF0aENvbXBvbmVudHMgPSBwYXRoQ29t cG9uZW50cy5jb25jYXQodGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5zZWxlY3Rpb25QYXRoQ29t cG9uZW50cyB8fCBbXSk7CisgICAgICAgIGlmICghdGhpcy5fY29udGVudFZpZXdDb250YWluZXIu Y3VycmVudENvbnRlbnRWaWV3KQorICAgICAgICAgICAgcmV0dXJuIFtdOworCisgICAgICAgIHZh ciBwYXRoQ29tcG9uZW50cyA9IHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250 ZW50Vmlldy5zZWxlY3Rpb25QYXRoQ29tcG9uZW50cyB8fCBbXTsKKyAgICAgICAgdmFyIHJlcHJl c2VudGVkT2JqZWN0ID0gdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuY3VycmVudENvbnRlbnRW aWV3LnJlcHJlc2VudGVkT2JqZWN0OworICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuVGltZWxpbmUpCisgICAgICAgICAgICBwYXRoQ29tcG9uZW50 cy51bnNoaWZ0KHRoaXMuX3BhdGhDb21wb25lbnRNYXAuZ2V0KHJlcHJlc2VudGVkT2JqZWN0KSk7 CiAgICAgICAgIHJldHVybiBwYXRoQ29tcG9uZW50czsKICAgICB9LAogCisgICAgZ2V0IHN1cHBs ZW1lbnRhbFJlcHJlc2VudGVkT2JqZWN0cygpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2Nv bnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50VmlldykKKyAgICAgICAgICAgIHJldHVy biBbXTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRD b250ZW50Vmlldy5zdXBwbGVtZW50YWxSZXByZXNlbnRlZE9iamVjdHM7CisgICAgfSwKKwogICAg IGdldCBuYXZpZ2F0aW9uSXRlbXMoKQogICAgIHsKICAgICAgICAgcmV0dXJuIFt0aGlzLl9jbGVh clRpbWVsaW5lTmF2aWdhdGlvbkl0ZW1dOwogICAgIH0sCiAKKyAgICBnZXQgaGFuZGxlQ29weUV2 ZW50KCkKKyAgICB7CisgICAgICAgIHZhciBjdXJyZW50Q29udGVudFZpZXcgPSB0aGlzLl9jb250 ZW50Vmlld0NvbnRhaW5lci5jdXJyZW50Q29udGVudFZpZXc7CisgICAgICAgIHJldHVybiBjdXJy ZW50Q29udGVudFZpZXcgJiYgdHlwZW9mIGN1cnJlbnRDb250ZW50Vmlldy5oYW5kbGVDb3B5RXZl bnQgPT09ICJmdW5jdGlvbiIgPyBjdXJyZW50Q29udGVudFZpZXcuaGFuZGxlQ29weUV2ZW50LmJp bmQoY3VycmVudENvbnRlbnRWaWV3KSA6IG51bGw7CisgICAgfSwKKworICAgIGdldCBzdXBwb3J0 c1NhdmUoKQorICAgIHsKKyAgICAgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuX2Nv bnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50VmlldzsKKyAgICAgICAgcmV0dXJuIGN1 cnJlbnRDb250ZW50VmlldyAmJiBjdXJyZW50Q29udGVudFZpZXcuc3VwcG9ydHNTYXZlOworICAg IH0sCisKKyAgICBnZXQgc2F2ZURhdGEoKQorICAgIHsKKyAgICAgICAgdmFyIGN1cnJlbnRDb250 ZW50VmlldyA9IHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50VmlldzsK KyAgICAgICAgcmV0dXJuIGN1cnJlbnRDb250ZW50VmlldyAmJiBjdXJyZW50Q29udGVudFZpZXcu c2F2ZURhdGEgfHwgbnVsbDsKKyAgICB9LAorCiAgICAgZ2V0IGN1cnJlbnRUaW1lbGluZVZpZXco KQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXc7CisgICAg ICAgIHZhciBjb250ZW50VmlldyA9IHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRD b250ZW50VmlldzsKKyAgICAgICAgcmV0dXJuIChjb250ZW50VmlldyBpbnN0YW5jZW9mIFdlYklu c3BlY3Rvci5UaW1lbGluZVZpZXcpID8gY29udGVudFZpZXcgOiBudWxsOwogICAgIH0sCiAKICAg ICBzaG93bjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9jdXJyZW50VGlt ZWxpbmVWaWV3KQotICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIHRoaXMuX3RpbWVsaW5l T3ZlcnZpZXcuc2hvd24oKTsKLSAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5zaG93 bigpOworICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5zaG93bigpOwogICAgICAg ICB0aGlzLl9jbGVhclRpbWVsaW5lTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IHRoaXMuX3JlY29y ZGluZy5pc1dyaXRhYmxlKCk7CiAKICAgICAgICAgaWYgKCF0aGlzLl91cGRhdGluZyAmJiBXZWJJ bnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLmFjdGl2ZVJlY29yZGluZyA9PT0gdGhpcy5fcmVjb3Jk aW5nICYmIFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuaXNDYXB0dXJpbmcoKSkKQEAgLTE1 MSw0MiArMTc3LDU5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3 LnByb3RvdHlwZSA9IHsKIAogICAgIGhpZGRlbjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg aWYgKCF0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3KQotICAgICAgICAgICAgcmV0dXJuOwotCiAg ICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuaGlkZGVuKCk7Ci0gICAgICAgIHRoaXMuX2N1 cnJlbnRUaW1lbGluZVZpZXcuaGlkZGVuKCk7CisgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29u dGFpbmVyLmhpZGRlbigpOwogCiAgICAgICAgIGlmICh0aGlzLl91cGRhdGluZykKICAgICAgICAg ICAgIHRoaXMuX3N0b3BVcGRhdGluZ0N1cnJlbnRUaW1lKCk7CiAgICAgfSwKIAotICAgIGZpbHRl ckRpZENoYW5nZTogZnVuY3Rpb24oKQorICAgIGNsb3NlZDogZnVuY3Rpb24oKQogICAgIHsKLSAg ICAgICAgaWYgKCF0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3KQotICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5jbG9zZUFsbENvbnRlbnRWaWV3 cygpOworCisgICAgICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5yZW1vdmVFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50 c0RpZENoYW5nZSwgdGhpcy5fY29udGVudFZpZXdTZWxlY3Rpb25QYXRoQ29tcG9uZW50RGlkQ2hh bmdlLCB0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LnJlbW92ZUV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50LlN1cHBsZW1lbnRhbFJlcHJl c2VudGVkT2JqZWN0c0RpZENoYW5nZSwgdGhpcy5fY29udGVudFZpZXdTdXBwbGVtZW50YWxSZXBy ZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2UsIHRoaXMpOworICAgIH0sCisKKyAgICBjYW5Hb0JhY2s6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50Vmlld0NvbnRh aW5lci5jYW5Hb0JhY2soKTsKKyAgICB9LAorCisgICAgY2FuR29Gb3J3YXJkOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuY2FuR29G b3J3YXJkKCk7CisgICAgfSwKKworICAgIGdvQmFjazogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuZ29CYWNrKCk7CisgICAgfSwKIAotICAgICAg ICB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LmZpbHRlckRpZENoYW5nZSgpOworICAgIGdvRm9y d2FyZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fY29udGVudFZpZXdDb250YWlu ZXIuZ29Gb3J3YXJkKCk7CiAgICAgfSwKIAogICAgIHVwZGF0ZUxheW91dDogZnVuY3Rpb24oKQog ICAgIHsKICAgICAgICAgdGhpcy5fdGltZWxpbmVPdmVydmlldy51cGRhdGVMYXlvdXRGb3JSZXNp emUoKTsKIAotICAgICAgICBpZiAoIXRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcpCi0gICAgICAg ICAgICByZXR1cm47Ci0KLSAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy51cGRhdGVM YXlvdXQoKTsKKyAgICAgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuX2NvbnRlbnRW aWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50VmlldzsKKyAgICAgICAgaWYgKGN1cnJlbnRDb250 ZW50VmlldykKKyAgICAgICAgICAgIGN1cnJlbnRDb250ZW50Vmlldy51cGRhdGVMYXlvdXQoKTsK ICAgICB9LAogCiAgICAgc2F2ZVRvQ29va2llOiBmdW5jdGlvbihjb29raWUpCiAgICAgewogICAg ICAgICBjb29raWUudHlwZSA9IFdlYkluc3BlY3Rvci5Db250ZW50Vmlld0Nvb2tpZVR5cGUuVGlt ZWxpbmVzOwogCi0gICAgICAgIGlmICghdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldyB8fCB0aGlz Ll9jdXJyZW50VGltZWxpbmVWaWV3ID09PSB0aGlzLl9vdmVydmlld1RpbWVsaW5lVmlldykKKyAg ICAgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVy LmN1cnJlbnRDb250ZW50VmlldzsKKyAgICAgICAgaWYgKCFjdXJyZW50Q29udGVudFZpZXcgfHwg Y3VycmVudENvbnRlbnRWaWV3ID09PSB0aGlzLl9vdmVydmlld1RpbWVsaW5lVmlldykKICAgICAg ICAgICAgIGNvb2tpZVtXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5T ZWxlY3RlZFRpbWVsaW5lVHlwZUNvb2tpZUtleV0gPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmRpbmdDb250ZW50Vmlldy5PdmVydmlld1RpbWVsaW5lVmlld0Nvb2tpZVZhbHVlOwotICAgICAg ICBlbHNlCi0gICAgICAgICAgICBjb29raWVbV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5n Q29udGVudFZpZXcuU2VsZWN0ZWRUaW1lbGluZVR5cGVDb29raWVLZXldID0gdGhpcy5fY3VycmVu dFRpbWVsaW5lVmlldy5yZXByZXNlbnRlZE9iamVjdC50eXBlOworICAgICAgICBlbHNlIGlmIChj dXJyZW50Q29udGVudFZpZXcucmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0 b3IuVGltZWxpbmUpCisgICAgICAgICAgICBjb29raWVbV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVj b3JkaW5nQ29udGVudFZpZXcuU2VsZWN0ZWRUaW1lbGluZVR5cGVDb29raWVLZXldID0gdGhpcy5j dXJyZW50VGltZWxpbmVWaWV3LnJlcHJlc2VudGVkT2JqZWN0LnR5cGU7CiAgICAgfSwKIAogICAg IHJlc3RvcmVGcm9tQ29va2llOiBmdW5jdGlvbihjb29raWUpCkBAIC0xOTksOSArMjQyLDE3IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHRoaXMuc2hvd1RpbWVsaW5lVmlld0ZvclRpbWVsaW5lKHRoaXMucmVwcmVz ZW50ZWRPYmplY3QudGltZWxpbmVzLmdldCh0aW1lbGluZVR5cGUpKTsKICAgICB9LAogCisgICAg ZmlsdGVyRGlkQ2hhbmdlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuY3Vy cmVudFRpbWVsaW5lVmlldykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLmN1 cnJlbnRUaW1lbGluZVZpZXcuZmlsdGVyRGlkQ2hhbmdlKCk7CisgICAgfSwKKwogICAgIG1hdGNo VHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmlsdGVyczogZnVuY3Rpb24odHJlZUVsZW1lbnQpCiAg ICAgewotICAgICAgICBpZiAodGhpcy5fY3VycmVudFRpbWVsaW5lVmlldyAmJiAhdGhpcy5fY3Vy cmVudFRpbWVsaW5lVmlldy5tYXRjaFRyZWVFbGVtZW50QWdhaW5zdEN1c3RvbUZpbHRlcnModHJl ZUVsZW1lbnQpKQorICAgICAgICBpZiAodGhpcy5jdXJyZW50VGltZWxpbmVWaWV3ICYmICF0aGlz LmN1cnJlbnRUaW1lbGluZVZpZXcubWF0Y2hUcmVlRWxlbWVudEFnYWluc3RDdXN0b21GaWx0ZXJz KHRyZWVFbGVtZW50KSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICB2YXIg c3RhcnRUaW1lID0gdGhpcy5fdGltZWxpbmVPdmVydmlldy5zZWxlY3Rpb25TdGFydFRpbWU7CkBA IC0yNTcsNTEgKzMwOCwzOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50 Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAvLyBQcml2YXRlCiAKKyAgICBfY3VycmVudENvbnRl bnRWaWV3RGlkQ2hhbmdlOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciB0aW1l bGluZVZpZXcgPSB0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXc7CisgICAgICAgIGlmICh0aW1lbGlu ZVZpZXcpIHsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5j b250ZW50VHJlZU91dGxpbmUgPSB0aW1lbGluZVZpZXcubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0 bGluZTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5jb250 ZW50VHJlZU91dGxpbmVMYWJlbCA9IHRpbWVsaW5lVmlldy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVP dXRsaW5lTGFiZWw7CisKKyAgICAgICAgICAgIHRpbWVsaW5lVmlldy5zdGFydFRpbWUgPSB0aGlz Ll90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZTsKKyAgICAgICAgICAgIHRpbWVs aW5lVmlldy5lbmRUaW1lID0gdGhpcy5fdGltZWxpbmVPdmVydmlldy5zZWxlY3Rpb25TdGFydFRp bWUgKyB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvbkR1cmF0aW9uOworICAgICAgICAg ICAgdGltZWxpbmVWaWV3LmN1cnJlbnRUaW1lID0gdGhpcy5fY3VycmVudFRpbWU7CisgICAgICAg IH0KKworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu Q29udGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOworICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVudFZp ZXcuRXZlbnQuTmF2aWdhdGlvbkl0ZW1zRGlkQ2hhbmdlKTsKKyAgICB9LAorCiAgICAgX3BhdGhD b21wb25lbnRTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICBXZWJJbnNw ZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hvd1RpbWVsaW5lVmlld0ZvclRpbWVsaW5lKGV2 ZW50LmRhdGEucGF0aENvbXBvbmVudC5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgfSwKIAotICAg IF90aW1lbGluZVZpZXdTZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZTogZnVuY3Rpb24o KQorICAgIF9jb250ZW50Vmlld1NlbGVjdGlvblBhdGhDb21wb25lbnREaWRDaGFuZ2U6IGZ1bmN0 aW9uKGV2ZW50KQogICAgIHsKKyAgICAgICAgaWYgKGV2ZW50LnRhcmdldCAhPT0gdGhpcy5fY29u dGVudFZpZXdDb250YWluZXIuY3VycmVudENvbnRlbnRWaWV3KQorICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29u dGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOwogICAgIH0s CiAKLSAgICBfc2hvd1RpbWVsaW5lVmlldzogZnVuY3Rpb24odGltZWxpbmVWaWV3KQorICAgIF9j b250ZW50Vmlld1N1cHBsZW1lbnRhbFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZTogZnVuY3Rp b24oZXZlbnQpCiAgICAgewotICAgICAgICBjb25zb2xlLmFzc2VydCh0aW1lbGluZVZpZXcgaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3KTsKLSAgICAgICAgY29uc29sZS5hc3Nl cnQodGltZWxpbmVWaWV3LnJlcHJlc2VudGVkT2JqZWN0ID09PSB0aGlzLl9yZWNvcmRpbmcgfHwg dGhpcy5fcmVjb3JkaW5nLnRpbWVsaW5lcy5oYXModGltZWxpbmVWaWV3LnJlcHJlc2VudGVkT2Jq ZWN0LnR5cGUpKTsKLQotICAgICAgICAvLyBJZiB0aGUgY29udGVudCB2aWV3IGlzIHNob3duIGFu ZCB0aGVuIGhpZGRlbiwgd2UgbXVzdCByZWF0dGFjaCB0aGUgY29udGVudCB0cmVlIG91dGxpbmUg YW5kIHRpbWVsaW5lIHZpZXcuCi0gICAgICAgIGlmICh0aW1lbGluZVZpZXcudmlzaWJsZSAmJiB0 aW1lbGluZVZpZXcgPT09IHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcpCisgICAgICAgIGlmIChl dmVudC50YXJnZXQgIT09IHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50 VmlldykKICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBpZiAodGhpcy5fY3VycmVudFRp bWVsaW5lVmlldykgewotICAgICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5yZW1v dmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuRXZlbnQuU2VsZWN0aW9u UGF0aENvbXBvbmVudHNEaWRDaGFuZ2UsIHRoaXMuX3RpbWVsaW5lVmlld1NlbGVjdGlvblBhdGhD b21wb25lbnRzRGlkQ2hhbmdlLCB0aGlzKTsKLQotICAgICAgICAgICAgdGhpcy5fY3VycmVudFRp bWVsaW5lVmlldy5oaWRkZW4oKTsKLSAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZp ZXcuZWxlbWVudC5yZW1vdmUoKTsKLSAgICAgICAgfQotCi0gICAgICAgIHRoaXMuX2N1cnJlbnRU aW1lbGluZVZpZXcgPSB0aW1lbGluZVZpZXc7Ci0KLSAgICAgICAgV2ViSW5zcGVjdG9yLnRpbWVs aW5lU2lkZWJhclBhbmVsLmNvbnRlbnRUcmVlT3V0bGluZSA9IHRpbWVsaW5lVmlldyAmJiB0aW1l bGluZVZpZXcubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZTsKLSAgICAgICAgV2ViSW5zcGVj dG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLmNvbnRlbnRUcmVlT3V0bGluZUxhYmVsID0gdGltZWxp bmVWaWV3ICYmIHRpbWVsaW5lVmlldy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lTGFiZWw7 Ci0KLSAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcpIHsKLSAgICAgICAgICAg IHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu VGltZWxpbmVWaWV3LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlLCB0aGlz Ll90aW1lbGluZVZpZXdTZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSwgdGhpcyk7Ci0K LSAgICAgICAgICAgIHRoaXMuX3ZpZXdDb250YWluZXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X2N1cnJlbnRUaW1lbGluZVZpZXcuZWxlbWVudCk7Ci0KLSAgICAgICAgICAgIHRoaXMuX2N1cnJl bnRUaW1lbGluZVZpZXcuc3RhcnRUaW1lID0gdGhpcy5fdGltZWxpbmVPdmVydmlldy5zZWxlY3Rp b25TdGFydFRpbWU7Ci0gICAgICAgICAgICB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LmVuZFRp bWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZSArIHRoaXMuX3Rp bWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uRHVyYXRpb247Ci0gICAgICAgICAgICB0aGlzLl9jdXJy ZW50VGltZWxpbmVWaWV3LmN1cnJlbnRUaW1lID0gdGhpcy5fY3VycmVudFRpbWU7Ci0KLSAgICAg ICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcuc2hvd24oKTsKLSAgICAgICAgICAgIHRo aXMuX2N1cnJlbnRUaW1lbGluZVZpZXcudXBkYXRlTGF5b3V0KCk7Ci0gICAgICAgIH0KLQotICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVudFZp ZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOworICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuRXZlbnQu U3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlKTsKICAgICB9LAogCiAgICAg X3VwZGF0ZTogZnVuY3Rpb24odGltZXN0YW1wKQpAQCAtMzUwLDEzICszODksMTUgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAg ICAgIHRoaXMuX2N1cnJlbnRUaW1lID0gY3VycmVudFRpbWU7CiAgICAgICAgIHRoaXMuX3RpbWVs aW5lT3ZlcnZpZXcuY3VycmVudFRpbWUgPSBjdXJyZW50VGltZTsKLSAgICAgICAgdGhpcy5fY3Vy cmVudFRpbWVsaW5lVmlldy5jdXJyZW50VGltZSA9IGN1cnJlbnRUaW1lOworICAgICAgICBpZiAo dGhpcy5jdXJyZW50VGltZWxpbmVWaWV3KQorICAgICAgICAgICAgdGhpcy5jdXJyZW50VGltZWxp bmVWaWV3LmN1cnJlbnRUaW1lID0gY3VycmVudFRpbWU7CiAKICAgICAgICAgV2ViSW5zcGVjdG9y LnRpbWVsaW5lU2lkZWJhclBhbmVsLnVwZGF0ZUZpbHRlcigpOwogCiAgICAgICAgIC8vIEZvcmNl IGEgbGF5b3V0IG5vdyBzaW5jZSB3ZSBhcmUgYWxyZWFkeSBpbiBhbiBhbmltYXRpb24gZnJhbWUg YW5kIGRvbid0IG5lZWQgdG8gZGVsYXkgaXQgdW50aWwgdGhlIG5leHQuCiAgICAgICAgIHRoaXMu X3RpbWVsaW5lT3ZlcnZpZXcudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAgdGhpcy5f Y3VycmVudFRpbWVsaW5lVmlldy51cGRhdGVMYXlvdXRJZk5lZWRlZCgpOworICAgICAgICBpZiAo dGhpcy5jdXJyZW50VGltZWxpbmVWaWV3KQorICAgICAgICAgICAgdGhpcy5jdXJyZW50VGltZWxp bmVWaWV3LnVwZGF0ZUxheW91dElmTmVlZGVkKCk7CiAgICAgfSwKIAogICAgIF9zdGFydFVwZGF0 aW5nQ3VycmVudFRpbWU6IGZ1bmN0aW9uKCkKQEAgLTQ1NSw3ICs0OTYsNyBAQCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KHRpbWVsaW5lIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lLCB0 aW1lbGluZSk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl90aW1lbGluZVZpZXdNYXAu aGFzKHRpbWVsaW5lKSwgdGltZWxpbmUpOwogCi0gICAgICAgIHRoaXMuX3RpbWVsaW5lVmlld01h cC5zZXQodGltZWxpbmUsIG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3KHRpbWVsaW5lKSk7 CisgICAgICAgIHRoaXMuX3RpbWVsaW5lVmlld01hcC5zZXQodGltZWxpbmUsIG5ldyBXZWJJbnNw ZWN0b3IuQ29udGVudFZpZXcodGltZWxpbmUpKTsKIAogICAgICAgICB2YXIgcGF0aENvbXBvbmVu dCA9IG5ldyBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudCh0aW1lbGluZS5k aXNwbGF5TmFtZSwgdGltZWxpbmUuaWNvbkNsYXNzTmFtZSwgdGltZWxpbmUpOwogICAgICAgICBw YXRoQ29tcG9uZW50LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBh dGhDb21wb25lbnQuRXZlbnQuU2libGluZ1dhc1NlbGVjdGVkLCB0aGlzLl9wYXRoQ29tcG9uZW50 U2VsZWN0ZWQsIHRoaXMpOwpAQCAtNDcxLDcgKzUxMiw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgY29uc29sZS5hc3Nl cnQodGhpcy5fdGltZWxpbmVWaWV3TWFwLmhhcyh0aW1lbGluZSksIHRpbWVsaW5lKTsKIAogICAg ICAgICB2YXIgdGltZWxpbmVWaWV3ID0gdGhpcy5fdGltZWxpbmVWaWV3TWFwLnRha2UodGltZWxp bmUpOwotICAgICAgICBpZiAodGhpcy5fY3VycmVudFRpbWVsaW5lVmlldyA9PT0gdGltZWxpbmVW aWV3KQorICAgICAgICBpZiAodGhpcy5jdXJyZW50VGltZWxpbmVWaWV3ID09PSB0aW1lbGluZVZp ZXcpCiAgICAgICAgICAgICB0aGlzLnNob3dPdmVydmlld1RpbWVsaW5lVmlldygpOwogCiAgICAg ICAgIHRoaXMuX3BhdGhDb21wb25lbnRNYXAuZGVsZXRlKHRpbWVsaW5lKTsKQEAgLTQ5NSw3ICs1 MzYsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGNvbnN0IHRpbWVsaW5lSGVpZ2h0ID0gMzY7CiAgICAgICAgIGNvbnN0 IGV4dHJhT2Zmc2V0ID0gMjI7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuZWxlbWVu dC5zdHlsZS5oZWlnaHQgPSAodGltZWxpbmVDb3VudCAqIHRpbWVsaW5lSGVpZ2h0ICsgZXh0cmFP ZmZzZXQpICsgInB4IjsKLSAgICAgICAgdGhpcy5fdmlld0NvbnRhaW5lckVsZW1lbnQuc3R5bGUu dG9wID0gKHRpbWVsaW5lQ291bnQgKiB0aW1lbGluZUhlaWdodCArIGV4dHJhT2Zmc2V0KSArICJw eCI7CisgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmVsZW1lbnQuc3R5bGUudG9w ID0gKHRpbWVsaW5lQ291bnQgKiB0aW1lbGluZUhlaWdodCArIGV4dHJhT2Zmc2V0KSArICJweCI7 CiAgICAgfSwKIAogICAgIF9yZWNvcmRpbmdSZXNldDogZnVuY3Rpb24oZXZlbnQpCkBAIC01MzAs MTIgKzU3MSwxNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5w cm90b3R5cGUgPSB7CiAKICAgICBfdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZDogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LnN0YXJ0VGlt ZSA9IHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uU3RhcnRUaW1lOwotICAgICAgICB0 aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LmVuZFRpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3 LnNlbGVjdGlvblN0YXJ0VGltZSArIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uRHVy YXRpb247CisgICAgICAgIGlmICh0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcpIHsKKyAgICAgICAg ICAgIHRoaXMuY3VycmVudFRpbWVsaW5lVmlldy5zdGFydFRpbWUgPSB0aGlzLl90aW1lbGluZU92 ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZTsKKyAgICAgICAgICAgIHRoaXMuY3VycmVudFRpbWVs aW5lVmlldy5lbmRUaW1lID0gdGhpcy5fdGltZWxpbmVPdmVydmlldy5zZWxlY3Rpb25TdGFydFRp bWUgKyB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvbkR1cmF0aW9uOworICAgICAgICB9 CiAKICAgICAgICAgLy8gRGVsYXkgdW50aWwgdGhlIG5leHQgZnJhbWUgdG8gc3RheSBpbiBzeW5j IHdpdGggdGhlIGN1cnJlbnQgdGltZWxpbmUgdmlldydzIHRpbWUtYmFzZWQgbGF5b3V0IGNoYW5n ZXMuCiAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZShmdW5jdGlvbigpIHsKLSAgICAgICAg ICAgIHZhciBzZWxlY3RlZFRyZWVFbGVtZW50ID0gdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldyAm JiB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3Lm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUg PyB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3Lm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUu c2VsZWN0ZWRUcmVlRWxlbWVudCA6IG51bGw7CisgICAgICAgICAgICB2YXIgc2VsZWN0ZWRUcmVl RWxlbWVudCA9IHRoaXMuY3VycmVudFRpbWVsaW5lVmlldyAmJiB0aGlzLmN1cnJlbnRUaW1lbGlu ZVZpZXcubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZSA/IHRoaXMuY3VycmVudFRpbWVsaW5l Vmlldy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQgOiBu dWxsOwogICAgICAgICAgICAgdmFyIHNlbGVjdGlvbldhc0hpZGRlbiA9IHNlbGVjdGVkVHJlZUVs ZW1lbnQgJiYgc2VsZWN0ZWRUcmVlRWxlbWVudC5oaWRkZW47CiAKICAgICAgICAgICAgIFdlYklu c3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC51cGRhdGVGaWx0ZXIoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVmll dy5qcwppbmRleCBlNzk5NTkyYzAyZGVkNTg1OWZjYmE2NWY0N2YzNzM4MWVlZTM3NDkwLi5lN2Ri Y2FlOGQwZjA1MTA2YzYyZmI0OTM3MzYxYmIxODBjYjFiMzU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3Lmpz CkBAIC0xLDUgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTUgVW5pdmVyc2l0eSBvZiBX YXNoaW5ndG9uLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNSwzNSArMjYs MTIgQEAKIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldyA9IGZ1bmN0aW9uKHJlcHJlc2VudGVk T2JqZWN0KQogewotICAgIGlmICh0aGlzLmNvbnN0cnVjdG9yID09PSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVWaWV3KSB7Ci0gICAgICAgIC8vIFdoZW4gaW5zdGFudGlhdGVkIGRpcmVjdGx5IHJldHVy biBhbiBpbnN0YW5jZSBvZiBhIHR5cGUtYmFzZWQgY29uY3JldGUgc3ViY2xhc3MuCi0KLSAgICAg ICAgY29uc29sZS5hc3NlcnQocmVwcmVzZW50ZWRPYmplY3QgJiYgcmVwcmVzZW50ZWRPYmplY3Qg aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVGltZWxpbmUpOwotCi0gICAgICAgIHZhciB0aW1lbGlu ZVR5cGUgPSByZXByZXNlbnRlZE9iamVjdC50eXBlOwotICAgICAgICBpZiAodGltZWxpbmVUeXBl ID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrKQotICAgICAgICAg ICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyhyZXByZXNlbnRl ZE9iamVjdCk7Ci0KLSAgICAgICAgaWYgKHRpbWVsaW5lVHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRp bWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0KQotICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNw ZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsKLQotICAgICAgICBp ZiAodGltZWxpbmVUeXBlID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3Jp cHQpCi0gICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZp ZXcocmVwcmVzZW50ZWRPYmplY3QpOwotCi0gICAgICAgIHRocm93IEVycm9yKCJDYW4ndCBtYWtl IGEgVGltZWxpbmUgZm9yIGFuIHVua25vd24gcmVwcmVzZW50ZWRPYmplY3QuIik7Ci0gICAgfQot Ci0gICAgLy8gQ29uY3JldGUgb2JqZWN0IGluc3RhbnRpYXRpb24uCisgICAgLy8gVGhpcyBjbGFz cyBzaG91bGQgbm90IGJlIGluc3RhbnRpYXRlZCBkaXJlY3RseS4gQ3JlYXRlIGEgY29uY3JldGUg c3ViY2xhc3MgaW5zdGVhZC4KICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmNvbnN0cnVjdG9yICE9 PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3ICYmIHRoaXMgaW5zdGFuY2VvZiBXZWJJbnNwZWN0 b3IuVGltZWxpbmVWaWV3KTsKIAotICAgIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsK LQotICAgIGNvbnNvbGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLlRpbWVsaW5lIHx8IHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUmVjb3JkaW5nKTsKLSAgICB0aGlzLl9yZXByZXNlbnRlZE9iamVjdCA9IHJl cHJlc2VudGVkT2JqZWN0OworICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5jYWxsKHRoaXMs IHJlcHJlc2VudGVkT2JqZWN0KTsKIAogICAgIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZSA9IFdl Ykluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5jcmVhdGVDb250ZW50VHJlZU91dGxpbmUo KTsKLQotICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwog ICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcu U3R5bGVDbGFzc05hbWUpOwogCiAgICAgdGhpcy5femVyb1RpbWUgPSAwOwpAQCAtNjQsMjEgKzQy LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9i amVjdCkKIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5TdHlsZUNsYXNzTmFtZSA9ICJ0aW1l bGluZS12aWV3IjsKIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5FdmVudCA9IHsKLSAgICBT ZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZTogInRpbWVsaW5lLXZpZXctc2VsZWN0aW9u LXBhdGgtY29tcG9uZW50cy1kaWQtY2hhbmdlIgotfTsKLQogV2ViSW5zcGVjdG9yLlRpbWVsaW5l Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5UaW1lbGlu ZVZpZXcsCi0gICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZSwKKyAg ICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5wcm90b3R5cGUsCiAKICAgICAv LyBQdWJsaWMKIAotICAgIGdldCByZXByZXNlbnRlZE9iamVjdCgpCi0gICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fcmVwcmVzZW50ZWRPYmplY3Q7Ci0gICAgfSwKLQogICAgIGdldCBuYXZpZ2F0 aW9uU2lkZWJhclRyZWVPdXRsaW5lKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9jb250 ZW50VHJlZU91dGxpbmU7CkBAIC0xNzAsMjkgKzEzOSwxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKICAg ICB9LAogCi0gICAgZ2V0IHZpc2libGUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Zp c2libGU7Ci0gICAgfSwKLQogICAgIHJlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0 aGlzLl9jb250ZW50VHJlZU91dGxpbmUucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICB9LAogCi0gICAg c2hvd246IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3Zpc2libGUgPSB0cnVlOwot Ci0gICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1Yi1jbGFzc2VzIGlmIG5lZWRlZC4KLSAgICB9 LAotCi0gICAgaGlkZGVuOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICAvLyBJbXBsZW1lbnRl ZCBieSBzdWItY2xhc3NlcyBpZiBuZWVkZWQuCi0KLSAgICAgICAgdGhpcy5fdmlzaWJsZSA9IGZh bHNlOwotICAgIH0sCiAKICAgICBmaWx0ZXJEaWRDaGFuZ2U6IGZ1bmN0aW9uKCkKICAgICB7CkBA IC0yMjQsNyArMTc1LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7 CiAKICAgICBmaWx0ZXJVcGRhdGVkOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LkV2ZW50LlNl bGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50LlNlbGVjdGlvblBh dGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKICAgICB9LAogCiAgICAgLy8gUHJvdGVjdGVkCkBAIC0y MzYsNyArMTg3LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAK ICAgICBuZWVkc0xheW91dDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl92 aXNpYmxlKQorICAgICAgICBpZiAoIXRoaXMudmlzaWJsZSkKICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICBpZiAodGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllcikK