178800 2017-10-25 09:52:52 -0700 Web Inspector: Canvas Tab: canvases overview should support navigation via keyboard 2017-12-04 17:31:41 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 175485 1 bburg hi bburg commit-queue hi inspector-bugzilla-changes nvasilyev webkit-bug-importer oldest_to_newest 1364242 0 bburg 2017-10-25 09:52:52 -0700 Expected: - left/up moves to previous canvas - right/down moves to next canvas - space bar starts/stops a recording Actual: Nothing works 1364243 1 webkit-bug-importer 2017-10-25 09:53:15 -0700 <rdar://problem/35175856> 1364735 2 324974 hi 2017-10-26 01:25:18 -0700 Created attachment 324974 Patch 1364894 3 324974 bburg 2017-10-26 10:29:32 -0700 Comment on attachment 324974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=324974&action=review r=me General comments: Whew, that's way hairier than I thought. - What do you think about pushing these shortcuts down into CollectionContentView? I guess that might be kind of messy if collection elements are not sized uniformly, but it should still be possible to observe visual rows and columns regardless of the flex direction if you creep forward and backward enough from the current selection to find the next/prev row. (We can shelve this for later, just a thought.) - RTL would change visual order but not the logical order. Can you make sure that these shortcuts work as intended? > Source/WebInspectorUI/ChangeLog:9 > + Create a KeyboardShorcut for each of the following: Nit: KeyboardShortcut > Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js:271 > +WI.CanvasOverviewContentView._itemMargin = 10; I wish there was a sane way to share --variables between CSS and JS.. :| 1365035 4 hi 2017-10-26 14:43:37 -0700 (In reply to Brian Burg from comment #3) > Comment on attachment 324974 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=324974&action=review > > r=me > > General comments: > > Whew, that's way hairier than I thought. > - What do you think about pushing these shortcuts down into > CollectionContentView? I guess that might be kind of messy if collection > elements are not sized uniformly, but it should still be possible to observe > visual rows and columns regardless of the flex direction if you creep > forward and backward enough from the current selection to find the next/prev > row. (We can shelve this for later, just a thought.) I think it might be useful, but at the same time there is no real reason to support selection for a general CollectionContentView unless you can do something with that collection. As an example, selecting an item for the Images folder in Resources doesn't really do anything since there is no recording (or anything really) feature there. > - RTL would change visual order but not the logical order. Can you make sure > that these shortcuts work as intended? I'll have to check on that and make sure it works. > > Source/WebInspectorUI/ChangeLog:9 > > + Create a KeyboardShorcut for each of the following: > > Nit: KeyboardShortcut > > > Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js:271 > > +WI.CanvasOverviewContentView._itemMargin = 10; > > I wish there was a sane way to share --variables between CSS and JS.. :| I think I have a way to do this :) 1365055 5 nvasilyev 2017-10-26 15:32:22 -0700 (In reply to Devin Rousso from comment #4) > > > Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js:271 > > > +WI.CanvasOverviewContentView._itemMargin = 10; > > > > I wish there was a sane way to share --variables between CSS and JS.. :| > I think I have a way to do this :) This is how it's usually done: https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_variables#Values_in_Javascript 1365060 6 325066 hi 2017-10-26 15:48:04 -0700 Created attachment 325066 Patch 1365078 7 325066 bburg 2017-10-26 16:21:42 -0700 Comment on attachment 325066 Patch r=me, thanks Devin! 1365104 8 325066 commit-queue 2017-10-26 16:41:26 -0700 Comment on attachment 325066 Patch Clearing flags on attachment: 325066 Committed r224067: <https://trac.webkit.org/changeset/224067> 1365105 9 commit-queue 2017-10-26 16:41:27 -0700 All reviewed patches have been landed. Closing bug. 324974 2017-10-26 01:25:18 -0700 2017-10-26 15:48:02 -0700 Patch bug-178800-20171026012518.patch text/plain 10520 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNjZjFlNjg1OGNkMzA5ZWFmZDgzNDg2YmU0NDNi MmQ0NDQzNDk0YTUuLjI4NzQyZmUyMGE4MmFiMGU5ZWNjZWE5NGEwMzAwYTdlZDkwOTA1NTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE3LTEwLTI2ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IENhbnZhcyBUYWI6IGNhbnZhc2VzIG92ZXJ2aWV3IHNob3VsZCBzdXBwb3J0IG5hdmlnYXRp b24gdmlhIGtleWJvYXJkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzg4MDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1MTc1ODU2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENyZWF0ZSBhIEtleWJv YXJkU2hvcmN1dCBmb3IgZWFjaCBvZiB0aGUgZm9sbG93aW5nOgorICAgICAgICAgLSBVcDogc2Vs ZWN0cyB0aGUgcHJldmlvdXMgY2FudmFzIGluIHRoZSBzZWxlY3RlZCBjb2x1bW4KKyAgICAgICAg IC0gRG93bjogc2VsZWN0cyB0aGUgbmV4dCBjYW52YXMgaW4gdGhlIHNlbGVjdGVkIGNvbHVtbgor ICAgICAgICAgLSBSaWdodDogc2VsZWN0cyB0aGUgbmV4dCBjYW52YXMgaW4gdGhlIHNlbGVjdGVk IHJvdworICAgICAgICAgLSBMZWZ0OiBzZWxlY3RzIHRoZSBwcmV2aW91cyBjYW52YXMgaW4gdGhl IHNlbGVjdGVkIHJvdworICAgICAgICAgLSBTcGFjZTogdG9nZ2xlIHJlY29yZGluZyBvZiB0aGUg c2VsZWN0ZWQgY2FudmFzCisgICAgICAgICAtIFNoaWZ0K1NwYWNlOiB0b2dnbGUgc2luZ2xlLWZy YW1lIHJlY29yZGluZyBvZiB0aGUgc2VsZWN0ZWQgY2FudmFzCisKKyAgICAgICAgVGhlIGNhbGN1 bGF0aW9uIGZvciBzZWxlY3RlZCByb3cvY29sdW0gaXMgYmFzZWQgb24gdGhlIGBvZmZzZXRXaWR0 aGAgb2YgdGhlIHBhcmVudCBlbGVtZW50CisgICAgICAgIGFuZCB0aGUgc2VsZWN0ZWQgaXRlbSdz IGNvbnRlbnQgdmlldyBlbGVtZW50LiBTaW5jZSB0aGlzIHZpZXcgdXNlcyBhIGZsZXhib3gsIGFs bCBvZiB0aGUKKyAgICAgICAgaXRlbXMgYXJlIGV4cGVjdGVkIHRvIGhhdmUgdGhlIHNhbWUgZGlt ZW5zaW9ucywgbWVhbmluZyB0aGF0IHRoaXMgdmFsdWUgaXMgdW5pZm9ybS4gVGhlCisgICAgICAg IGludGVuZGVkIGZ1bmN0aW9uYWxpdHkgaXMgdGhhdCBvZiBhIHNwcmVhZHNoZWV0LCB3aGVyZSBw cmVzc2luZyBwcmVzc2luZyBsZWZ0L3JpZ2h0IHdpbGwKKyAgICAgICAgbmV2ZXIgY2hhbmdlIHRo ZSBzZWxlY3RlZCByb3cgYW5kIHVwL2Rvd24gd2lsbCBuZXZlciBjaGFuZ2UgdGhlIHNlbGVjdGVk IGNvbHVtbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcpOgor ICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuY29udGVudFZp ZXdBZGRlZCk6CisgICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlw ZS5jb250ZW50Vmlld1JlbW92ZWQpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50 Vmlldy5wcm90b3R5cGUuYXR0YWNoZWQpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250 ZW50Vmlldy5wcm90b3R5cGUuZGV0YWNoZWQpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdD b250ZW50Vmlldy5wcm90b3R5cGUuX2NoYW5nZVNlbGVjdGVkSXRlbVZlcnRpY2FsbHkpOgorICAg ICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuX2NoYW5nZVNlbGVj dGVkSXRlbUhvcml6b250YWxseSk6CisgICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRW aWV3LnByb3RvdHlwZS5fdXBkYXRlTmF2aWdhdGlvbkl0ZW1zKToKKyAgICAgICAgKFdJLkNhbnZh c092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVVcCk6CisgICAgICAgIChXSS5D YW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlUmlnaHQpOgorICAgICAg ICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZURvd24pOgor ICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZUxl ZnQpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuX2hh bmRsZVNwYWNlKToKKyAgICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90 eXBlLl9zdXBwbGVtZW50YWxSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2UpOgorICAgICAgICBE cml2ZS1ieTogY2FsbCBgX3VwZGF0ZU5hdmlnYXRpb25JdGVtc2Agd2hlbmV2ZXIgYW4gaXRlbSBp cyBhZGRlZC9yZW1vdmVkIHNvIHRoYXQgaWYgdGhlcmUKKyAgICAgICAgYXJlIG5vIGl0ZW1zIHRo ZSBuYXZpZ2F0aW9uIGl0ZW1zIGNhbm5vdCBiZSBjbGlja2VkLgorCiAyMDE3LTEwLTI1ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHByb3ZpZGUgYSB3YXkgdG8gZW5hYmxlL2Rpc2FibGUgZXZlbnQgbGlzdGVuZXJzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNP dmVydmlld0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qcwppbmRleCA5ZTAzN2U4MDRmZTZm NGU0OTQwNDkyODEwMzY2YWQwNTYxOTVlOTRlLi5mNTY0NDY2NjJjNTljMmYwMzRmMjA0MzVlZjdl NzRlZTg4N2E3N2NkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcu anMKQEAgLTM0LDE1ICszNCwyNyBAQCBXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3ID0gY2xh c3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbGxlYwogICAgICAgICB0 aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY2FudmFzLW92ZXJ2aWV3Iik7CiAKICAgICAgICAg dGhpcy5fcmVmcmVzaEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRp b25JdGVtKCJyZWZyZXNoLWFsbCIsIFdJLlVJU3RyaW5nKCJSZWZyZXNoIGFsbCIpLCAiSW1hZ2Vz L1JlbG9hZEZ1bGwuc3ZnIiwgMTMsIDEzKTsKLSAgICAgICAgdGhpcy5fcmVmcmVzaEJ1dHRvbk5h dmlnYXRpb25JdGVtLmRpc2FibGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fcmVmcmVzaEJ1dHRv bk5hdmlnYXRpb25JdGVtLmVuYWJsZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fcmVmcmVzaEJ1 dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fcmVmcmVzaFByZXZpZXdzLCB0aGlzKTsKIAogICAgICAg ICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkFjdGl2YXRlQnV0 dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctZ3JpZCIsIFdJLlVJU3RyaW5nKCJTaG93IHRyYW5zcGFy ZW5jeSBncmlkIiksIFdJLlVJU3RyaW5nKCJIaWRlIEdyaWQiKSwgIkltYWdlcy9OYXZpZ2F0aW9u SXRlbUNoZWNrZXJzLnN2ZyIsIDEzLCAxMyk7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9u TmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0gISFXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZh bHVlOwotICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmRpc2FibGVk ID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFi bGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0u YWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0 aGlzLl9zaG93R3JpZEJ1dHRvbkNsaWNrZWQsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuc2VsZWN0 aW9uRW5hYmxlZCA9IHRydWU7CisKKyAgICAgICAgdGhpcy5fa2V5Ym9hcmRTaG9ydGN1dHMgPSBb CisgICAgICAgICAgICBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCBXSS5LZXlib2FyZFNo b3J0Y3V0LktleS5VcCwgdGhpcy5faGFuZGxlVXAuYmluZCh0aGlzKSksCisgICAgICAgICAgICBu ZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCBXSS5LZXlib2FyZFNob3J0Y3V0LktleS5SaWdo dCwgdGhpcy5faGFuZGxlUmlnaHQuYmluZCh0aGlzKSksCisgICAgICAgICAgICBuZXcgV0kuS2V5 Ym9hcmRTaG9ydGN1dChudWxsLCBXSS5LZXlib2FyZFNob3J0Y3V0LktleS5Eb3duLCB0aGlzLl9o YW5kbGVEb3duLmJpbmQodGhpcykpLAorICAgICAgICAgICAgbmV3IFdJLktleWJvYXJkU2hvcnRj dXQobnVsbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuTGVmdCwgdGhpcy5faGFuZGxlTGVmdC5i aW5kKHRoaXMpKSwKKyAgICAgICAgICAgIG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KG51bGwsIFdJ LktleWJvYXJkU2hvcnRjdXQuS2V5LlNwYWNlLCB0aGlzLl9oYW5kbGVTcGFjZS5iaW5kKHRoaXMp KSwKKyAgICAgICAgICAgIG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRj dXQuTW9kaWZpZXIuU2hpZnQsIFdJLktleWJvYXJkU2hvcnRjdXQuS2V5LlNwYWNlLCB0aGlzLl9o YW5kbGVTcGFjZS5iaW5kKHRoaXMpKSwKKyAgICAgICAgXTsKKworICAgICAgICBmb3IgKGxldCBz aG9ydGN1dCBvZiB0aGlzLl9rZXlib2FyZFNob3J0Y3V0cykKKyAgICAgICAgICAgIHNob3J0Y3V0 LmRpc2FibGVkID0gdHJ1ZTsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTg2LDEyICs5OCwx NiBAQCBXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdD b250ZW50VmlldyBleHRlbmRzIFdJLkNvbGxlYwogICAgIHsKICAgICAgICAgY29udGVudFZpZXcu ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWVudGVyIiwgdGhpcy5fY29udGVudFZpZXdN b3VzZUVudGVyKTsKICAgICAgICAgY29udGVudFZpZXcuZWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJtb3VzZWxlYXZlIiwgdGhpcy5fY29udGVudFZpZXdNb3VzZUxlYXZlKTsKKworICAgICAgICB0 aGlzLl91cGRhdGVOYXZpZ2F0aW9uSXRlbXMoKTsKICAgICB9CiAKICAgICBjb250ZW50Vmlld1Jl bW92ZWQoY29udGVudFZpZXcpCiAgICAgewogICAgICAgICBjb250ZW50Vmlldy5lbGVtZW50LnJl bW92ZUV2ZW50TGlzdGVuZXIoIm1vdXNlZW50ZXIiLCB0aGlzLl9jb250ZW50Vmlld01vdXNlRW50 ZXIpOwogICAgICAgICBjb250ZW50Vmlldy5lbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoIm1v dXNlbGVhdmUiLCB0aGlzLl9jb250ZW50Vmlld01vdXNlTGVhdmUpOworCisgICAgICAgIHRoaXMu X3VwZGF0ZU5hdmlnYXRpb25JdGVtcygpOwogICAgIH0KIAogICAgIGF0dGFjaGVkKCkKQEAgLTEw MSw2ICsxMTcsOSBAQCBXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFz T3ZlcnZpZXdDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbGxlYwogICAgICAgICBXSS5zZXR0aW5n cy5zaG93SW1hZ2VHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2Vk LCB0aGlzLl91cGRhdGVTaG93SW1hZ2VHcmlkLCB0aGlzKTsKIAogICAgICAgICB0aGlzLmFkZEV2 ZW50TGlzdGVuZXIoV0kuQ29udGVudFZpZXcuRXZlbnQuU3VwcGxlbWVudGFsUmVwcmVzZW50ZWRP YmplY3RzRGlkQ2hhbmdlLCB0aGlzLl9zdXBwbGVtZW50YWxSZXByZXNlbnRlZE9iamVjdHNEaWRD aGFuZ2UsIHRoaXMpOworCisgICAgICAgIGZvciAobGV0IHNob3J0Y3V0IG9mIHRoaXMuX2tleWJv YXJkU2hvcnRjdXRzKQorICAgICAgICAgICAgc2hvcnRjdXQuZGlzYWJsZWQgPSBmYWxzZTsKICAg ICB9CiAKICAgICBkZXRhY2hlZCgpCkBAIC0xMDksNiArMTI4LDkgQEAgV0kuQ2FudmFzT3ZlcnZp ZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBX SS5Db2xsZWMKIAogICAgICAgICB0aGlzLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwg dGhpcyk7CiAKKyAgICAgICAgZm9yIChsZXQgc2hvcnRjdXQgb2YgdGhpcy5fa2V5Ym9hcmRTaG9y dGN1dHMpCisgICAgICAgICAgICBzaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisKICAgICAgICAg c3VwZXIuZGV0YWNoZWQoKTsKICAgICB9CiAKQEAgLTEyMCw2ICsxNDIsNTAgQEAgV0kuQ2FudmFz T3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgICAgIGNhbnZhc0NvbnRlbnRWaWV3LnJlZnJlc2goKTsK ICAgICB9CiAKKyAgICBfY2hhbmdlU2VsZWN0ZWRJdGVtVmVydGljYWxseShzaGlmdCkKKyAgICB7 CisgICAgICAgIGxldCBpdGVtRWxlbWVudFdpZHRoID0gdGhpcy5lbGVtZW50LmZpcnN0RWxlbWVu dENoaWxkLm9mZnNldFdpZHRoICsgKDIgKiBXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3Ll9p dGVtTWFyZ2luKTsKKyAgICAgICAgbGV0IGl0ZW1zUGVyUm93ID0gTWF0aC5mbG9vcih0aGlzLmVs ZW1lbnQub2Zmc2V0V2lkdGggLyBpdGVtRWxlbWVudFdpZHRoKTsKKworICAgICAgICBsZXQgaXRl bXMgPSBBcnJheS5mcm9tKHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaXRlbXMpOworICAgICAgICBs ZXQgaW5kZXggPSBpdGVtcy5pbmRleE9mKHRoaXMuX3NlbGVjdGVkSXRlbSk7CisgICAgICAgIGlm IChpbmRleCA9PT0gLTEpCisgICAgICAgICAgICBpbmRleCA9IHNoaWZ0IDwgMCA/IGl0ZW1zLmxl bmd0aCArIDEgOiBpdGVtc1BlclJvdzsKKworICAgICAgICBpbmRleCArPSBzaGlmdCAqIGl0ZW1z UGVyUm93OworICAgICAgICBpZiAoaW5kZXggPCAwKQorICAgICAgICAgICAgaW5kZXggPSBpdGVt cy5sZW5ndGggKyBpbmRleDsKKworICAgICAgICB0aGlzLnNldFNlbGVjdGVkSXRlbShpdGVtc1tp bmRleCAlIGl0ZW1zLmxlbmd0aF0pOworICAgIH0KKworICAgIF9jaGFuZ2VTZWxlY3RlZEl0ZW1I b3Jpem9udGFsbHkoc2hpZnQpCisgICAgeworICAgICAgICBsZXQgaXRlbUVsZW1lbnRXaWR0aCA9 IHRoaXMuZWxlbWVudC5maXJzdEVsZW1lbnRDaGlsZC5vZmZzZXRXaWR0aCArICgyICogV0kuQ2Fu dmFzT3ZlcnZpZXdDb250ZW50Vmlldy5faXRlbU1hcmdpbik7CisgICAgICAgIGxldCBpdGVtc1Bl clJvdyA9IE1hdGguZmxvb3IodGhpcy5lbGVtZW50Lm9mZnNldFdpZHRoIC8gaXRlbUVsZW1lbnRX aWR0aCk7CisKKyAgICAgICAgbGV0IGl0ZW1zID0gQXJyYXkuZnJvbSh0aGlzLnJlcHJlc2VudGVk T2JqZWN0Lml0ZW1zKTsKKyAgICAgICAgbGV0IGluZGV4ID0gaXRlbXMuaW5kZXhPZih0aGlzLl9z ZWxlY3RlZEl0ZW0pOworICAgICAgICBpZiAoaW5kZXggPT09IC0xKQorICAgICAgICAgICAgaW5k ZXggPSBzaGlmdCA+PSAwID8gaXRlbXNQZXJSb3cgLSAxIDogMDsKKworICAgICAgICBsZXQgc2Vs ZWN0ZWRSb3cgPSBNYXRoLmZsb29yKGluZGV4IC8gaXRlbXNQZXJSb3cpOworICAgICAgICBpbmRl eCArPSBzaGlmdDsKKyAgICAgICAgaWYgKGluZGV4IDwgc2VsZWN0ZWRSb3cgKiBpdGVtc1BlclJv dykKKyAgICAgICAgICAgIGluZGV4ICs9IGl0ZW1zUGVyUm93OworICAgICAgICBlbHNlIGlmIChp bmRleCA+PSAoc2VsZWN0ZWRSb3cgKyAxKSAqIGl0ZW1zUGVyUm93KQorICAgICAgICAgICAgaW5k ZXggLT0gaXRlbXNQZXJSb3c7CisKKyAgICAgICAgdGhpcy5zZXRTZWxlY3RlZEl0ZW0oaXRlbXNb aW5kZXhdKTsKKyAgICB9CisKKyAgICBfdXBkYXRlTmF2aWdhdGlvbkl0ZW1zKCkKKyAgICB7Cisg ICAgICAgIGxldCBoYXNJdGVtcyA9ICEhdGhpcy5yZXByZXNlbnRlZE9iamVjdC5pdGVtcy5zaXpl OworICAgICAgICB0aGlzLl9yZWZyZXNoQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IGhh c0l0ZW1zOworICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJs ZWQgPSBoYXNJdGVtczsKKyAgICB9CisKICAgICBfc2VsZWN0aW9uUGF0aENvbXBvbmVudHNDaGFu Z2VkKGV2ZW50KQogICAgIHsKICAgICAgICAgbGV0IHBhdGhDb21wb25lbnQgPSBldmVudC5kYXRh LnBhdGhDb21wb25lbnQ7CkBAIC0xMzIsMTYgKzE5OCwzNyBAQCBXSS5DYW52YXNPdmVydmlld0Nv bnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bGxlYwogICAgICAgICBXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZhbHVlID0gIXRoaXMuX3No b3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkOwogICAgIH0KIAotICAgIF9zdXBw bGVtZW50YWxSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2UoKQorICAgIF9oYW5kbGVVcChldmVu dCkKICAgICB7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkNvbnRl bnRWaWV3LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKKyAgICAgICAg dGhpcy5fY2hhbmdlU2VsZWN0ZWRJdGVtVmVydGljYWxseSgtMSk7CiAgICAgfQogCi0gICAgX3Vw ZGF0ZU5hdmlnYXRpb25JdGVtcygpCisgICAgX2hhbmRsZVJpZ2h0KGV2ZW50KQorICAgIHsKKyAg ICAgICAgdGhpcy5fY2hhbmdlU2VsZWN0ZWRJdGVtSG9yaXpvbnRhbGx5KDEpOworICAgIH0KKwor ICAgIF9oYW5kbGVEb3duKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fY2hhbmdlU2VsZWN0 ZWRJdGVtVmVydGljYWxseSgxKTsKKyAgICB9CisKKyAgICBfaGFuZGxlTGVmdChldmVudCkKICAg ICB7Ci0gICAgICAgIGxldCBkaXNhYmxlZCA9ICF0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lml0ZW1z LnNpemU7Ci0gICAgICAgIHRoaXMuX3JlZnJlc2hCdXR0b25OYXZpZ2F0aW9uSXRlbS5kaXNhYmxl ZCA9IGRpc2FibGVkOwotICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVt LmRpc2FibGVkID0gZGlzYWJsZWQ7CisgICAgICAgIHRoaXMuX2NoYW5nZVNlbGVjdGVkSXRlbUhv cml6b250YWxseSgtMSk7CisgICAgfQorCisgICAgX2hhbmRsZVNwYWNlKGV2ZW50KQorICAgIHsK KyAgICAgICAgaWYgKCF0aGlzLl9zZWxlY3RlZEl0ZW0pCisgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkSXRlbS5pc1JlY29yZGluZykKKyAgICAgICAgICAg IFdJLmNhbnZhc01hbmFnZXIuc3RvcFJlY29yZGluZygpOworICAgICAgICBlbHNlIGlmICghV0ku Y2FudmFzTWFuYWdlci5yZWNvcmRpbmdDYW52YXMpIHsKKyAgICAgICAgICAgIGxldCBzaW5nbGVG cmFtZSA9ICEhZXZlbnQuc2hpZnRLZXk7CisgICAgICAgICAgICBXSS5jYW52YXNNYW5hZ2VyLnN0 YXJ0UmVjb3JkaW5nKHRoaXMuX3NlbGVjdGVkSXRlbSwgc2luZ2xlRnJhbWUpOworICAgICAgICB9 CiAgICAgfQogCiAgICAgX3VwZGF0ZVNob3dJbWFnZUdyaWQoKQpAQCAtMTQ5LDYgKzIzNiwxMSBA QCBXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbGxlYwogICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5h dmlnYXRpb25JdGVtLmFjdGl2YXRlZCA9ICEhV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZC52YWx1 ZTsKICAgICB9CiAKKyAgICBfc3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdl KCkKKyAgICB7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkNvbnRl bnRWaWV3LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKKyAgICB9CisK ICAgICBfY29udGVudFZpZXdNb3VzZUVudGVyKGV2ZW50KQogICAgIHsKICAgICAgICAgbGV0IGNv bnRlbnRWaWV3ID0gV0kuVmlldy5mcm9tRWxlbWVudChldmVudC50YXJnZXQpOwpAQCAtMTc1LDMg KzI2Nyw1IEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVy dmlld0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29sbGVjCiAgICAgICAgIFdJLmRvbVRyZWVNYW5h Z2VyLmhpZGVET01Ob2RlSGlnaGxpZ2h0KCk7CiAgICAgfQogfTsKKworV0kuQ2FudmFzT3ZlcnZp ZXdDb250ZW50Vmlldy5faXRlbU1hcmdpbiA9IDEwOwo= 325066 2017-10-26 15:48:04 -0700 2017-10-26 16:41:26 -0700 Patch bug-178800-20171026154803.patch text/plain 11650 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNjZjFlNjg1OGNkMzA5ZWFmZDgzNDg2YmU0NDNi MmQ0NDQzNDk0YTUuLjEzMDI4YzZjODMzZTU4NDQxZjg5OTdhYTAyYjMwZGI5NTlmMjUzMTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE3LTEwLTI2ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IENhbnZhcyBUYWI6IGNhbnZhc2VzIG92ZXJ2aWV3IHNob3VsZCBzdXBwb3J0IG5hdmlnYXRp b24gdmlhIGtleWJvYXJkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzg4MDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1MTc1ODU2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IEJyaWFuIEJ1cmcuCisKKyAgICAgICAgQ3JlYXRlIGEgS2V5Ym9hcmRT aG9yY3V0IGZvciBlYWNoIG9mIHRoZSBmb2xsb3dpbmc6CisgICAgICAgICAtIFVwOiBzZWxlY3Rz IHRoZSBwcmV2aW91cyBjYW52YXMgaW4gdGhlIHNlbGVjdGVkIGNvbHVtbgorICAgICAgICAgLSBE b3duOiBzZWxlY3RzIHRoZSBuZXh0IGNhbnZhcyBpbiB0aGUgc2VsZWN0ZWQgY29sdW1uCisgICAg ICAgICAtIFJpZ2h0OiBzZWxlY3RzIHRoZSBuZXh0IGNhbnZhcyBpbiB0aGUgc2VsZWN0ZWQgcm93 CisgICAgICAgICAtIExlZnQ6IHNlbGVjdHMgdGhlIHByZXZpb3VzIGNhbnZhcyBpbiB0aGUgc2Vs ZWN0ZWQgcm93CisgICAgICAgICAtIFNwYWNlOiB0b2dnbGUgcmVjb3JkaW5nIG9mIHRoZSBzZWxl Y3RlZCBjYW52YXMKKyAgICAgICAgIC0gU2hpZnQrU3BhY2U6IHRvZ2dsZSBzaW5nbGUtZnJhbWUg cmVjb3JkaW5nIG9mIHRoZSBzZWxlY3RlZCBjYW52YXMKKworICAgICAgICBUaGUgY2FsY3VsYXRp b24gZm9yIHNlbGVjdGVkIHJvdy9jb2x1bSBpcyBiYXNlZCBvbiB0aGUgYG9mZnNldFdpZHRoYCBv ZiB0aGUgcGFyZW50IGVsZW1lbnQKKyAgICAgICAgYW5kIHRoZSBzZWxlY3RlZCBpdGVtJ3MgY29u dGVudCB2aWV3IGVsZW1lbnQuIFNpbmNlIHRoaXMgdmlldyB1c2VzIGEgZmxleGJveCwgYWxsIG9m IHRoZQorICAgICAgICBpdGVtcyBhcmUgZXhwZWN0ZWQgdG8gaGF2ZSB0aGUgc2FtZSBkaW1lbnNp b25zLCBtZWFuaW5nIHRoYXQgdGhpcyB2YWx1ZSBpcyB1bmlmb3JtLiBUaGUKKyAgICAgICAgaW50 ZW5kZWQgZnVuY3Rpb25hbGl0eSBpcyB0aGF0IG9mIGEgc3ByZWFkc2hlZXQsIHdoZXJlIHByZXNz aW5nIHByZXNzaW5nIGxlZnQvcmlnaHQgd2lsbAorICAgICAgICBuZXZlciBjaGFuZ2UgdGhlIHNl bGVjdGVkIHJvdyBhbmQgdXAvZG93biB3aWxsIG5ldmVyIGNoYW5nZSB0aGUgc2VsZWN0ZWQgY29s dW1uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRl bnRWaWV3LmNzczoKKyAgICAgICAgKC5jb250ZW50LXZpZXcuY2FudmFzLW92ZXJ2aWV3KToKKyAg ICAgICAgKC5jb250ZW50LXZpZXcuY2FudmFzLW92ZXJ2aWV3IC5jb250ZW50LXZpZXcuY2FudmFz KToKKyAgICAgICAgTW92ZSBtYXJnaW4gdmFsdWUgdG8gYSBDU1MgdmFyaWFibGUgc28gdGhhdCBp dCBjYW4gYmUgZWFzaWx5IHJldHJpZXZlZCB2aWEgSmF2YVNjcmlwdC4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZp ZXdDb250ZW50Vmlldy5wcm90b3R5cGUuY29udGVudFZpZXdBZGRlZCk6CisgICAgICAgIChXSS5D YW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5jb250ZW50Vmlld1JlbW92ZWQpOgor ICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuYXR0YWNoZWQp OgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuZGV0YWNo ZWQpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0 IF9pdGVtTWFyZ2luKToKKyAgICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJv dG90eXBlLl9jaGFuZ2VTZWxlY3RlZEl0ZW1WZXJ0aWNhbGx5KToKKyAgICAgICAgKFdJLkNhbnZh c092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBlLl9jaGFuZ2VTZWxlY3RlZEl0ZW1Ib3Jpem9u dGFsbHkpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUu X3VwZGF0ZU5hdmlnYXRpb25JdGVtcyk6CisgICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRl bnRWaWV3LnByb3RvdHlwZS5faGFuZGxlVXApOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdD b250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZVJpZ2h0KToKKyAgICAgICAgKFdJLkNhbnZhc092 ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVEb3duKToKKyAgICAgICAgKFdJLkNh bnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVMZWZ0KToKKyAgICAgICAg KFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVTcGFjZSk6Cisg ICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fc3VwcGxlbWVu dGFsUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlKToKKyAgICAgICAgRHJpdmUtYnk6IGNhbGwg YF91cGRhdGVOYXZpZ2F0aW9uSXRlbXNgIHdoZW5ldmVyIGFuIGl0ZW0gaXMgYWRkZWQvcmVtb3Zl ZCBzbyB0aGF0IGlmIHRoZXJlCisgICAgICAgIGFyZSBubyBpdGVtcyB0aGUgbmF2aWdhdGlvbiBp dGVtcyBjYW5ub3QgYmUgY2xpY2tlZC4KKwogMjAxNy0xMC0yNSAgRGV2aW4gUm91c3NvICA8d2Vi a2l0QGRldmlucm91c3NvLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBwcm92aWRlIGEg d2F5IHRvIGVuYWJsZS9kaXNhYmxlIGV2ZW50IGxpc3RlbmVycwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50 Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52 YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzcwppbmRleCA5YTcyYTNlNzFjZWQyMjZiNWJiMWZkMWJl YTgwZGJmYjM1ZGU5MTlmLi44NmJlMzYyNWEwZTdlMWI0NjdkM2JiNGIxZWY0MmExZWIwNzEzNzhi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D YW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzcwpAQCAtMjcs MTEgKzI3LDEzIEBACiAgICAganVzdGlmeS1jb250ZW50OiBjZW50ZXI7CiAgICAgYWxpZ24taXRl bXM6IGZsZXgtc3RhcnQ7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCA5MCUpOwor CisgICAgLS1pdGVtLW1hcmdpbjogMTBweDsKIH0KIAogLmNvbnRlbnQtdmlldy5jYW52YXMtb3Zl cnZpZXcgLmNvbnRlbnQtdmlldy5jYW52YXMgewogICAgIGZsZXgtZ3JvdzogMDsKLSAgICBtYXJn aW46IDEwcHg7CisgICAgbWFyZ2luOiB2YXIoLS1pdGVtLW1hcmdpbik7CiAgICAgd2lkdGg6IDQw MHB4OwogICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZh c092ZXJ2aWV3Q29udGVudFZpZXcuanMKaW5kZXggOWUwMzdlODA0ZmU2ZjRlNDk0MDQ5MjgxMDM2 NmFkMDU2MTk1ZTk0ZS4uMzZkYTE2YmUxMWEwMjJiNTI5YWEzYjI2ODQzOTEyMjRmZjEzOTk1ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2Fu dmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzCkBAIC0zNCwxNSAr MzQsMjcgQEAgV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2 aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgdGhpcy5lbGVtZW50LmNs YXNzTGlzdC5hZGQoImNhbnZhcy1vdmVydmlldyIpOwogCiAgICAgICAgIHRoaXMuX3JlZnJlc2hC dXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbSgicmVmcmVz aC1hbGwiLCBXSS5VSVN0cmluZygiUmVmcmVzaCBhbGwiKSwgIkltYWdlcy9SZWxvYWRGdWxsLnN2 ZyIsIDEzLCAxMyk7Ci0gICAgICAgIHRoaXMuX3JlZnJlc2hCdXR0b25OYXZpZ2F0aW9uSXRlbS5k aXNhYmxlZCA9IHRydWU7CisgICAgICAgIHRoaXMuX3JlZnJlc2hCdXR0b25OYXZpZ2F0aW9uSXRl bS5lbmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hCdXR0b25OYXZpZ2F0aW9u SXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNr ZWQsIHRoaXMuX3JlZnJlc2hQcmV2aWV3cywgdGhpcyk7CiAKICAgICAgICAgdGhpcy5fc2hvd0dy aWRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5BY3RpdmF0ZUJ1dHRvbk5hdmlnYXRpb25J dGVtKCJzaG93LWdyaWQiLCBXSS5VSVN0cmluZygiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCIpLCBX SS5VSVN0cmluZygiSGlkZSBHcmlkIiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1DaGVja2Vycy5z dmciLCAxMywgMTMpOwogICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVt LmFjdGl2YXRlZCA9ICEhV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3JpZC52YWx1ZTsKLSAgICAgICAg dGhpcy5fc2hvd0dyaWRCdXR0b25OYXZpZ2F0aW9uSXRlbS5kaXNhYmxlZCA9IHRydWU7CisgICAg ICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IGZhbHNlOwog ICAgICAgICB0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVu ZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fc2hvd0dyaWRC dXR0b25DbGlja2VkLCB0aGlzKTsKIAogICAgICAgICB0aGlzLnNlbGVjdGlvbkVuYWJsZWQgPSB0 cnVlOworCisgICAgICAgIHRoaXMuX2tleWJvYXJkU2hvcnRjdXRzID0gWworICAgICAgICAgICAg bmV3IFdJLktleWJvYXJkU2hvcnRjdXQobnVsbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuVXAs IHRoaXMuX2hhbmRsZVVwLmJpbmQodGhpcykpLAorICAgICAgICAgICAgbmV3IFdJLktleWJvYXJk U2hvcnRjdXQobnVsbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuUmlnaHQsIHRoaXMuX2hhbmRs ZVJpZ2h0LmJpbmQodGhpcykpLAorICAgICAgICAgICAgbmV3IFdJLktleWJvYXJkU2hvcnRjdXQo bnVsbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuRG93biwgdGhpcy5faGFuZGxlRG93bi5iaW5k KHRoaXMpKSwKKyAgICAgICAgICAgIG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KG51bGwsIFdJLktl eWJvYXJkU2hvcnRjdXQuS2V5LkxlZnQsIHRoaXMuX2hhbmRsZUxlZnQuYmluZCh0aGlzKSksCisg ICAgICAgICAgICBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCBXSS5LZXlib2FyZFNob3J0 Y3V0LktleS5TcGFjZSwgdGhpcy5faGFuZGxlU3BhY2UuYmluZCh0aGlzKSksCisgICAgICAgICAg ICBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChXSS5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLlNo aWZ0LCBXSS5LZXlib2FyZFNob3J0Y3V0LktleS5TcGFjZSwgdGhpcy5faGFuZGxlU3BhY2UuYmlu ZCh0aGlzKSksCisgICAgICAgIF07CisKKyAgICAgICAgZm9yIChsZXQgc2hvcnRjdXQgb2YgdGhp cy5fa2V5Ym9hcmRTaG9ydGN1dHMpCisgICAgICAgICAgICBzaG9ydGN1dC5kaXNhYmxlZCA9IHRy dWU7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC04NiwxMiArOTgsMTYgQEAgV0kuQ2FudmFz T3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db2xsZWMKICAgICB7CiAgICAgICAgIGNvbnRlbnRWaWV3LmVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigibW91c2VlbnRlciIsIHRoaXMuX2NvbnRlbnRWaWV3TW91c2VFbnRlcik7CiAg ICAgICAgIGNvbnRlbnRWaWV3LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VsZWF2ZSIs IHRoaXMuX2NvbnRlbnRWaWV3TW91c2VMZWF2ZSk7CisKKyAgICAgICAgdGhpcy5fdXBkYXRlTmF2 aWdhdGlvbkl0ZW1zKCk7CiAgICAgfQogCiAgICAgY29udGVudFZpZXdSZW1vdmVkKGNvbnRlbnRW aWV3KQogICAgIHsKICAgICAgICAgY29udGVudFZpZXcuZWxlbWVudC5yZW1vdmVFdmVudExpc3Rl bmVyKCJtb3VzZWVudGVyIiwgdGhpcy5fY29udGVudFZpZXdNb3VzZUVudGVyKTsKICAgICAgICAg Y29udGVudFZpZXcuZWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJtb3VzZWxlYXZlIiwgdGhp cy5fY29udGVudFZpZXdNb3VzZUxlYXZlKTsKKworICAgICAgICB0aGlzLl91cGRhdGVOYXZpZ2F0 aW9uSXRlbXMoKTsKICAgICB9CiAKICAgICBhdHRhY2hlZCgpCkBAIC0xMDEsNiArMTE3LDkgQEAg V0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVu dFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgV0kuc2V0dGluZ3Muc2hvd0ltYWdlR3Jp ZC5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwgdGhpcy5fdXBkYXRl U2hvd0ltYWdlR3JpZCwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5hZGRFdmVudExpc3RlbmVyKFdJ LkNvbnRlbnRWaWV3LkV2ZW50LlN1cHBsZW1lbnRhbFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5n ZSwgdGhpcy5fc3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlLCB0aGlzKTsK KworICAgICAgICBmb3IgKGxldCBzaG9ydGN1dCBvZiB0aGlzLl9rZXlib2FyZFNob3J0Y3V0cykK KyAgICAgICAgICAgIHNob3J0Y3V0LmRpc2FibGVkID0gZmFsc2U7CiAgICAgfQogCiAgICAgZGV0 YWNoZWQoKQpAQCAtMTA5LDE3ICsxMjgsNjkgQEAgV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmll dyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKIAog ICAgICAgICB0aGlzLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CiAKKyAg ICAgICAgZm9yIChsZXQgc2hvcnRjdXQgb2YgdGhpcy5fa2V5Ym9hcmRTaG9ydGN1dHMpCisgICAg ICAgICAgICBzaG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7CisKICAgICAgICAgc3VwZXIuZGV0YWNo ZWQoKTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCiAKKyAgICBnZXQgX2l0ZW1NYXJnaW4oKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIHBhcnNlSW50KHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRo aXMuZWxlbWVudCkuZ2V0UHJvcGVydHlWYWx1ZSgiLS1pdGVtLW1hcmdpbiIpKTsKKyAgICB9CisK ICAgICBfcmVmcmVzaFByZXZpZXdzKCkKICAgICB7CiAgICAgICAgIGZvciAobGV0IGNhbnZhc0Nv bnRlbnRWaWV3IG9mIHRoaXMuc3Vidmlld3MpCiAgICAgICAgICAgICBjYW52YXNDb250ZW50Vmll dy5yZWZyZXNoKCk7CiAgICAgfQogCisgICAgX2NoYW5nZVNlbGVjdGVkSXRlbVZlcnRpY2FsbHko c2hpZnQpCisgICAgeworICAgICAgICBsZXQgaXRlbUVsZW1lbnRXaWR0aCA9IHRoaXMuZWxlbWVu dC5maXJzdEVsZW1lbnRDaGlsZC5vZmZzZXRXaWR0aCArICgyICogdGhpcy5faXRlbU1hcmdpbik7 CisgICAgICAgIGxldCBpdGVtc1BlclJvdyA9IE1hdGguZmxvb3IodGhpcy5lbGVtZW50Lm9mZnNl dFdpZHRoIC8gaXRlbUVsZW1lbnRXaWR0aCk7CisKKyAgICAgICAgbGV0IGl0ZW1zID0gQXJyYXku ZnJvbSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lml0ZW1zKTsKKyAgICAgICAgbGV0IGluZGV4ID0g aXRlbXMuaW5kZXhPZih0aGlzLl9zZWxlY3RlZEl0ZW0pOworICAgICAgICBpZiAoaW5kZXggPT09 IC0xKQorICAgICAgICAgICAgaW5kZXggPSBzaGlmdCA8IDAgPyBpdGVtcy5sZW5ndGggKyAxIDog aXRlbXNQZXJSb3c7CisKKyAgICAgICAgaW5kZXggKz0gc2hpZnQgKiBpdGVtc1BlclJvdzsKKyAg ICAgICAgaWYgKGluZGV4IDwgMCkKKyAgICAgICAgICAgIGluZGV4ID0gaXRlbXMubGVuZ3RoICsg aW5kZXg7CisKKyAgICAgICAgdGhpcy5zZXRTZWxlY3RlZEl0ZW0oaXRlbXNbaW5kZXggJSBpdGVt cy5sZW5ndGhdKTsKKyAgICB9CisKKyAgICBfY2hhbmdlU2VsZWN0ZWRJdGVtSG9yaXpvbnRhbGx5 KHNoaWZ0KQorICAgIHsKKyAgICAgICAgbGV0IGl0ZW1FbGVtZW50V2lkdGggPSB0aGlzLmVsZW1l bnQuZmlyc3RFbGVtZW50Q2hpbGQub2Zmc2V0V2lkdGggKyAoMiAqIHRoaXMuX2l0ZW1NYXJnaW4p OworICAgICAgICBsZXQgaXRlbXNQZXJSb3cgPSBNYXRoLmZsb29yKHRoaXMuZWxlbWVudC5vZmZz ZXRXaWR0aCAvIGl0ZW1FbGVtZW50V2lkdGgpOworCisgICAgICAgIGxldCBpdGVtcyA9IEFycmF5 LmZyb20odGhpcy5yZXByZXNlbnRlZE9iamVjdC5pdGVtcyk7CisgICAgICAgIGxldCBpbmRleCA9 IGl0ZW1zLmluZGV4T2YodGhpcy5fc2VsZWN0ZWRJdGVtKTsKKyAgICAgICAgaWYgKGluZGV4ID09 PSAtMSkKKyAgICAgICAgICAgIGluZGV4ID0gc2hpZnQgPj0gMCA/IGl0ZW1zUGVyUm93IC0gMSA6 IDA7CisKKyAgICAgICAgbGV0IHNlbGVjdGVkUm93ID0gTWF0aC5mbG9vcihpbmRleCAvIGl0ZW1z UGVyUm93KTsKKyAgICAgICAgaW5kZXggKz0gc2hpZnQ7CisgICAgICAgIGlmIChpbmRleCA8IHNl bGVjdGVkUm93ICogaXRlbXNQZXJSb3cpCisgICAgICAgICAgICBpbmRleCArPSBpdGVtc1BlclJv dzsKKyAgICAgICAgZWxzZSBpZiAoaW5kZXggPj0gKHNlbGVjdGVkUm93ICsgMSkgKiBpdGVtc1Bl clJvdykKKyAgICAgICAgICAgIGluZGV4IC09IGl0ZW1zUGVyUm93OworCisgICAgICAgIHRoaXMu c2V0U2VsZWN0ZWRJdGVtKGl0ZW1zW2luZGV4XSk7CisgICAgfQorCisgICAgX3VwZGF0ZU5hdmln YXRpb25JdGVtcygpCisgICAgeworICAgICAgICBsZXQgaGFzSXRlbXMgPSAhIXRoaXMucmVwcmVz ZW50ZWRPYmplY3QuaXRlbXMuc2l6ZTsKKyAgICAgICAgdGhpcy5fcmVmcmVzaEJ1dHRvbk5hdmln YXRpb25JdGVtLmVuYWJsZWQgPSBoYXNJdGVtczsKKyAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0 b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gaGFzSXRlbXM7CisgICAgfQorCiAgICAgX3NlbGVj dGlvblBhdGhDb21wb25lbnRzQ2hhbmdlZChldmVudCkKICAgICB7CiAgICAgICAgIGxldCBwYXRo Q29tcG9uZW50ID0gZXZlbnQuZGF0YS5wYXRoQ29tcG9uZW50OwpAQCAtMTMyLDE2ICsyMDMsMzkg QEAgV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29u dGVudFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgV0kuc2V0dGluZ3Muc2hvd0ltYWdl R3JpZC52YWx1ZSA9ICF0aGlzLl9zaG93R3JpZEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFjdGl2YXRl ZDsKICAgICB9CiAKLSAgICBfc3VwcGxlbWVudGFsUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdl KCkKKyAgICBfaGFuZGxlVXAoZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50 c0RpZENoYW5nZSk7CisgICAgICAgIHRoaXMuX2NoYW5nZVNlbGVjdGVkSXRlbVZlcnRpY2FsbHko LTEpOwogICAgIH0KIAotICAgIF91cGRhdGVOYXZpZ2F0aW9uSXRlbXMoKQorICAgIF9oYW5kbGVS aWdodChldmVudCkKKyAgICB7CisgICAgICAgIGxldCBzaGlmdCA9IFdJLnJlc29sdmVkTGF5b3V0 RGlyZWN0aW9uKCkgPT09IFdJLkxheW91dERpcmVjdGlvbi5SVEwgPyAtMSA6IDE7CisgICAgICAg IHRoaXMuX2NoYW5nZVNlbGVjdGVkSXRlbUhvcml6b250YWxseShzaGlmdCk7CisgICAgfQorCisg ICAgX2hhbmRsZURvd24oZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9jaGFuZ2VTZWxlY3Rl ZEl0ZW1WZXJ0aWNhbGx5KDEpOworICAgIH0KKworICAgIF9oYW5kbGVMZWZ0KGV2ZW50KQorICAg IHsKKyAgICAgICAgbGV0IHNoaWZ0ID0gV0kucmVzb2x2ZWRMYXlvdXREaXJlY3Rpb24oKSA9PT0g V0kuTGF5b3V0RGlyZWN0aW9uLlJUTCA/IDEgOiAtMTsKKyAgICAgICAgdGhpcy5fY2hhbmdlU2Vs ZWN0ZWRJdGVtSG9yaXpvbnRhbGx5KHNoaWZ0KTsKKyAgICB9CisKKyAgICBfaGFuZGxlU3BhY2Uo ZXZlbnQpCiAgICAgewotICAgICAgICBsZXQgZGlzYWJsZWQgPSAhdGhpcy5yZXByZXNlbnRlZE9i amVjdC5pdGVtcy5zaXplOwotICAgICAgICB0aGlzLl9yZWZyZXNoQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uZGlzYWJsZWQgPSBkaXNhYmxlZDsKLSAgICAgICAgdGhpcy5fc2hvd0dyaWRCdXR0b25OYXZp Z2F0aW9uSXRlbS5kaXNhYmxlZCA9IGRpc2FibGVkOworICAgICAgICBpZiAoIXRoaXMuX3NlbGVj dGVkSXRlbSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBpZiAodGhpcy5fc2VsZWN0 ZWRJdGVtLmlzUmVjb3JkaW5nKQorICAgICAgICAgICAgV0kuY2FudmFzTWFuYWdlci5zdG9wUmVj b3JkaW5nKCk7CisgICAgICAgIGVsc2UgaWYgKCFXSS5jYW52YXNNYW5hZ2VyLnJlY29yZGluZ0Nh bnZhcykgeworICAgICAgICAgICAgbGV0IHNpbmdsZUZyYW1lID0gISFldmVudC5zaGlmdEtleTsK KyAgICAgICAgICAgIFdJLmNhbnZhc01hbmFnZXIuc3RhcnRSZWNvcmRpbmcodGhpcy5fc2VsZWN0 ZWRJdGVtLCBzaW5nbGVGcmFtZSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBfdXBkYXRlU2hv d0ltYWdlR3JpZCgpCkBAIC0xNDksNiArMjQzLDExIEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29udGVu dFZpZXcgPSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29sbGVj CiAgICAgICAgIHRoaXMuX3Nob3dHcmlkQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZhdGVkID0g ISFXSS5zZXR0aW5ncy5zaG93SW1hZ2VHcmlkLnZhbHVlOwogICAgIH0KIAorICAgIF9zdXBwbGVt ZW50YWxSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFuZ2UoKQorICAgIHsKKyAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ29udGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0 aENvbXBvbmVudHNEaWRDaGFuZ2UpOworICAgIH0KKwogICAgIF9jb250ZW50Vmlld01vdXNlRW50 ZXIoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQgY29udGVudFZpZXcgPSBXSS5WaWV3LmZyb21F bGVtZW50KGV2ZW50LnRhcmdldCk7Cg==