139151 2014-12-01 14:13:22 -0800 Web Inspector: selecting Paint timeline records from sidebar does not trigger preview of paint quad 2015-01-15 17:01:07 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg webkit-unassigned graouts joepeck timothy webkit-bug-importer oldest_to_newest 1051582 0 burg 2014-12-01 14:13:22 -0800 1. Create a timeline recording with paint records. 2. Select the Layout timeline. 3. Select a paint record by clicking its row in the table (i.e., in <N>px cell). The relevant rect should be highlighted on the page overlay. However, if instead you click on the TreeOutline row (to the left of the record) nothing is highlighted. 1051583 1 webkit-bug-importer 2014-12-01 14:13:31 -0800 <rdar://problem/19106598> 1052557 2 joepeck 2014-12-04 13:52:22 -0800 We used to do this before the new timeline redesign. 1052568 3 joepeck 2014-12-04 14:17:28 -0800 Oh, I see. We do for the DataGrid but not for the sidebar. 1052574 4 joepeck 2014-12-04 14:35:25 -0800 Actually I think showing the highlight only once you've selected a record is cumbersome. How about just hovering over an element in the datagrid, like hovering elements in the DOM Tree? That way you can very quickly get highlights and see where the paint is associated with. We could retitle this: "Cumbersome to view paint highlights, should be easier". We could make it so hovering in the sidebar triggers the highlight too, but I think if hovering in the data grid is enabled it easy enough. Patch attached, thoughts? 1052575 5 242588 joepeck 2014-12-04 14:35:44 -0800 Created attachment 242588 [PATCH] Proposed Fix - Making Hovering DataGrid show Paint Highlight Rects 1052623 6 242600 joepeck 2014-12-04 17:00:31 -0800 Created attachment 242600 [PATCH] Proposed Fix Give this a try. Is it too spammy? 1052624 7 242600 joepeck 2014-12-04 17:01:50 -0800 Comment on attachment 242600 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=242600&action=review > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:373 > +} Nit: missing semicolon. 1061485 8 242600 burg 2015-01-14 21:55:33 -0800 Comment on attachment 242600 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=242600&action=review r=me It doesn't look too spammy to me. In fact, it's kind of hard to follow the hovered row. Is there a way to add a table row hover highlight within the current design language? > Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js:279 > + const contentColor = {r: 111, g: 168, b: 220, a: 0.66}; (Aside: I'm surprised WebInspector.Color doesn't have a .toProtocol() method) > Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js:290 > + var rect = record.rect; Nit: Could we put this case first and avoid detecting DOMAgent.highlightQuad? > Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js:300 > + this._showingHighlight = false; Nit: I would switch these lines so the member lines up. 1061711 9 joepeck 2015-01-15 17:01:07 -0800 http://trac.webkit.org/changeset/178544 242588 2014-12-04 14:35:44 -0800 2014-12-04 17:00:31 -0800 [PATCH] Proposed Fix - Making Hovering DataGrid show Paint Highlight Rects hover-highlight.patch text/plain 2796 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xh eW91dFRpbWVsaW5lRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZURhdGFHcmlkLmpzCmluZGV4IDM1ZjgyNzcuLjYyZDNh NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xheW91dFRpbWVsaW5lRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3JpZC5qcwpAQCAtMjcsOSArMjcs MTAgQEAgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lRGF0YUdyaWQgPSBmdW5jdGlvbih0cmVl T3V0bGluZSwgY29sdW1ucywgZGVsZWdhdGUsIGUKIHsKICAgICBXZWJJbnNwZWN0b3IuVGltZWxp bmVEYXRhR3JpZC5jYWxsKHRoaXMsIHRyZWVPdXRsaW5lLCBjb2x1bW5zLCBkZWxlZ2F0ZSwgZWRp dENhbGxiYWNrLCBkZWxldGVDYWxsYmFjayk7CiAKLSAgICB0aGlzLl9zaG93aW5nSGlnaGxpZ2h0 ID0gZmFsc2U7CisgICAgdGhpcy5fc2hvd2luZ0hpZ2hsaWdodEZvclJlY29yZCA9IG51bGw7CiAK LSAgICB0aGlzLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNl bGVjdGVkTm9kZUNoYW5nZWQsIHRoaXMuX2xheW91dERhdGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdl ZCwgdGhpcyk7CisgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIs IHRoaXMuX21vdXNlT3ZlckRhdGFHcmlkLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLmVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCB0aGlzLl9tb3VzZU91dERhdGFHcmlk LmJpbmQodGhpcyksIGZhbHNlKTsKIH07CiAKIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZURh dGFHcmlkLnByb3RvdHlwZSA9IHsKQEAgLTU4LDIxICs1OSwxOSBAQCBXZWJJbnNwZWN0b3IuTGF5 b3V0VGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAKICAgICAvLyBQcml2YXRlCiAKLSAg ICBfbGF5b3V0RGF0YUdyaWRTZWxlY3RlZE5vZGVDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKKyAg ICBfc2hvd0hpZ2hsaWdodEZvclJlY29yZDogZnVuY3Rpb24ocmVjb3JkKQogICAgIHsKLSAgICAg ICAgaWYgKCF0aGlzLnNlbGVjdGVkTm9kZSkgewotICAgICAgICAgICAgdGhpcy5faGlkZUhpZ2hs aWdodElmTmVlZGVkKCk7CisgICAgICAgIGlmICh0aGlzLl9zaG93aW5nSGlnaGxpZ2h0Rm9yUmVj b3JkID09PSByZWNvcmQpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KIAotICAgICAg ICB2YXIgcmVjb3JkID0gdGhpcy5zZWxlY3RlZE5vZGUucmVjb3JkOworICAgICAgICB0aGlzLl9z aG93aW5nSGlnaGxpZ2h0Rm9yUmVjb3JkID0gcmVjb3JkOworCiAgICAgICAgIGNvbnN0IGNvbnRl bnRDb2xvciA9IHtyOiAxMTEsIGc6IDE2OCwgYjogMjIwLCBhOiAwLjY2fTsKICAgICAgICAgY29u c3Qgb3V0bGluZUNvbG9yID0ge3I6IDI1NSwgZzogMjI5LCBiOiAxNTMsIGE6IDAuNjZ9OwogCiAg ICAgICAgIHZhciBxdWFkID0gcmVjb3JkLnF1YWQ7CiAgICAgICAgIGlmIChxdWFkICYmIERPTUFn ZW50LmhpZ2hsaWdodFF1YWQpIHsKICAgICAgICAgICAgIERPTUFnZW50LmhpZ2hsaWdodFF1YWQo cXVhZC50b1Byb3RvY29sKCksIGNvbnRlbnRDb2xvciwgb3V0bGluZUNvbG9yKTsKLSAgICAgICAg ICAgIHRoaXMuX3Nob3dpbmdIaWdobGlnaHQgPSB0cnVlOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKQEAgLTgwLDE3ICs3OSwzMCBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxp bmVEYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciByZWN0ID0gcmVjb3JkLnJlY3Q7 CiAgICAgICAgIGlmIChyZWN0KSB7CiAgICAgICAgICAgICBET01BZ2VudC5oaWdobGlnaHRSZWN0 KHJlY3Qub3JpZ2luLngsIHJlY3Qub3JpZ2luLnksIHJlY3Quc2l6ZS53aWR0aCwgcmVjdC5zaXpl LmhlaWdodCwgY29udGVudENvbG9yLCBvdXRsaW5lQ29sb3IpOwotICAgICAgICAgICAgdGhpcy5f c2hvd2luZ0hpZ2hsaWdodCA9IHRydWU7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0K ICAgICB9LAogCiAgICAgX2hpZGVIaWdobGlnaHRJZk5lZWRlZDogZnVuY3Rpb24oKQogICAgIHsK LSAgICAgICAgaWYgKHRoaXMuX3Nob3dpbmdIaWdobGlnaHQpIHsKKyAgICAgICAgaWYgKHRoaXMu X3Nob3dpbmdIaWdobGlnaHRGb3JSZWNvcmQpIHsKICAgICAgICAgICAgIERPTUFnZW50LmhpZGVI aWdobGlnaHQoKTsKLSAgICAgICAgICAgIHRoaXMuX3Nob3dpbmdIaWdobGlnaHQgPSBmYWxzZTsK KyAgICAgICAgICAgIHRoaXMuX3Nob3dpbmdIaWdobGlnaHRGb3JSZWNvcmQgPSBudWxsOwogICAg ICAgICB9CisgICAgfSwKKworICAgIF9tb3VzZU92ZXJEYXRhR3JpZDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgdmFyIGRhdGFHcmlkTm9kZSA9IHRoaXMuZGF0YUdyaWROb2RlRnJvbU5vZGUo ZXZlbnQudGFyZ2V0KTsKKyAgICAgICAgaWYgKCFkYXRhR3JpZE5vZGUpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2hvd0hpZ2hsaWdodEZvclJlY29yZChkYXRhR3JpZE5v ZGUucmVjb3JkKTsKKyAgICB9LAorCisgICAgX21vdXNlT3V0RGF0YUdyaWQ6IGZ1bmN0aW9uKCkK KyAgICB7CisgICAgICAgIHRoaXMuX2hpZGVIaWdobGlnaHRJZk5lZWRlZCgpOwogICAgIH0KIH07 CiAK 242600 2014-12-04 17:00:31 -0800 2015-01-15 17:00:56 -0800 [PATCH] Proposed Fix hover-paint.patch text/plain 15196 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM3YzJhNjguLjdkYjU1NGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU4IEBACiAyMDE0LTEyLTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc2VsZWN0 aW5nIFBhaW50IHRpbWVsaW5lIHJlY29yZHMgZnJvbSBzaWRlYmFyIGRvZXMgbm90IHRyaWdnZXIg cHJldmlldyBvZiBwYWludCBxdWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzkxNTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3Jp ZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZURhdGFHcmlkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZS5jYWxs RnJhbWVQb3BvdmVyQW5jaG9yRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0 VGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUucmVzZXQpOiBEZWxldGVkLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkxheW91dFRpbWVsaW5lRGF0YUdyaWQucHJvdG90eXBlLmhpZGRlbik6IERlbGV0 ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVEYXRhR3JpZC5wcm90b3R5 cGUuX2xheW91dERhdGFHcmlkU2VsZWN0ZWROb2RlQ2hhbmdlZCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUuX2hpZGVIaWdo bGlnaHRJZk5lZWRlZCk6IERlbGV0ZWQuCisgICAgICAgIE1vdmUgdGhlIG5vZGUgaGlnaGxpZ2h0 IGZyb20gdGhlIGRhdGFncmlkIHRvIHRoZSB0aW1lbGluZSB2aWV3IGJlY2F1c2UKKyAgICAgICAg d2Ugd2FudCB0aGlzIHRvIGhhcHBlbiBvbiBib3RoIHRoZSBOYXZpZ2F0aW9uIHNpZGViYXIgYW5k IHRoZSBkYXRhZ3JpZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGlt ZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5w cm90b3R5cGUuc2hvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmll dy5wcm90b3R5cGUuaGlkZGVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVZpZXcucHJvdG90eXBlLmZpbHRlckRpZENoYW5nZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TGF5b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdHJlZUVsZW1lbnREZXNlbGVjdGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlLl90cmVl RWxlbWVudFNlbGVjdGVkKToKKyAgICAgICAgVXBkYXRlIHRoZSBoaWdobGlnaHQgZm9yIG1ham9y IHZpZXcgdXBkYXRlcy4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmll dy5wcm90b3R5cGUuX3VwZGF0ZUhpZ2hsaWdodCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5 b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fc2hvd0hpZ2hsaWdodEZvclJlY29yZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5faGlkZUhpZ2hs aWdodElmTmVlZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcu cHJvdG90eXBlLl9ob3ZlcmVkT3JTZWxlY3RlZFJlY29yZCk6CisgICAgICAgIFNob3cgYSBoaWdo bGlnaHQgZm9yIHdoYXQgd2UgYXJlIGhvdmVyaW5nLCBvciB3aGF0IGlzIHNlbGVjdGVkLgorICAg ICAgICBOb3RlIHRoZSBzZWxlY3RlZCBub2RlIG1heSBub3QgYmUgdmlzaWJsZSBkdWUgdG8gZmls dGVyaW5nLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3Rv dHlwZS5fbW91c2VPdmVyRGF0YUdyaWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRp bWVsaW5lVmlldy5wcm90b3R5cGUuX21vdXNlTGVhdmVEYXRhR3JpZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fbW91c2VPdmVyVHJlZU91dGxp bmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUu X21vdXNlTGVhdmVUcmVlT3V0bGluZSk6CisgICAgICAgIFVwZGF0ZSBob3ZlcmVkIGluZm9ybWF0 aW9uIG1vdXNpbmcgb3ZlciB0aGUgZGF0YWdyaWQgYW5kIHRyZWUgb3V0bGluZS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5maWx0ZXJEaWRDaGFu Z2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBl LnVwZGF0ZUZpbHRlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5maWx0 ZXJEaWRDaGFuZ2UpOgorICAgICAgICBJbmNsdWRlIGEgImZpbHRlckRpZENoYW5nZSIgVGltZWxp bmVWaWV3IG1ldGhvZCB0aGF0IGdldHMgY2FsbGVkIGFmdGVyCisgICAgICAgIHVwZGF0ZUZpbHRl ciAodGhpbmdzIGxpa2UgdGhlIGZpbHRlciBiYXIgb3IgdGltZWxpbmUgcmFuZ2UgY2hhbmdlcyku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAg ICAoVHJlZU91dGxpbmUucHJvdG90eXBlLnRyZWVFbGVtZW50RnJvbU5vZGUpOgorICAgICAgICAo VHJlZU91dGxpbmUucHJvdG90eXBlLnRyZWVFbGVtZW50RnJvbVBvaW50KToKKyAgICAgICAgUHJv dmlkZSBhIGhlbHBlciB0byBnZXQgYSB0cmVlIGVsZW1lbnQgZnJvbSBhbiBldmVudCB0YXJnZXQu CisKKzIwMTQtMTItMDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBMYXlvdXRUZXN0cy9pbnNwZWN0b3IgdGVzdHMgZmFpbCBp biBQcm9kdWN0aW9uIGJ1aWxkcyBkdWUgdG8gbWlzc2luZyB0ZXN0IHJlc291cmNlcwogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4ODk4CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRp bWVsaW5lRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9MYXlvdXRUaW1lbGluZURhdGFHcmlkLmpzCmluZGV4IDM1ZjgyNzcuLjVmYjA5NDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91 dFRpbWVsaW5lRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVEYXRhR3JpZC5qcwpAQCAtMjYsMTAgKzI2LDYgQEAK IFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZURhdGFHcmlkID0gZnVuY3Rpb24odHJlZU91dGxp bmUsIGNvbHVtbnMsIGRlbGVnYXRlLCBlZGl0Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNrKQogewog ICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLmNhbGwodGhpcywgdHJlZU91dGxpbmUs IGNvbHVtbnMsIGRlbGVnYXRlLCBlZGl0Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNrKTsKLQotICAg IHRoaXMuX3Nob3dpbmdIaWdobGlnaHQgPSBmYWxzZTsKLQotICAgIHRoaXMuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhp cy5fbGF5b3V0RGF0YUdyaWRTZWxlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzKTsKIH07CiAKIFdlYklu c3BlY3Rvci5MYXlvdXRUaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZSA9IHsKQEAgLTM3LDYwICsz Myw5IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZSA9IHsK IAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgcmVzZXQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAg ICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZS5yZXNldC5jYWxsKHRo aXMpOwotCi0gICAgICAgIHRoaXMuX2hpZGVIaWdobGlnaHRJZk5lZWRlZCgpOwotICAgIH0sCi0K ICAgICBjYWxsRnJhbWVQb3BvdmVyQW5jaG9yRWxlbWVudDogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgcmV0dXJuIHRoaXMuc2VsZWN0ZWROb2RlLmVsZW1lbnRXaXRoQ29sdW1uSWRlbnRpZmll cigiaW5pdGlhdG9yQ2FsbEZyYW1lIik7Ci0gICAgfSwKLQotICAgIGhpZGRlbjogZnVuY3Rpb24o KQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQucHJvdG90eXBl LmhpZGRlbi5jYWxsKHRoaXMpOwotCi0gICAgICAgIHRoaXMuX2hpZGVIaWdobGlnaHRJZk5lZWRl ZCgpOwotICAgIH0sCi0KLSAgICAvLyBQcml2YXRlCi0KLSAgICBfbGF5b3V0RGF0YUdyaWRTZWxl Y3RlZE5vZGVDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhp cy5zZWxlY3RlZE5vZGUpIHsKLSAgICAgICAgICAgIHRoaXMuX2hpZGVIaWdobGlnaHRJZk5lZWRl ZCgpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdmFyIHJlY29y ZCA9IHRoaXMuc2VsZWN0ZWROb2RlLnJlY29yZDsKLSAgICAgICAgY29uc3QgY29udGVudENvbG9y ID0ge3I6IDExMSwgZzogMTY4LCBiOiAyMjAsIGE6IDAuNjZ9OwotICAgICAgICBjb25zdCBvdXRs aW5lQ29sb3IgPSB7cjogMjU1LCBnOiAyMjksIGI6IDE1MywgYTogMC42Nn07Ci0KLSAgICAgICAg dmFyIHF1YWQgPSByZWNvcmQucXVhZDsKLSAgICAgICAgaWYgKHF1YWQgJiYgRE9NQWdlbnQuaGln aGxpZ2h0UXVhZCkgewotICAgICAgICAgICAgRE9NQWdlbnQuaGlnaGxpZ2h0UXVhZChxdWFkLnRv UHJvdG9jb2woKSwgY29udGVudENvbG9yLCBvdXRsaW5lQ29sb3IpOwotICAgICAgICAgICAgdGhp cy5fc2hvd2luZ0hpZ2hsaWdodCA9IHRydWU7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IH0KLQotICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgNik6IGlPUyA2IGluY2x1ZGVkIFJl Y3QgaW5mb3JtYXRpb24gaW5zdGVhZCBvZiBRdWFkIGluZm9ybWF0aW9uLiBGYWxsYmFjayB0byBo aWdobGlnaHRpbmcgdGhlIHJlY3QuCi0gICAgICAgIHZhciByZWN0ID0gcmVjb3JkLnJlY3Q7Ci0g ICAgICAgIGlmIChyZWN0KSB7Ci0gICAgICAgICAgICBET01BZ2VudC5oaWdobGlnaHRSZWN0KHJl Y3Qub3JpZ2luLngsIHJlY3Qub3JpZ2luLnksIHJlY3Quc2l6ZS53aWR0aCwgcmVjdC5zaXplLmhl aWdodCwgY29udGVudENvbG9yLCBvdXRsaW5lQ29sb3IpOwotICAgICAgICAgICAgdGhpcy5fc2hv d2luZ0hpZ2hsaWdodCA9IHRydWU7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAg ICB9LAotCi0gICAgX2hpZGVIaWdobGlnaHRJZk5lZWRlZDogZnVuY3Rpb24oKQotICAgIHsKLSAg ICAgICAgaWYgKHRoaXMuX3Nob3dpbmdIaWdobGlnaHQpIHsKLSAgICAgICAgICAgIERPTUFnZW50 LmhpZGVIaWdobGlnaHQoKTsKLSAgICAgICAgICAgIHRoaXMuX3Nob3dpbmdIaWdobGlnaHQgPSBm YWxzZTsKLSAgICAgICAgfQogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5q cwppbmRleCBkNDg2MzVhLi41MzU0ZTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3Lmpz CkBAIC03NSw2ICs3NSwxNiBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3ID0gZnVu Y3Rpb24odGltZWxpbmUpCiAgICAgdGhpcy5fZGF0YUdyaWQuc29ydENvbHVtbklkZW50aWZpZXIg PSAic3RhcnRUaW1lIjsKICAgICB0aGlzLl9kYXRhR3JpZC5zb3J0T3JkZXIgPSBXZWJJbnNwZWN0 b3IuRGF0YUdyaWQuU29ydE9yZGVyLkFzY2VuZGluZzsKIAorICAgIHRoaXMuX2hvdmVyZWRUcmVl RWxlbWVudCA9IG51bGw7CisgICAgdGhpcy5faG92ZXJlZERhdGFHcmlkTm9kZSA9IG51bGw7Cisg ICAgdGhpcy5fc2hvd2luZ0hpZ2hsaWdodCA9IGZhbHNlOworICAgIHRoaXMuX3Nob3dpbmdIaWdo bGlnaHRGb3JSZWNvcmQgPSBudWxsOworCisgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJtb3VzZW92ZXIiLCB0aGlzLl9tb3VzZU92ZXJEYXRhR3JpZC5iaW5kKHRo aXMpKTsKKyAgICB0aGlzLl9kYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNl bGVhdmUiLCB0aGlzLl9tb3VzZUxlYXZlRGF0YUdyaWQuYmluZCh0aGlzKSk7CisgICAgdGhpcy5u YXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2VvdmVyIiwgdGhpcy5fbW91c2VPdmVyVHJlZU91dGxpbmUuYmluZCh0aGlzKSk7CisgICAgdGhp cy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi bW91c2VsZWF2ZSIsIHRoaXMuX21vdXNlTGVhdmVUcmVlT3V0bGluZS5iaW5kKHRoaXMpKTsKKwog ICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVZpZXcuU3R5bGVDbGFzc05hbWUpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll9kYXRhR3JpZC5lbGVtZW50KTsKIApAQCAtMTAxLDE2ICsxMTEsMjcgQEAgV2ViSW5zcGVjdG9y LkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBXZWJJbnNw ZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5zaG93bi5jYWxsKHRoaXMpOwogCisgICAgICAg IHRoaXMuX3VwZGF0ZUhpZ2hsaWdodCgpOworCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3du KCk7CiAgICAgfSwKIAogICAgIGhpZGRlbjogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgdGhp cy5faGlkZUhpZ2hsaWdodElmTmVlZGVkKCk7CisKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuaGlk ZGVuKCk7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuaGlk ZGVuLmNhbGwodGhpcyk7CiAgICAgfSwKIAorICAgIGZpbHRlckRpZENoYW5nZTogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuZmls dGVyRGlkQ2hhbmdlLmNhbGwodGhpcyk7CisKKyAgICAgICAgdGhpcy5fdXBkYXRlSGlnaGxpZ2h0 KCk7CisgICAgfSwKKwogICAgIHVwZGF0ZUxheW91dDogZnVuY3Rpb24oKQogICAgIHsKICAgICAg ICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUudXBkYXRlTGF5b3V0LmNhbGwo dGhpcyk7CkBAIC0xMjksNiArMTUwLDggQEAgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmll dy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3 LnByb3RvdHlwZS5yZXNldC5jYWxsKHRoaXMpOwogCisgICAgICAgIHRoaXMuX2hpZGVIaWdobGln aHRJZk5lZWRlZCgpOworCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnJlc2V0KCk7CiAgICAgfSwK IApAQCAtMTgzLDYgKzIwNiw4IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHRyZWVFbGVtZW50LnN0YXR1cykKICAgICAg ICAgICAgIHRyZWVFbGVtZW50LnN0YXR1cyA9ICIiOworCisgICAgICAgIHRoaXMuX3VwZGF0ZUhp Z2hsaWdodCgpOwogICAgIH0sCiAKICAgICBfdHJlZUVsZW1lbnRTZWxlY3RlZDogZnVuY3Rpb24o dHJlZUVsZW1lbnQsIHNlbGVjdGVkQnlVc2VyKQpAQCAtMjAxLDYgKzIyNiw4IEBAIFdlYkluc3Bl Y3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAKKyAgICAgICAgdGhpcy5fdXBkYXRlSGlnaGxpZ2h0KCk7CisKICAgICAg ICAgaWYgKCF0cmVlRWxlbWVudC5yZWNvcmQuc291cmNlQ29kZUxvY2F0aW9uKSB7CiAgICAgICAg ICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hvd1RpbWVsaW5lVmlld0Zv clR5cGUoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0KTsKICAgICAgICAg ICAgIHJldHVybjsKQEAgLTIyOSw1ICsyNTYsMTA3IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1l bGluZVZpZXcucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2lk ZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKICAgICAgICAg V2ViSW5zcGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLnNob3dUaW1lbGluZVZpZXdGb3JUeXBl KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dCk7CisgICAgfSwKKworICAg IF91cGRhdGVIaWdobGlnaHQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciByZWNvcmQg PSB0aGlzLl9ob3ZlcmVkT3JTZWxlY3RlZFJlY29yZCgpOworICAgICAgICBpZiAoIXJlY29yZCkg eworICAgICAgICAgICAgdGhpcy5faGlkZUhpZ2hsaWdodElmTmVlZGVkKCk7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9zaG93SGlnaGxpZ2h0Rm9yUmVj b3JkKHJlY29yZCk7CisgICAgfSwKKworICAgIF9zaG93SGlnaGxpZ2h0Rm9yUmVjb3JkOiBmdW5j dGlvbihyZWNvcmQpCisgICAgeworICAgICAgICBpZiAodGhpcy5fc2hvd2luZ0hpZ2hsaWdodEZv clJlY29yZCA9PT0gcmVjb3JkKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMu X3Nob3dpbmdIaWdobGlnaHRGb3JSZWNvcmQgPSByZWNvcmQ7CisKKyAgICAgICAgY29uc3QgY29u dGVudENvbG9yID0ge3I6IDExMSwgZzogMTY4LCBiOiAyMjAsIGE6IDAuNjZ9OworICAgICAgICBj b25zdCBvdXRsaW5lQ29sb3IgPSB7cjogMjU1LCBnOiAyMjksIGI6IDE1MywgYTogMC42Nn07CisK KyAgICAgICAgdmFyIHF1YWQgPSByZWNvcmQucXVhZDsKKyAgICAgICAgaWYgKHF1YWQgJiYgRE9N QWdlbnQuaGlnaGxpZ2h0UXVhZCkgeworICAgICAgICAgICAgRE9NQWdlbnQuaGlnaGxpZ2h0UXVh ZChxdWFkLnRvUHJvdG9jb2woKSwgY29udGVudENvbG9yLCBvdXRsaW5lQ29sb3IpOworICAgICAg ICAgICAgdGhpcy5fc2hvd2luZ0hpZ2hsaWdodCA9IHRydWU7CisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIH0KKworICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgNik6IGlPUyA2IGlu Y2x1ZGVkIFJlY3QgaW5mb3JtYXRpb24gaW5zdGVhZCBvZiBRdWFkIGluZm9ybWF0aW9uLiBGYWxs YmFjayB0byBoaWdobGlnaHRpbmcgdGhlIHJlY3QuCisgICAgICAgIHZhciByZWN0ID0gcmVjb3Jk LnJlY3Q7CisgICAgICAgIGlmIChyZWN0KSB7CisgICAgICAgICAgICBET01BZ2VudC5oaWdobGln aHRSZWN0KHJlY3Qub3JpZ2luLngsIHJlY3Qub3JpZ2luLnksIHJlY3Quc2l6ZS53aWR0aCwgcmVj dC5zaXplLmhlaWdodCwgY29udGVudENvbG9yLCBvdXRsaW5lQ29sb3IpOworICAgICAgICAgICAg dGhpcy5fc2hvd2luZ0hpZ2hsaWdodCA9IHRydWU7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKworICAgICAgICAvLyBUaGlzIHJlY29yZCBkb2Vzbid0IGhhdmUgYSBoaWdobGlnaHQs IHNvIGhpZGUgYW55IGV4aXN0aW5nIGhpZ2hsaWdodC4KKyAgICAgICAgaWYgKHRoaXMuX3Nob3dp bmdIaWdobGlnaHQpIHsKKyAgICAgICAgICAgIERPTUFnZW50LmhpZGVIaWdobGlnaHQoKTsKKyAg ICAgICAgICAgIHRoaXMuX3Nob3dpbmdIaWdobGlnaHQgPSBmYWxzZTsKKyAgICAgICAgfQorICAg IH0sCisKKyAgICBfaGlkZUhpZ2hsaWdodElmTmVlZGVkOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICB0aGlzLl9zaG93aW5nSGlnaGxpZ2h0Rm9yUmVjb3JkID0gbnVsbDsKKworICAgICAgICBp ZiAodGhpcy5fc2hvd2luZ0hpZ2hsaWdodCkgeworICAgICAgICAgICAgRE9NQWdlbnQuaGlkZUhp Z2hsaWdodCgpOworICAgICAgICAgICAgdGhpcy5fc2hvd2luZ0hpZ2hsaWdodCA9IGZhbHNlOwor ICAgICAgICB9CisgICAgfSwKKworICAgIF9ob3ZlcmVkT3JTZWxlY3RlZFJlY29yZDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2hvdmVyZWREYXRhR3JpZE5vZGUpCisgICAg ICAgICAgICByZXR1cm4gdGhpcy5faG92ZXJlZERhdGFHcmlkTm9kZS5yZWNvcmQ7CisKKyAgICAg ICAgaWYgKHRoaXMuX2hvdmVyZWRUcmVlRWxlbWVudCkKKyAgICAgICAgICAgIHJldHVybiB0aGlz Ll9ob3ZlcmVkVHJlZUVsZW1lbnQucmVjb3JkOworCisgICAgICAgIGlmICh0aGlzLl9kYXRhR3Jp ZC5zZWxlY3RlZE5vZGUpIHsKKyAgICAgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXMuX2Rh dGFHcmlkLnRyZWVFbGVtZW50Rm9yRGF0YUdyaWROb2RlKHRoaXMuX2RhdGFHcmlkLnNlbGVjdGVk Tm9kZSk7CisgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQucmV2ZWFsZWQoKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gdGhpcy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlLnJlY29yZDsKKyAgICAg ICAgfQorCisgICAgICAgIHJldHVybiBudWxsOworICAgIH0sCisKKyAgICBfbW91c2VPdmVyRGF0 YUdyaWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIGhvdmVyZWREYXRhR3Jp ZE5vZGUgPSB0aGlzLl9kYXRhR3JpZC5kYXRhR3JpZE5vZGVGcm9tTm9kZShldmVudC50YXJnZXQp OworICAgICAgICBpZiAoIWhvdmVyZWREYXRhR3JpZE5vZGUpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgdGhpcy5faG92ZXJlZERhdGFHcmlkTm9kZSA9IGhvdmVyZWREYXRhR3JpZE5v ZGU7CisgICAgICAgIHRoaXMuX3VwZGF0ZUhpZ2hsaWdodCgpOworICAgIH0sCisKKyAgICBfbW91 c2VMZWF2ZURhdGFHcmlkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX2hv dmVyZWREYXRhR3JpZE5vZGUgPSBudWxsOworICAgICAgICB0aGlzLl91cGRhdGVIaWdobGlnaHQo KTsKKyAgICB9LAorCisgICAgX21vdXNlT3ZlclRyZWVPdXRsaW5lOiBmdW5jdGlvbihldmVudCkK KyAgICB7CisgICAgICAgIHZhciBob3ZlcmVkVHJlZUVsZW1lbnQgPSB0aGlzLm5hdmlnYXRpb25T aWRlYmFyVHJlZU91dGxpbmUudHJlZUVsZW1lbnRGcm9tTm9kZShldmVudC50YXJnZXQpOworICAg ICAgICBpZiAoIWhvdmVyZWRUcmVlRWxlbWVudCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAg ICAgICB0aGlzLl9ob3ZlcmVkVHJlZUVsZW1lbnQgPSBob3ZlcmVkVHJlZUVsZW1lbnQ7CisgICAg ICAgIHRoaXMuX3VwZGF0ZUhpZ2hsaWdodCgpOworICAgIH0sCisKKyAgICBfbW91c2VMZWF2ZVRy ZWVPdXRsaW5lOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX2hvdmVyZWRU cmVlRWxlbWVudCA9IG51bGw7CisgICAgICAgIHRoaXMuX3VwZGF0ZUhpZ2hsaWdodCgpOwogICAg IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVDb250ZW50Vmlldy5qcwppbmRleCBhMzY0YmM1Li5jODc0 MmY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lQ29udGVudFZpZXcuanMKQEAgLTE3OSw2ICsxNzksMTQg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LmhpZGRlbigpOwogICAgIH0sCiAKKyAgICBmaWx0 ZXJEaWRDaGFuZ2U6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fY3VycmVu dFRpbWVsaW5lVmlldykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9jdXJy ZW50VGltZWxpbmVWaWV3LmZpbHRlckRpZENoYW5nZSgpOworICAgIH0sCisKICAgICB1cGRhdGVM YXlvdXQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcu dXBkYXRlTGF5b3V0Rm9yUmVzaXplKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpz CmluZGV4IGM1N2FkZDYuLjRjNzBmN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVs LmpzCkBAIC0yODMsNiArMjgzLDEzIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICAvLyBQcm90ZWN0ZWQKIAorICAgIHVwZGF0ZUZpbHRlcjog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFy UGFuZWwucHJvdG90eXBlLnVwZGF0ZUZpbHRlci5jYWxsKHRoaXMpOworCisgICAgICAgIHRoaXMu X2FjdGl2ZUNvbnRlbnRWaWV3LmZpbHRlckRpZENoYW5nZSgpOworICAgIH0sCisKICAgICBoYXND dXN0b21GaWx0ZXJzOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdHJ1ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lVmlldy5qcwppbmRleCA2NmMxMTQxLi4wMDdjZTcxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3Lmpz CkBAIC0xOTQsNiArMTk0LDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl92aXNpYmxlID0gZmFsc2U7CiAgICAgfSwKIAorICAgIGZpbHRl ckRpZENoYW5nZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkg c3ViLWNsYXNzZXMgaWYgbmVlZGVkLgorICAgIH0sCisKICAgICBtYXRjaFRyZWVFbGVtZW50QWdh aW5zdEN1c3RvbUZpbHRlcnM6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQogICAgIHsKICAgICAgICAg Ly8gSW1wbGVtZW50ZWQgYnkgc3ViLWNsYXNzZXMgaWYgbmVlZGVkLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpp bmRleCA1OTVlZTgzLi5lZGUyNzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpAQCAtMzY0LDE2ICszNjQs MjEgQEAgVHJlZU91dGxpbmUucHJvdG90eXBlLl90cmVlRWxlbWVudERpZENoYW5nZSA9IGZ1bmN0 aW9uKHRyZWVFbGVtZW50KQogICAgICAgICB0aGlzLm9uY2hhbmdlKHRyZWVFbGVtZW50KTsKIH07 CiAKLVRyZWVPdXRsaW5lLnByb3RvdHlwZS50cmVlRWxlbWVudEZyb21Qb2ludCA9IGZ1bmN0aW9u KHgsIHkpCitUcmVlT3V0bGluZS5wcm90b3R5cGUudHJlZUVsZW1lbnRGcm9tTm9kZSA9IGZ1bmN0 aW9uKG5vZGUpCiB7Ci0gICAgdmFyIG5vZGUgPSB0aGlzLl9jaGlsZHJlbkxpc3ROb2RlLm93bmVy RG9jdW1lbnQuZWxlbWVudEZyb21Qb2ludCh4LCB5KTsKLSAgICBpZiAoIW5vZGUpCi0gICAgICAg IHJldHVybiBudWxsOwotCiAgICAgdmFyIGxpc3ROb2RlID0gbm9kZS5lbmNsb3NpbmdOb2RlT3JT ZWxmV2l0aE5vZGVOYW1lSW5BcnJheShbIm9sIiwgImxpIl0pOwogICAgIGlmIChsaXN0Tm9kZSkK ICAgICAgICAgcmV0dXJuIGxpc3ROb2RlLnBhcmVudFRyZWVFbGVtZW50IHx8IGxpc3ROb2RlLnRy ZWVFbGVtZW50OwogICAgIHJldHVybiBudWxsOworfQorCitUcmVlT3V0bGluZS5wcm90b3R5cGUu dHJlZUVsZW1lbnRGcm9tUG9pbnQgPSBmdW5jdGlvbih4LCB5KQoreworICAgIHZhciBub2RlID0g dGhpcy5fY2hpbGRyZW5MaXN0Tm9kZS5vd25lckRvY3VtZW50LmVsZW1lbnRGcm9tUG9pbnQoeCwg eSk7CisgICAgaWYgKCFub2RlKQorICAgICAgICByZXR1cm4gbnVsbDsKKworICAgIHJldHVybiB0 aGlzLnRyZWVFbGVtZW50RnJvbU5vZGUobm9kZSk7CiB9OwogCiBUcmVlT3V0bGluZS5wcm90b3R5 cGUuX3RyZWVLZXlEb3duID0gZnVuY3Rpb24oZXZlbnQpCg==