176433 2017-09-05 16:57:49 -0700 Web Inspector: ⌘E and ⌘G do not work in main content area when quick console drawer is open 2017-09-27 12:35:32 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue inspector-bugzilla-changes joepeck mmaxfield webkit-bug-importer oldest_to_newest 1345723 0 joepeck 2017-09-05 16:57:49 -0700 ⌘E and ⌘G do not work in main content area when quick console drawer is open Steps to reproduce: 1. Inspect webkit.org 2. Show the main resource's content in the Resources tab 3. Expand the quick console 4. Double click to select "stylesheet" in the main resource content area 5. ⌘E and ⌘G => Expected search forward, nothing happened Notes: - Both the Main ContentBrowser and the QuickConsole's ContentBrowser have a FindBanner - Both FindBanners have "enabled" their ⌘E/⌘G handling - The QuickConsole's happens first - KeyboardShortcut's global handler runs only 1 handler and bails 1345724 1 joepeck 2017-09-05 16:59:40 -0700 Possible solutions: 1. KeyboardShortcuts should specify if they have handled / if they stop propagation 2. Move away from multiple KeyboardShortcuts and behave like ⌘K where it is a global entry point and the current / active content view attempts to handle the operation. I like (2) better, since it avoid any conflict. The user has a keyboard shortcut, and they expect it to apply to the active area. 1345730 2 319963 joepeck 2017-09-05 17:45:56 -0700 Created attachment 319963 [PATCH] Proposed Fix 1345940 3 bburg 2017-09-06 08:55:12 -0700 This is a great example of something that is not possible to test given our current test harness setup. 1345941 4 319963 bburg 2017-09-06 09:05:38 -0700 Comment on attachment 319963 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=319963&action=review r=me, Thank you Joe! > Source/WebInspectorUI/ChangeLog:45 > + are ContentBrowsers Nit: missing end of sentence > Source/WebInspectorUI/UserInterface/Base/Main.js:291 > + // FIXME: FindBanner search queries should be shared among search fields and be common with the system. Nit: you are looking for bugs 151310 and 113588. > Source/WebInspectorUI/UserInterface/Views/ContentView.js:452 > + let selection = window.getSelection(); I guess this is better than nothing. We need to do a better job overriding this in more ContentView subclasses. > Source/WebInspectorUI/UserInterface/Views/FindBanner.js:-227 > - { I didn't realize we were doing this, its kinda gross. If we really were going to do this in a transparent way that each content view handles it by itself, then we'd need some notion of a first responder and responder chain. I think the solution in this patch is fine, though. 1346036 5 320046 joepeck 2017-09-06 12:05:03 -0700 Created attachment 320046 [PATCH] For Landing 1346050 6 320046 commit-queue 2017-09-06 12:46:42 -0700 Comment on attachment 320046 [PATCH] For Landing Clearing flags on attachment: 320046 Committed r221691: <http://trac.webkit.org/changeset/221691> 1353507 7 webkit-bug-importer 2017-09-27 12:35:32 -0700 <rdar://problem/34693554> 319963 2017-09-05 17:45:56 -0700 2017-09-06 09:05:38 -0700 [PATCH] Proposed Fix keyboard-1.patch text/plain 13396 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE5NzhlZGZkMDU2Li45ZGY4YjhiZGU2MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTQgQEAKKzIwMTctMDktMDUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiDijJhFIGFuZCDijJhHIGRvIG5vdCB3b3JrIGluIG1haW4gY29udGVudCBhcmVhIHdoZW4gcXVp Y2sgY29uc29sZSBkcmF3ZXIgaXMgb3BlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc2NDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSB0aGUg4oyYRSBhbmQg4oyYRyBrZXlib2FyZCBzaG9ydGN1 dHMgYmVoYXZlIG1vcmUgbGlrZSB0aGUgZ2xvYmFsIOKMmEsgY2xlYXIgc2hvcnRjdXQuCisgICAg ICAgIEluc3RlYWQgb2Yga2VlcGluZyB0aGVtIGluc2lkZSBvZiBGaW5kQmFubmVyLCBhbmQgZW5h YmxpbmcvZGlzYWJsaW5nIHRoZW0gd2hlbiB0aGV5CisgICAgICAgIG1ha2Ugc2Vuc2UgdG8gYXBw bHksIHdlIG1ha2UgYSBzaW5nbGUgZ2xvYmFsIGluc3RhbmNlIG9mIHRoZSBrZXlib2FyZCBzaG9y dGN1dCBhbmQKKyAgICAgICAgYXBwbHkgaXQgdG8gd2hhdGV2ZXIgY29udGVudCB2aWV3IC8gY29u dGVudCBicm93c2VyIGlzIGFjdGl2ZS4gVGhpcyBhdm9pZHMgY29uZmxpY3RzCisgICAgICAgIGlu IHNpdHVhdGlvbnMgd2hlcmUgdGhlcmUgYXJlIHR3byBDb250ZW50Vmlld3MgdGhhdCBhcmUgdmlz aWJsZSBhbmQgZWFjaCBjYW4gaGFuZGxlCisgICAgICAgIHRoZSBrZXlib2FyZCBzaG9ydGN1dC4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV0kuY29u dGVudExvYWRlZCk6CisgICAgICAgIE5ldyBrZXlib2FyZCBzaG9ydGN1dHMuCisKKyAgICAgICAg KFdJLl9wb3B1bGF0ZUZpbmQpOgorICAgICAgICAoV0kuX2ZpbmROZXh0KToKKyAgICAgICAgKFdJ Ll9maW5kUHJldmlvdXMpOgorICAgICAgICBQZXJmb3JtIHRoZSBzaG9ydGN1dCBvbiB0aGUgYWN0 aXZlIGNvbnRlbnQgdmlldyBvciBjb250ZW50IGJyb3dzZXIuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzOgorICAgICAgICAoV0kuQ29udGVudEJyb3dz ZXIucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgKFdJLkNvbnRlbnRCcm93c2VyLnByb3RvdHlw ZS5oaWRkZW4pOgorICAgICAgICAoV0kuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLmhhbmRsZVBv cHVsYXRlRmluZFNob3J0Y3V0KToKKyAgICAgICAgKFdJLkNvbnRlbnRCcm93c2VyLnByb3RvdHlw ZS5oYW5kbGVGaW5kTmV4dFNob3J0Y3V0KToKKyAgICAgICAgKFdJLkNvbnRlbnRCcm93c2VyLnBy b3RvdHlwZS5oYW5kbGVGaW5kUHJldmlvdXNTaG9ydGN1dCk6CisgICAgICAgIChXSS5Db250ZW50 QnJvd3Nlci5wcm90b3R5cGUuZmluZEJhbm5lclNlYXJjaFF1ZXJ5Rm9yU2VsZWN0aW9uKTogRGVs ZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzOgor ICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLmhhbmRsZVBvcHVsYXRlRmluZFNo b3J0Y3V0KToKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5oYW5kbGVGaW5k TmV4dFNob3J0Y3V0KToKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5oYW5k bGVGaW5kUHJldmlvdXNTaG9ydGN1dCk6CisgICAgICAgIENvbnRlbnRCcm93c2VyIGFuZCBMb2dD b250ZW50VmlldyAodGhlIG9ubHkgY29udGVudCB2aWV3IHdpdGggYSBjdXN0b20gZmluZCBiYW5u ZXIpCisgICAgICAgIG5vdyBlYWNoIGhhbmRsZSB0aGUgZ2xvYmFsIGtleWJvYXJkIHNob3J0Y3V0 IGhhbmRsZXJzIHRvIGRvIHRoZSByaWdodCB0aGluZyBmb3IKKyAgICAgICAgdGhlaXIgcmVzcGVj dGl2ZSBjYXNlcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5q czoKKyAgICAgICAgKFdJLkZpbmRCYW5uZXIucHJvdG90eXBlLmVuYWJsZUtleWJvYXJkU2hvcnRj dXRzKTogRGVsZXRlZC4KKyAgICAgICAgKFdJLkZpbmRCYW5uZXIucHJvdG90eXBlLmRpc2FibGVL ZXlib2FyZFNob3J0Y3V0cyk6IERlbGV0ZWQuCisgICAgICAgIChXSS5GaW5kQmFubmVyLnByb3Rv dHlwZS5fcG9wdWxhdGVTZWFyY2hRdWVyeUZyb21TZWxlY3Rpb24pOiBEZWxldGVkLgorICAgICAg ICBNb3ZlIGtleWJvYXJkIHNob3J0Y3V0IGhhbmRsaW5nIHVwIHRvIE1haW4uanMgYXMgYSBnbG9i YWwgaGFuZGxlci4KKyAgICAgICAgU2luY2UgdGhlIG9ubHkgY2xpZW50IG9mIEZpbmRCYW5uZXIg dGhhdCB1c2VkIHRoZSBrZXlib2FyZCBzaG9ydGN1dHMKKyAgICAgICAgYXJlIENvbnRlbnRCcm93 c2VycyAKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXSS5Db250ZW50Vmlldy5wcm90b3R5cGUuc2VhcmNoUXVlcnlXaXRoU2VsZWN0aW9u KToKKyAgICAgICAgRGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBzaG91bGQgZ3JhYiB0aGUgc2VsZWN0 ZWQgdGV4dCBmcm9tIHRoZSBzZWxlY3Rpb24uCisgICAgICAgIFByZXZpb3VzbHkgc2hvcnRjdXQg c2VsZWN0aW9ucyBvbmx5IHdvcmtlZCBmb3Igc2VsZWN0aW9ucyBpbiB0ZXh0IGVkaXRvcnMuCisK IDIwMTctMDktMDQgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogU3R5bGVzIFJlZGVzaWduOiBob29rIHVwIHJlYWwgZGF0YSB0 byBzcHJlYWRzaGVldCBzdHlsZSBlZGl0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCA5ODFiYzBlNzZhNS4uZmM5YWE5NmRkNzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMKQEAgLTI4OCw2ICsyODgsMTIgQEAgV0kuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKIAog ICAgIHRoaXMuY2xlYXJLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJvYXJkU2hvcnRjdXQo V0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiSyIsIHRoaXMu X2NsZWFyLmJpbmQodGhpcykpOwogCisgICAgLy8gRklYTUU6IEZpbmRCYW5uZXIgc2VhcmNoIHF1 ZXJpZXMgc2hvdWxkIGJlIHNoYXJlZCBhbW9uZyBzZWFyY2ggZmllbGRzIGFuZCBiZSBjb21tb24g d2l0aCB0aGUgc3lzdGVtLgorICAgIHRoaXMucG9wdWxhdGVGaW5kS2V5Ym9hcmRTaG9ydGN1dCA9 IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29t bWFuZE9yQ29udHJvbCwgIkUiLCB0aGlzLl9wb3B1bGF0ZUZpbmQuYmluZCh0aGlzKSk7CisgICAg dGhpcy5wb3B1bGF0ZUZpbmRLZXlib2FyZFNob3J0Y3V0LmltcGxpY2l0bHlQcmV2ZW50c0RlZmF1 bHQgPSBmYWxzZTsKKyAgICB0aGlzLmZpbmROZXh0S2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXSS5L ZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29u dHJvbCwgIkciLCB0aGlzLl9maW5kTmV4dC5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLmZpbmRQcmV2 aW91c0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChXSS5LZXlib2Fy ZFNob3J0Y3V0Lk1vZGlmaWVyLlNoaWZ0IHwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5D b21tYW5kT3JDb250cm9sLCAiRyIsIHRoaXMuX2ZpbmRQcmV2aW91cy5iaW5kKHRoaXMpKTsKKwog ICAgIHRoaXMucXVpY2tDb25zb2xlID0gbmV3IFdJLlF1aWNrQ29uc29sZShkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgicXVpY2stY29uc29sZSIpKTsKIAogICAgIHRoaXMuX2NvbnNvbGVSZXByZXNl bnRlZE9iamVjdCA9IG5ldyBXSS5Mb2dPYmplY3Q7CkBAIC0xOTg0LDYgKzE5OTAsNTEgQEAgV0ku X2NsZWFyID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgY29udGVudFZpZXcuaGFuZGxlQ2xlYXJTaG9y dGN1dChldmVudCk7CiB9OwogCitXSS5fcG9wdWxhdGVGaW5kID0gZnVuY3Rpb24oZXZlbnQpCit7 CisgICAgbGV0IGZvY3VzZWRDb250ZW50VmlldyA9IHRoaXMuX2ZvY3VzZWRDb250ZW50Vmlldygp OworICAgIGlmIChmb2N1c2VkQ29udGVudFZpZXcuc3VwcG9ydHNDdXN0b21GaW5kQmFubmVyKSB7 CisgICAgICAgIGZvY3VzZWRDb250ZW50Vmlldy5oYW5kbGVQb3B1bGF0ZUZpbmRTaG9ydGN1dCgp OworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgbGV0IGNvbnRlbnRCcm93c2VyID0gdGhp cy5fZm9jdXNlZE9yVmlzaWJsZUNvbnRlbnRCcm93c2VyKCk7CisgICAgaWYgKCFjb250ZW50QnJv d3NlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgY29udGVudEJyb3dzZXIuaGFuZGxlUG9wdWxh dGVGaW5kU2hvcnRjdXQoKTsKK30KKworV0kuX2ZpbmROZXh0ID0gZnVuY3Rpb24oZXZlbnQpCit7 CisgICAgbGV0IGZvY3VzZWRDb250ZW50VmlldyA9IHRoaXMuX2ZvY3VzZWRDb250ZW50Vmlldygp OworICAgIGlmIChmb2N1c2VkQ29udGVudFZpZXcuc3VwcG9ydHNDdXN0b21GaW5kQmFubmVyKSB7 CisgICAgICAgIGZvY3VzZWRDb250ZW50Vmlldy5oYW5kbGVGaW5kTmV4dFNob3J0Y3V0KCk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBsZXQgY29udGVudEJyb3dzZXIgPSB0aGlzLl9m b2N1c2VkT3JWaXNpYmxlQ29udGVudEJyb3dzZXIoKTsKKyAgICBpZiAoIWNvbnRlbnRCcm93c2Vy KQorICAgICAgICByZXR1cm47CisKKyAgICBjb250ZW50QnJvd3Nlci5oYW5kbGVGaW5kTmV4dFNo b3J0Y3V0KCk7Cit9CisKK1dJLl9maW5kUHJldmlvdXMgPSBmdW5jdGlvbihldmVudCkKK3sKKyAg ICBsZXQgZm9jdXNlZENvbnRlbnRWaWV3ID0gdGhpcy5fZm9jdXNlZENvbnRlbnRWaWV3KCk7Cisg ICAgaWYgKGZvY3VzZWRDb250ZW50Vmlldy5zdXBwb3J0c0N1c3RvbUZpbmRCYW5uZXIpIHsKKyAg ICAgICAgZm9jdXNlZENvbnRlbnRWaWV3LmhhbmRsZUZpbmRQcmV2aW91c1Nob3J0Y3V0KCk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBsZXQgY29udGVudEJyb3dzZXIgPSB0aGlzLl9m b2N1c2VkT3JWaXNpYmxlQ29udGVudEJyb3dzZXIoKTsKKyAgICBpZiAoIWNvbnRlbnRCcm93c2Vy KQorICAgICAgICByZXR1cm47CisKKyAgICBjb250ZW50QnJvd3Nlci5oYW5kbGVGaW5kUHJldmlv dXNTaG9ydGN1dCgpOworfQorCiBXSS5fY29weSA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHZh ciBzZWxlY3Rpb24gPSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpz CmluZGV4IGEyYWI4NWJhYWJhLi5hYmNhNWEyNGNlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMK QEAgLTIyNyw5ICsyMjcsNDggQEAgV0kuQ29udGVudEJyb3dzZXIgPSBjbGFzcyBDb250ZW50QnJv d3NlciBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5zaG93KCk7CiAg ICAgfQogCisgICAgc2hvd24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fY29udGVudFZpZXdDb250 YWluZXIuc2hvd24oKTsKKyAgICB9CisKKyAgICBoaWRkZW4oKQorICAgIHsKKyAgICAgICAgdGhp cy5fY29udGVudFZpZXdDb250YWluZXIuaGlkZGVuKCk7CisgICAgfQorCisgICAgLy8gR2xvYmFs IENvbnRlbnRCcm93c2VyIEtleWJvYXJkU2hvcnRjdXQgaGFuZGxlcnMKKworICAgIGhhbmRsZVBv cHVsYXRlRmluZFNob3J0Y3V0KCkKKyAgICB7CisgICAgICAgIGxldCBjdXJyZW50Q29udGVudFZp ZXcgPSB0aGlzLmN1cnJlbnRDb250ZW50VmlldzsKKyAgICAgICAgaWYgKCFjdXJyZW50Q29udGVu dFZpZXcgfHwgIWN1cnJlbnRDb250ZW50Vmlldy5zdXBwb3J0c1NlYXJjaCkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICBsZXQgc2VhcmNoUXVlcnkgPSBjdXJyZW50Q29udGVudFZpZXcu c2VhcmNoUXVlcnlXaXRoU2VsZWN0aW9uKCk7CisgICAgICAgIGlmICghc2VhcmNoUXVlcnkpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVy eSA9IHNlYXJjaFF1ZXJ5OworCisgICAgICAgIGN1cnJlbnRDb250ZW50Vmlldy5wZXJmb3JtU2Vh cmNoKHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkpOworICAgIH0KKworICAgIGhhbmRsZUZp bmROZXh0U2hvcnRjdXQoKQorICAgIHsKKyAgICAgICAgdGhpcy5maW5kQmFubmVyUmV2ZWFsTmV4 dFJlc3VsdCh0aGlzLl9maW5kQmFubmVyKTsKKyAgICB9CisKKyAgICBoYW5kbGVGaW5kUHJldmlv dXNTaG9ydGN1dCgpCisgICAgeworICAgICAgICB0aGlzLmZpbmRCYW5uZXJSZXZlYWxQcmV2aW91 c1Jlc3VsdCh0aGlzLl9maW5kQmFubmVyKTsKKyAgICB9CisKKyAgICAvLyBGaW5kQmFubmVyIGRl bGVnYXRlCisKICAgICBmaW5kQmFubmVyUGVyZm9ybVNlYXJjaChmaW5kQmFubmVyLCBxdWVyeSkK ICAgICB7Ci0gICAgICAgIHZhciBjdXJyZW50Q29udGVudFZpZXcgPSB0aGlzLmN1cnJlbnRDb250 ZW50VmlldzsKKyAgICAgICAgbGV0IGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3VycmVudENv bnRlbnRWaWV3OwogICAgICAgICBpZiAoIWN1cnJlbnRDb250ZW50VmlldyB8fCAhY3VycmVudENv bnRlbnRWaWV3LnN1cHBvcnRzU2VhcmNoKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0yMzgs MjUgKzI3NywxNiBAQCBXSS5Db250ZW50QnJvd3NlciA9IGNsYXNzIENvbnRlbnRCcm93c2VyIGV4 dGVuZHMgV0kuVmlldwogCiAgICAgZmluZEJhbm5lclNlYXJjaENsZWFyZWQoZmluZEJhbm5lcikK ICAgICB7Ci0gICAgICAgIHZhciBjdXJyZW50Q29udGVudFZpZXcgPSB0aGlzLmN1cnJlbnRDb250 ZW50VmlldzsKKyAgICAgICAgbGV0IGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3VycmVudENv bnRlbnRWaWV3OwogICAgICAgICBpZiAoIWN1cnJlbnRDb250ZW50VmlldyB8fCAhY3VycmVudENv bnRlbnRWaWV3LnN1cHBvcnRzU2VhcmNoKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAg IGN1cnJlbnRDb250ZW50Vmlldy5zZWFyY2hDbGVhcmVkKCk7CiAgICAgfQogCi0gICAgZmluZEJh bm5lclNlYXJjaFF1ZXJ5Rm9yU2VsZWN0aW9uKGZpbmRCYW5uZXIpCi0gICAgewotICAgICAgICB2 YXIgY3VycmVudENvbnRlbnRWaWV3ID0gdGhpcy5jdXJyZW50Q29udGVudFZpZXc7Ci0gICAgICAg IGlmICghY3VycmVudENvbnRlbnRWaWV3IHx8ICFjdXJyZW50Q29udGVudFZpZXcuc3VwcG9ydHNT ZWFyY2gpCi0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLQotICAgICAgICByZXR1cm4gY3VycmVu dENvbnRlbnRWaWV3LnNlYXJjaFF1ZXJ5V2l0aFNlbGVjdGlvbigpOwotICAgIH0KLQogICAgIGZp bmRCYW5uZXJSZXZlYWxQcmV2aW91c1Jlc3VsdChmaW5kQmFubmVyKQogICAgIHsKLSAgICAgICAg dmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3VycmVudENvbnRlbnRWaWV3OworICAgICAg ICBsZXQgY3VycmVudENvbnRlbnRWaWV3ID0gdGhpcy5jdXJyZW50Q29udGVudFZpZXc7CiAgICAg ICAgIGlmICghY3VycmVudENvbnRlbnRWaWV3IHx8ICFjdXJyZW50Q29udGVudFZpZXcuc3VwcG9y dHNTZWFyY2gpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTI2NSwyOSArMjk1LDEzIEBAIFdJ LkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5WaWV3CiAK ICAgICBmaW5kQmFubmVyUmV2ZWFsTmV4dFJlc3VsdChmaW5kQmFubmVyKQogICAgIHsKLSAgICAg ICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3VycmVudENvbnRlbnRWaWV3OworICAg ICAgICBsZXQgY3VycmVudENvbnRlbnRWaWV3ID0gdGhpcy5jdXJyZW50Q29udGVudFZpZXc7CiAg ICAgICAgIGlmICghY3VycmVudENvbnRlbnRWaWV3IHx8ICFjdXJyZW50Q29udGVudFZpZXcuc3Vw cG9ydHNTZWFyY2gpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgY3VycmVudENvbnRl bnRWaWV3LnJldmVhbE5leHRTZWFyY2hSZXN1bHQoIWZpbmRCYW5uZXIuc2hvd2luZyk7CiAgICAg fQogCi0gICAgc2hvd24oKQotICAgIHsKLSAgICAgICAgdGhpcy5fY29udGVudFZpZXdDb250YWlu ZXIuc2hvd24oKTsKLQotICAgICAgICBpZiAodGhpcy5fZmluZEJhbm5lcikKLSAgICAgICAgICAg IHRoaXMuX2ZpbmRCYW5uZXIuZW5hYmxlS2V5Ym9hcmRTaG9ydGN1dHMoKTsKLSAgICB9Ci0KLSAg ICBoaWRkZW4oKQotICAgIHsKLSAgICAgICAgdGhpcy5fY29udGVudFZpZXdDb250YWluZXIuaGlk ZGVuKCk7Ci0KLSAgICAgICAgaWYgKHRoaXMuX2ZpbmRCYW5uZXIpCi0gICAgICAgICAgICB0aGlz Ll9maW5kQmFubmVyLmRpc2FibGVLZXlib2FyZFNob3J0Y3V0cygpOwotICAgIH0KLQogICAgIC8v IFByaXZhdGUKIAogICAgIF9maW5kQmFubmVyRGlkU2hvdyhldmVudCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMK aW5kZXggNDRlYjQ0NWY2NzguLjIyNDYyMTMwZWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5qcwpAQCAtNDQ5 LDggKzQ0OSwxMSBAQCBXSS5Db250ZW50VmlldyA9IGNsYXNzIENvbnRlbnRWaWV3IGV4dGVuZHMg V0kuVmlldwogCiAgICAgc2VhcmNoUXVlcnlXaXRoU2VsZWN0aW9uKCkKICAgICB7Ci0gICAgICAg IC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCi0gICAgICAgIHJldHVybiBudWxsOworICAg ICAgICBsZXQgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgICAgICBpZiAo c2VsZWN0aW9uLmlzQ29sbGFwc2VkKQorICAgICAgICAgICAgcmV0dXJuIG51bGw7CisKKyAgICAg ICAgcmV0dXJuIHNlbGVjdGlvbi50b1N0cmluZygpLnJlbW92ZVdvcmRCcmVha0NoYXJhY3RlcnMo KTsKICAgICB9CiAKICAgICByZXZlYWxQcmV2aW91c1NlYXJjaFJlc3VsdChjaGFuZ2VGb2N1cykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bmRCYW5uZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G aW5kQmFubmVyLmpzCmluZGV4IGIyN2VhY2I4YTRkLi5mMTNhYjc2NDliMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVy LmpzCkBAIC04NCwxMyArODQsNiBAQCBXSS5GaW5kQmFubmVyID0gY2xhc3MgRmluZEJhbm5lciBl eHRlbmRzIFdJLk5hdmlnYXRpb25JdGVtCiAgICAgICAgIHRoaXMuX3NlYXJjaEJhY2t3YXJkcyA9 IGZhbHNlOwogICAgICAgICB0aGlzLl9zZWFyY2hLZXlQcmVzc2VkID0gZmFsc2U7CiAgICAgICAg IHRoaXMuX3ByZXZpb3VzU2VhcmNoVmFsdWUgPSAiIjsKLQotICAgICAgICB0aGlzLl9wb3B1bGF0 ZUZpbmRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJvYXJkU2hvcnRjdXQoV0kuS2V5Ym9h cmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiRSIsIHRoaXMuX3BvcHVsYXRl U2VhcmNoUXVlcnlGcm9tU2VsZWN0aW9uLmJpbmQodGhpcykpOwotICAgICAgICB0aGlzLl9wb3B1 bGF0ZUZpbmRLZXlib2FyZFNob3J0Y3V0LmltcGxpY2l0bHlQcmV2ZW50c0RlZmF1bHQgPSBmYWxz ZTsKLSAgICAgICAgdGhpcy5fZmluZE5leHRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJv YXJkU2hvcnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9s LCAiRyIsIHRoaXMuX25leHRSZXN1bHRCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwotICAgICAg ICB0aGlzLl9maW5kUHJldmlvdXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJvYXJkU2hv cnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCB8IFdJLktleWJvYXJkU2hv cnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIkciLCB0aGlzLl9wcmV2aW91c1Jlc3Vs dEJ1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7Ci0KLSAgICAgICAgdGhpcy5kaXNhYmxlS2V5Ym9h cmRTaG9ydGN1dHMoKTsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTIyMywyMCArMjE2LDYg QEAgV0kuRmluZEJhbm5lciA9IGNsYXNzIEZpbmRCYW5uZXIgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9u SXRlbQogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5GaW5kQmFubmVy LkV2ZW50LkRpZEhpZGUpOwogICAgIH0KIAotICAgIGVuYWJsZUtleWJvYXJkU2hvcnRjdXRzKCkK LSAgICB7Ci0gICAgICAgIHRoaXMuX3BvcHVsYXRlRmluZEtleWJvYXJkU2hvcnRjdXQuZGlzYWJs ZWQgPSBmYWxzZTsKLSAgICAgICAgdGhpcy5fZmluZE5leHRLZXlib2FyZFNob3J0Y3V0LmRpc2Fi bGVkID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX2ZpbmRQcmV2aW91c0tleWJvYXJkU2hvcnRjdXQu ZGlzYWJsZWQgPSBmYWxzZTsKLSAgICB9Ci0KLSAgICBkaXNhYmxlS2V5Ym9hcmRTaG9ydGN1dHMo KQotICAgIHsKLSAgICAgICAgdGhpcy5fcG9wdWxhdGVGaW5kS2V5Ym9hcmRTaG9ydGN1dC5kaXNh YmxlZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2ZpbmROZXh0S2V5Ym9hcmRTaG9ydGN1dC5kaXNh YmxlZCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2ZpbmRQcmV2aW91c0tleWJvYXJkU2hvcnRjdXQu ZGlzYWJsZWQgPSB0cnVlOwotICAgIH0KLQogICAgIC8vIFByaXZhdGUKIAogICAgIF9pbnB1dEZp ZWxkS2V5RG93bihldmVudCkKQEAgLTI3OSwxOSArMjU4LDYgQEAgV0kuRmluZEJhbm5lciA9IGNs YXNzIEZpbmRCYW5uZXIgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uSXRlbQogICAgICAgICB0aGlzLl9w cmV2aW91c1NlYXJjaFZhbHVlID0gdGhpcy5zZWFyY2hRdWVyeTsKICAgICB9CiAKLSAgICBfcG9w dWxhdGVTZWFyY2hRdWVyeUZyb21TZWxlY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICBpZiAo dGhpcy5fZGVsZWdhdGUgJiYgdHlwZW9mIHRoaXMuX2RlbGVnYXRlLmZpbmRCYW5uZXJTZWFyY2hR dWVyeUZvclNlbGVjdGlvbiA9PT0gImZ1bmN0aW9uIikgewotICAgICAgICAgICAgdmFyIHF1ZXJ5 ID0gdGhpcy5fZGVsZWdhdGUuZmluZEJhbm5lclNlYXJjaFF1ZXJ5Rm9yU2VsZWN0aW9uKHRoaXMp OwotICAgICAgICAgICAgaWYgKHF1ZXJ5KSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5zZWFyY2hR dWVyeSA9IHF1ZXJ5OwotCi0gICAgICAgICAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5 cGVvZiB0aGlzLl9kZWxlZ2F0ZS5maW5kQmFubmVyUGVyZm9ybVNlYXJjaCA9PT0gImZ1bmN0aW9u IikKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUuZmluZEJhbm5lclBlcmZvcm1T ZWFyY2godGhpcywgdGhpcy5zZWFyY2hRdWVyeSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0K LSAgICB9Ci0KICAgICBfcHJldmlvdXNSZXN1bHRCdXR0b25DbGlja2VkKGV2ZW50KQogICAgIHsK ICAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS5maW5k QmFubmVyUmV2ZWFsUHJldmlvdXNSZXN1bHQgPT09ICJmdW5jdGlvbiIpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzCmluZGV4IDEyYjQxYzJiZWI0Li5jNTFhYjBkMTVjZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZp ZXcuanMKQEAgLTIzMiw2ICsyMzIsMjcgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dD b250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2xvZ1ZpZXdD b250cm9sbGVyLnJlcXVlc3RDbGVhck1lc3NhZ2VzKCk7CiAgICAgfQogCisgICAgaGFuZGxlUG9w dWxhdGVGaW5kU2hvcnRjdXQoKQorICAgIHsKKyAgICAgICAgbGV0IHNlYXJjaFF1ZXJ5ID0gdGhp cy5zZWFyY2hRdWVyeVdpdGhTZWxlY3Rpb24oKTsKKyAgICAgICAgaWYgKCFzZWFyY2hRdWVyeSkK KyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1 ZXJ5ID0gc2VhcmNoUXVlcnk7CisKKyAgICAgICAgdGhpcy5wZXJmb3JtU2VhcmNoKHRoaXMuX2Zp bmRCYW5uZXIuc2VhcmNoUXVlcnkpOworICAgIH0KKworICAgIGhhbmRsZUZpbmROZXh0U2hvcnRj dXQoKQorICAgIHsKKyAgICAgICAgdGhpcy5maW5kQmFubmVyUmV2ZWFsTmV4dFJlc3VsdCh0aGlz Ll9maW5kQmFubmVyKTsKKyAgICB9CisKKyAgICBoYW5kbGVGaW5kUHJldmlvdXNTaG9ydGN1dCgp CisgICAgeworICAgICAgICB0aGlzLmZpbmRCYW5uZXJSZXZlYWxQcmV2aW91c1Jlc3VsdCh0aGlz Ll9maW5kQmFubmVyKTsKKyAgICB9CisKICAgICBmaW5kQmFubmVyUmV2ZWFsUHJldmlvdXNSZXN1 bHQoKQogICAgIHsKICAgICAgICAgdGhpcy5oaWdobGlnaHRQcmV2aW91c1NlYXJjaE1hdGNoKCk7 Cg== 320046 2017-09-06 12:05:03 -0700 2017-09-06 12:46:42 -0700 [PATCH] For Landing for-landing-1.patch text/plain 13301 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE5NzhlZGZkMDU2Li40YmU5MTFjOTZjZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTIgQEAKKzIwMTctMDktMDYgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiDijJhFIGFuZCDijJhHIGRvIG5vdCB3b3JrIGluIG1haW4gY29udGVudCBhcmVhIHdoZW4gcXVp Y2sgY29uc29sZSBkcmF3ZXIgaXMgb3BlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc2NDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJpYW4gQnVy Zy4KKworICAgICAgICBNYWtlIHRoZSDijJhFIGFuZCDijJhHIGtleWJvYXJkIHNob3J0Y3V0cyBi ZWhhdmUgbW9yZSBsaWtlIHRoZSBnbG9iYWwg4oyYSyBjbGVhciBzaG9ydGN1dC4KKyAgICAgICAg SW5zdGVhZCBvZiBrZWVwaW5nIHRoZW0gaW5zaWRlIG9mIEZpbmRCYW5uZXIsIGFuZCBlbmFibGlu Zy9kaXNhYmxpbmcgdGhlbSB3aGVuIHRoZXkKKyAgICAgICAgbWFrZSBzZW5zZSB0byBhcHBseSwg d2UgbWFrZSBhIHNpbmdsZSBnbG9iYWwgaW5zdGFuY2Ugb2YgdGhlIGtleWJvYXJkIHNob3J0Y3V0 IGFuZAorICAgICAgICBhcHBseSBpdCB0byB3aGF0ZXZlciBjb250ZW50IHZpZXcgLyBjb250ZW50 IGJyb3dzZXIgaXMgYWN0aXZlLiBUaGlzIGF2b2lkcyBjb25mbGljdHMKKyAgICAgICAgaW4gc2l0 dWF0aW9ucyB3aGVyZSB0aGVyZSBhcmUgdHdvIENvbnRlbnRWaWV3cyB0aGF0IGFyZSB2aXNpYmxl IGFuZCBlYWNoIGNhbiBoYW5kbGUKKyAgICAgICAgdGhlIGtleWJvYXJkIHNob3J0Y3V0LgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5jb250ZW50 TG9hZGVkKToKKyAgICAgICAgTmV3IGtleWJvYXJkIHNob3J0Y3V0cy4KKworICAgICAgICAoV0ku X3BvcHVsYXRlRmluZCk6CisgICAgICAgIChXSS5fZmluZE5leHQpOgorICAgICAgICAoV0kuX2Zp bmRQcmV2aW91cyk6CisgICAgICAgIFBlcmZvcm0gdGhlIHNob3J0Y3V0IG9uIHRoZSBhY3RpdmUg Y29udGVudCB2aWV3IG9yIGNvbnRlbnQgYnJvd3Nlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChXSS5Db250ZW50QnJvd3Nlci5w cm90b3R5cGUuc2hvd24pOgorICAgICAgICAoV0kuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLmhp ZGRlbik6CisgICAgICAgIChXSS5Db250ZW50QnJvd3Nlci5wcm90b3R5cGUuaGFuZGxlUG9wdWxh dGVGaW5kU2hvcnRjdXQpOgorICAgICAgICAoV0kuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLmhh bmRsZUZpbmROZXh0U2hvcnRjdXQpOgorICAgICAgICAoV0kuQ29udGVudEJyb3dzZXIucHJvdG90 eXBlLmhhbmRsZUZpbmRQcmV2aW91c1Nob3J0Y3V0KToKKyAgICAgICAgKFdJLkNvbnRlbnRCcm93 c2VyLnByb3RvdHlwZS5maW5kQmFubmVyU2VhcmNoUXVlcnlGb3JTZWxlY3Rpb24pOiBEZWxldGVk LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXSS5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuaGFuZGxlUG9wdWxhdGVGaW5kU2hvcnRj dXQpOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLmhhbmRsZUZpbmROZXh0 U2hvcnRjdXQpOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLmhhbmRsZUZp bmRQcmV2aW91c1Nob3J0Y3V0KToKKyAgICAgICAgQ29udGVudEJyb3dzZXIgYW5kIExvZ0NvbnRl bnRWaWV3ICh0aGUgb25seSBjb250ZW50IHZpZXcgd2l0aCBhIGN1c3RvbSBmaW5kIGJhbm5lcikK KyAgICAgICAgbm93IGVhY2ggaGFuZGxlIHRoZSBnbG9iYWwga2V5Ym9hcmQgc2hvcnRjdXQgaGFu ZGxlcnMgdG8gZG8gdGhlIHJpZ2h0IHRoaW5nIGZvcgorICAgICAgICB0aGVpciByZXNwZWN0aXZl IGNhc2VzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzOgor ICAgICAgICAoV0kuRmluZEJhbm5lci5wcm90b3R5cGUuZW5hYmxlS2V5Ym9hcmRTaG9ydGN1dHMp OiBEZWxldGVkLgorICAgICAgICAoV0kuRmluZEJhbm5lci5wcm90b3R5cGUuZGlzYWJsZUtleWJv YXJkU2hvcnRjdXRzKTogRGVsZXRlZC4KKyAgICAgICAgKFdJLkZpbmRCYW5uZXIucHJvdG90eXBl Ll9wb3B1bGF0ZVNlYXJjaFF1ZXJ5RnJvbVNlbGVjdGlvbik6IERlbGV0ZWQuCisgICAgICAgIE1v dmUga2V5Ym9hcmQgc2hvcnRjdXQgaGFuZGxpbmcgdXAgdG8gTWFpbi5qcyB0byBiZSBnbG9iYWwu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV0kuQ29udGVudFZpZXcucHJvdG90eXBlLnNlYXJjaFF1ZXJ5V2l0aFNlbGVjdGlvbik6Cisg ICAgICAgIERlZmF1bHQgaW1wbGVtZW50YXRpb24gc2hvdWxkIGdyYWIgdGhlIHNlbGVjdGVkIHRl eHQgZnJvbSB0aGUgc2VsZWN0aW9uLgorICAgICAgICBQcmV2aW91c2x5IHNob3J0Y3V0IHNlbGVj dGlvbnMgb25seSB3b3JrZWQgZm9yIHNlbGVjdGlvbnMgaW4gdGV4dCBlZGl0b3JzLgorCiAyMDE3 LTA5LTA0ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IFN0eWxlcyBSZWRlc2lnbjogaG9vayB1cCByZWFsIGRhdGEgdG8gc3By ZWFkc2hlZXQgc3R5bGUgZWRpdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggOTgxYmMwZTc2YTUuLjQ4NTk4NWYxMzk4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBA IC0yODgsNiArMjg4LDEyIEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAKICAgICB0 aGlzLmNsZWFyS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktl eWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIksiLCB0aGlzLl9jbGVh ci5iaW5kKHRoaXMpKTsKIAorICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTUx MzEwPiBXZWIgSW5zcGVjdG9yOiBDb21tYW5kLUUgc2hvdWxkIHByb3BhZ2F0ZSB0byBvdGhlciBz ZWFyY2ggZmllbGRzIChpbmNsdWRpbmcgdGhlIHN5c3RlbSkKKyAgICB0aGlzLnBvcHVsYXRlRmlu ZEtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChXSS5LZXlib2FyZFNo b3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJFIiwgdGhpcy5fcG9wdWxhdGVGaW5k LmJpbmQodGhpcykpOworICAgIHRoaXMucG9wdWxhdGVGaW5kS2V5Ym9hcmRTaG9ydGN1dC5pbXBs aWNpdGx5UHJldmVudHNEZWZhdWx0ID0gZmFsc2U7CisgICAgdGhpcy5maW5kTmV4dEtleWJvYXJk U2hvcnRjdXQgPSBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChXSS5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJHIiwgdGhpcy5fZmluZE5leHQuYmluZCh0aGlzKSk7 CisgICAgdGhpcy5maW5kUHJldmlvdXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJvYXJk U2hvcnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCB8IFdJLktleWJvYXJk U2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIkciLCB0aGlzLl9maW5kUHJldmlv dXMuYmluZCh0aGlzKSk7CisKICAgICB0aGlzLnF1aWNrQ29uc29sZSA9IG5ldyBXSS5RdWlja0Nv bnNvbGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInF1aWNrLWNvbnNvbGUiKSk7CiAKICAgICB0 aGlzLl9jb25zb2xlUmVwcmVzZW50ZWRPYmplY3QgPSBuZXcgV0kuTG9nT2JqZWN0OwpAQCAtMTk4 NCw2ICsxOTkwLDUxIEBAIFdJLl9jbGVhciA9IGZ1bmN0aW9uKGV2ZW50KQogICAgIGNvbnRlbnRW aWV3LmhhbmRsZUNsZWFyU2hvcnRjdXQoZXZlbnQpOwogfTsKIAorV0kuX3BvcHVsYXRlRmluZCA9 IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIGxldCBmb2N1c2VkQ29udGVudFZpZXcgPSB0aGlzLl9m b2N1c2VkQ29udGVudFZpZXcoKTsKKyAgICBpZiAoZm9jdXNlZENvbnRlbnRWaWV3LnN1cHBvcnRz Q3VzdG9tRmluZEJhbm5lcikgeworICAgICAgICBmb2N1c2VkQ29udGVudFZpZXcuaGFuZGxlUG9w dWxhdGVGaW5kU2hvcnRjdXQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGxldCBj b250ZW50QnJvd3NlciA9IHRoaXMuX2ZvY3VzZWRPclZpc2libGVDb250ZW50QnJvd3NlcigpOwor ICAgIGlmICghY29udGVudEJyb3dzZXIpCisgICAgICAgIHJldHVybjsKKworICAgIGNvbnRlbnRC cm93c2VyLmhhbmRsZVBvcHVsYXRlRmluZFNob3J0Y3V0KCk7Cit9CisKK1dJLl9maW5kTmV4dCA9 IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIGxldCBmb2N1c2VkQ29udGVudFZpZXcgPSB0aGlzLl9m b2N1c2VkQ29udGVudFZpZXcoKTsKKyAgICBpZiAoZm9jdXNlZENvbnRlbnRWaWV3LnN1cHBvcnRz Q3VzdG9tRmluZEJhbm5lcikgeworICAgICAgICBmb2N1c2VkQ29udGVudFZpZXcuaGFuZGxlRmlu ZE5leHRTaG9ydGN1dCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgbGV0IGNvbnRl bnRCcm93c2VyID0gdGhpcy5fZm9jdXNlZE9yVmlzaWJsZUNvbnRlbnRCcm93c2VyKCk7CisgICAg aWYgKCFjb250ZW50QnJvd3NlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgY29udGVudEJyb3dz ZXIuaGFuZGxlRmluZE5leHRTaG9ydGN1dCgpOworfQorCitXSS5fZmluZFByZXZpb3VzID0gZnVu Y3Rpb24oZXZlbnQpCit7CisgICAgbGV0IGZvY3VzZWRDb250ZW50VmlldyA9IHRoaXMuX2ZvY3Vz ZWRDb250ZW50VmlldygpOworICAgIGlmIChmb2N1c2VkQ29udGVudFZpZXcuc3VwcG9ydHNDdXN0 b21GaW5kQmFubmVyKSB7CisgICAgICAgIGZvY3VzZWRDb250ZW50Vmlldy5oYW5kbGVGaW5kUHJl dmlvdXNTaG9ydGN1dCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgbGV0IGNvbnRl bnRCcm93c2VyID0gdGhpcy5fZm9jdXNlZE9yVmlzaWJsZUNvbnRlbnRCcm93c2VyKCk7CisgICAg aWYgKCFjb250ZW50QnJvd3NlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgY29udGVudEJyb3dz ZXIuaGFuZGxlRmluZFByZXZpb3VzU2hvcnRjdXQoKTsKK30KKwogV0kuX2NvcHkgPSBmdW5jdGlv bihldmVudCkKIHsKICAgICB2YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCBhMmFiODViYWFiYS4uYWJjYTVhMjRjZWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRC cm93c2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbnRlbnRCcm93c2VyLmpzCkBAIC0yMjcsOSArMjI3LDQ4IEBAIFdJLkNvbnRlbnRCcm93c2Vy ID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX2Zp bmRCYW5uZXIuc2hvdygpOwogICAgIH0KIAorICAgIHNob3duKCkKKyAgICB7CisgICAgICAgIHRo aXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLnNob3duKCk7CisgICAgfQorCisgICAgaGlkZGVuKCkK KyAgICB7CisgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmhpZGRlbigpOworICAg IH0KKworICAgIC8vIEdsb2JhbCBDb250ZW50QnJvd3NlciBLZXlib2FyZFNob3J0Y3V0IGhhbmRs ZXJzCisKKyAgICBoYW5kbGVQb3B1bGF0ZUZpbmRTaG9ydGN1dCgpCisgICAgeworICAgICAgICBs ZXQgY3VycmVudENvbnRlbnRWaWV3ID0gdGhpcy5jdXJyZW50Q29udGVudFZpZXc7CisgICAgICAg IGlmICghY3VycmVudENvbnRlbnRWaWV3IHx8ICFjdXJyZW50Q29udGVudFZpZXcuc3VwcG9ydHNT ZWFyY2gpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgbGV0IHNlYXJjaFF1ZXJ5ID0g Y3VycmVudENvbnRlbnRWaWV3LnNlYXJjaFF1ZXJ5V2l0aFNlbGVjdGlvbigpOworICAgICAgICBp ZiAoIXNlYXJjaFF1ZXJ5KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2Zp bmRCYW5uZXIuc2VhcmNoUXVlcnkgPSBzZWFyY2hRdWVyeTsKKworICAgICAgICBjdXJyZW50Q29u dGVudFZpZXcucGVyZm9ybVNlYXJjaCh0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5KTsKKyAg ICB9CisKKyAgICBoYW5kbGVGaW5kTmV4dFNob3J0Y3V0KCkKKyAgICB7CisgICAgICAgIHRoaXMu ZmluZEJhbm5lclJldmVhbE5leHRSZXN1bHQodGhpcy5fZmluZEJhbm5lcik7CisgICAgfQorCisg ICAgaGFuZGxlRmluZFByZXZpb3VzU2hvcnRjdXQoKQorICAgIHsKKyAgICAgICAgdGhpcy5maW5k QmFubmVyUmV2ZWFsUHJldmlvdXNSZXN1bHQodGhpcy5fZmluZEJhbm5lcik7CisgICAgfQorCisg ICAgLy8gRmluZEJhbm5lciBkZWxlZ2F0ZQorCiAgICAgZmluZEJhbm5lclBlcmZvcm1TZWFyY2go ZmluZEJhbm5lciwgcXVlcnkpCiAgICAgewotICAgICAgICB2YXIgY3VycmVudENvbnRlbnRWaWV3 ID0gdGhpcy5jdXJyZW50Q29udGVudFZpZXc7CisgICAgICAgIGxldCBjdXJyZW50Q29udGVudFZp ZXcgPSB0aGlzLmN1cnJlbnRDb250ZW50VmlldzsKICAgICAgICAgaWYgKCFjdXJyZW50Q29udGVu dFZpZXcgfHwgIWN1cnJlbnRDb250ZW50Vmlldy5zdXBwb3J0c1NlYXJjaCkKICAgICAgICAgICAg IHJldHVybjsKIApAQCAtMjM4LDI1ICsyNzcsMTYgQEAgV0kuQ29udGVudEJyb3dzZXIgPSBjbGFz cyBDb250ZW50QnJvd3NlciBleHRlbmRzIFdJLlZpZXcKIAogICAgIGZpbmRCYW5uZXJTZWFyY2hD bGVhcmVkKGZpbmRCYW5uZXIpCiAgICAgewotICAgICAgICB2YXIgY3VycmVudENvbnRlbnRWaWV3 ID0gdGhpcy5jdXJyZW50Q29udGVudFZpZXc7CisgICAgICAgIGxldCBjdXJyZW50Q29udGVudFZp ZXcgPSB0aGlzLmN1cnJlbnRDb250ZW50VmlldzsKICAgICAgICAgaWYgKCFjdXJyZW50Q29udGVu dFZpZXcgfHwgIWN1cnJlbnRDb250ZW50Vmlldy5zdXBwb3J0c1NlYXJjaCkKICAgICAgICAgICAg IHJldHVybjsKIAogICAgICAgICBjdXJyZW50Q29udGVudFZpZXcuc2VhcmNoQ2xlYXJlZCgpOwog ICAgIH0KIAotICAgIGZpbmRCYW5uZXJTZWFyY2hRdWVyeUZvclNlbGVjdGlvbihmaW5kQmFubmVy KQotICAgIHsKLSAgICAgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3VycmVudENv bnRlbnRWaWV3OwotICAgICAgICBpZiAoIWN1cnJlbnRDb250ZW50VmlldyB8fCAhY3VycmVudENv bnRlbnRWaWV3LnN1cHBvcnRzU2VhcmNoKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0KLSAg ICAgICAgcmV0dXJuIGN1cnJlbnRDb250ZW50Vmlldy5zZWFyY2hRdWVyeVdpdGhTZWxlY3Rpb24o KTsKLSAgICB9Ci0KICAgICBmaW5kQmFubmVyUmV2ZWFsUHJldmlvdXNSZXN1bHQoZmluZEJhbm5l cikKICAgICB7Ci0gICAgICAgIHZhciBjdXJyZW50Q29udGVudFZpZXcgPSB0aGlzLmN1cnJlbnRD b250ZW50VmlldzsKKyAgICAgICAgbGV0IGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3VycmVu dENvbnRlbnRWaWV3OwogICAgICAgICBpZiAoIWN1cnJlbnRDb250ZW50VmlldyB8fCAhY3VycmVu dENvbnRlbnRWaWV3LnN1cHBvcnRzU2VhcmNoKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0y NjUsMjkgKzI5NSwxMyBAQCBXSS5Db250ZW50QnJvd3NlciA9IGNsYXNzIENvbnRlbnRCcm93c2Vy IGV4dGVuZHMgV0kuVmlldwogCiAgICAgZmluZEJhbm5lclJldmVhbE5leHRSZXN1bHQoZmluZEJh bm5lcikKICAgICB7Ci0gICAgICAgIHZhciBjdXJyZW50Q29udGVudFZpZXcgPSB0aGlzLmN1cnJl bnRDb250ZW50VmlldzsKKyAgICAgICAgbGV0IGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY3Vy cmVudENvbnRlbnRWaWV3OwogICAgICAgICBpZiAoIWN1cnJlbnRDb250ZW50VmlldyB8fCAhY3Vy cmVudENvbnRlbnRWaWV3LnN1cHBvcnRzU2VhcmNoKQogICAgICAgICAgICAgcmV0dXJuOwogCiAg ICAgICAgIGN1cnJlbnRDb250ZW50Vmlldy5yZXZlYWxOZXh0U2VhcmNoUmVzdWx0KCFmaW5kQmFu bmVyLnNob3dpbmcpOwogICAgIH0KIAotICAgIHNob3duKCkKLSAgICB7Ci0gICAgICAgIHRoaXMu X2NvbnRlbnRWaWV3Q29udGFpbmVyLnNob3duKCk7Ci0KLSAgICAgICAgaWYgKHRoaXMuX2ZpbmRC YW5uZXIpCi0gICAgICAgICAgICB0aGlzLl9maW5kQmFubmVyLmVuYWJsZUtleWJvYXJkU2hvcnRj dXRzKCk7Ci0gICAgfQotCi0gICAgaGlkZGVuKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2NvbnRl bnRWaWV3Q29udGFpbmVyLmhpZGRlbigpOwotCi0gICAgICAgIGlmICh0aGlzLl9maW5kQmFubmVy KQotICAgICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5kaXNhYmxlS2V5Ym9hcmRTaG9ydGN1dHMo KTsKLSAgICB9Ci0KICAgICAvLyBQcml2YXRlCiAKICAgICBfZmluZEJhbm5lckRpZFNob3coZXZl bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbnRlbnRWaWV3LmpzCmluZGV4IDQ0ZWI0NDVmNjc4Li4yMjQ2MjEzMGVhZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudFZpZXcuanMKQEAgLTQ0OSw4ICs0NDksMTEgQEAgV0kuQ29udGVudFZpZXcgPSBjbGFzcyBD b250ZW50VmlldyBleHRlbmRzIFdJLlZpZXcKIAogICAgIHNlYXJjaFF1ZXJ5V2l0aFNlbGVjdGlv bigpCiAgICAgewotICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgotICAgICAg ICByZXR1cm4gbnVsbDsKKyAgICAgICAgbGV0IHNlbGVjdGlvbiA9IHdpbmRvdy5nZXRTZWxlY3Rp b24oKTsKKyAgICAgICAgaWYgKHNlbGVjdGlvbi5pc0NvbGxhcHNlZCkKKyAgICAgICAgICAgIHJl dHVybiBudWxsOworCisgICAgICAgIHJldHVybiBzZWxlY3Rpb24udG9TdHJpbmcoKS5yZW1vdmVX b3JkQnJlYWtDaGFyYWN0ZXJzKCk7CiAgICAgfQogCiAgICAgcmV2ZWFsUHJldmlvdXNTZWFyY2hS ZXN1bHQoY2hhbmdlRm9jdXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcwppbmRleCBiMjdlYWNiOGE0ZC4uZjEzYWI3 NjQ5YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRmluZEJhbm5lci5qcwpAQCAtODQsMTMgKzg0LDYgQEAgV0kuRmluZEJhbm5lciA9 IGNsYXNzIEZpbmRCYW5uZXIgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uSXRlbQogICAgICAgICB0aGlz Ll9zZWFyY2hCYWNrd2FyZHMgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fc2VhcmNoS2V5UHJlc3Nl ZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9wcmV2aW91c1NlYXJjaFZhbHVlID0gIiI7Ci0KLSAg ICAgICAgdGhpcy5fcG9wdWxhdGVGaW5kS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2Fy ZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwg IkUiLCB0aGlzLl9wb3B1bGF0ZVNlYXJjaFF1ZXJ5RnJvbVNlbGVjdGlvbi5iaW5kKHRoaXMpKTsK LSAgICAgICAgdGhpcy5fcG9wdWxhdGVGaW5kS2V5Ym9hcmRTaG9ydGN1dC5pbXBsaWNpdGx5UHJl dmVudHNEZWZhdWx0ID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX2ZpbmROZXh0S2V5Ym9hcmRTaG9y dGN1dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZp ZXIuQ29tbWFuZE9yQ29udHJvbCwgIkciLCB0aGlzLl9uZXh0UmVzdWx0QnV0dG9uQ2xpY2tlZC5i aW5kKHRoaXMpKTsKLSAgICAgICAgdGhpcy5fZmluZFByZXZpb3VzS2V5Ym9hcmRTaG9ydGN1dCA9 IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hp ZnQgfCBXSS5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJHIiwg dGhpcy5fcHJldmlvdXNSZXN1bHRCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwotCi0gICAgICAg IHRoaXMuZGlzYWJsZUtleWJvYXJkU2hvcnRjdXRzKCk7CiAgICAgfQogCiAgICAgLy8gUHVibGlj CkBAIC0yMjMsMjAgKzIxNiw2IEBAIFdJLkZpbmRCYW5uZXIgPSBjbGFzcyBGaW5kQmFubmVyIGV4 dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV0kuRmluZEJhbm5lci5FdmVudC5EaWRIaWRlKTsKICAgICB9CiAKLSAgICBlbmFibGVL ZXlib2FyZFNob3J0Y3V0cygpCi0gICAgewotICAgICAgICB0aGlzLl9wb3B1bGF0ZUZpbmRLZXli b2FyZFNob3J0Y3V0LmRpc2FibGVkID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX2ZpbmROZXh0S2V5 Ym9hcmRTaG9ydGN1dC5kaXNhYmxlZCA9IGZhbHNlOwotICAgICAgICB0aGlzLl9maW5kUHJldmlv dXNLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gZmFsc2U7Ci0gICAgfQotCi0gICAgZGlzYWJs ZUtleWJvYXJkU2hvcnRjdXRzKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3BvcHVsYXRlRmluZEtl eWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOwotICAgICAgICB0aGlzLl9maW5kTmV4dEtl eWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOwotICAgICAgICB0aGlzLl9maW5kUHJldmlv dXNLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKLSAgICB9Ci0KICAgICAvLyBQcml2 YXRlCiAKICAgICBfaW5wdXRGaWVsZEtleURvd24oZXZlbnQpCkBAIC0yNzksMTkgKzI1OCw2IEBA IFdJLkZpbmRCYW5uZXIgPSBjbGFzcyBGaW5kQmFubmVyIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0 ZW0KICAgICAgICAgdGhpcy5fcHJldmlvdXNTZWFyY2hWYWx1ZSA9IHRoaXMuc2VhcmNoUXVlcnk7 CiAgICAgfQogCi0gICAgX3BvcHVsYXRlU2VhcmNoUXVlcnlGcm9tU2VsZWN0aW9uKGV2ZW50KQot ICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0 ZS5maW5kQmFubmVyU2VhcmNoUXVlcnlGb3JTZWxlY3Rpb24gPT09ICJmdW5jdGlvbiIpIHsKLSAg ICAgICAgICAgIHZhciBxdWVyeSA9IHRoaXMuX2RlbGVnYXRlLmZpbmRCYW5uZXJTZWFyY2hRdWVy eUZvclNlbGVjdGlvbih0aGlzKTsKLSAgICAgICAgICAgIGlmIChxdWVyeSkgewotICAgICAgICAg ICAgICAgIHRoaXMuc2VhcmNoUXVlcnkgPSBxdWVyeTsKLQotICAgICAgICAgICAgICAgIGlmICh0 aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuZmluZEJhbm5lclBlcmZvcm1T ZWFyY2ggPT09ICJmdW5jdGlvbiIpCi0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRl LmZpbmRCYW5uZXJQZXJmb3JtU2VhcmNoKHRoaXMsIHRoaXMuc2VhcmNoUXVlcnkpOwotICAgICAg ICAgICAgfQotICAgICAgICB9Ci0gICAgfQotCiAgICAgX3ByZXZpb3VzUmVzdWx0QnV0dG9uQ2xp Y2tlZChldmVudCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2Yg dGhpcy5fZGVsZWdhdGUuZmluZEJhbm5lclJldmVhbFByZXZpb3VzUmVzdWx0ID09PSAiZnVuY3Rp b24iKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTG9nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwppbmRleCAxMmI0MWMyYmViNC4uYzUxYWIwZDE1Y2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xv Z0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0yMzIsNiArMjMyLDI3IEBAIFdJLkxvZ0NvbnRl bnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAg ICAgICB0aGlzLl9sb2dWaWV3Q29udHJvbGxlci5yZXF1ZXN0Q2xlYXJNZXNzYWdlcygpOwogICAg IH0KIAorICAgIGhhbmRsZVBvcHVsYXRlRmluZFNob3J0Y3V0KCkKKyAgICB7CisgICAgICAgIGxl dCBzZWFyY2hRdWVyeSA9IHRoaXMuc2VhcmNoUXVlcnlXaXRoU2VsZWN0aW9uKCk7CisgICAgICAg IGlmICghc2VhcmNoUXVlcnkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5f ZmluZEJhbm5lci5zZWFyY2hRdWVyeSA9IHNlYXJjaFF1ZXJ5OworCisgICAgICAgIHRoaXMucGVy Zm9ybVNlYXJjaCh0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5KTsKKyAgICB9CisKKyAgICBo YW5kbGVGaW5kTmV4dFNob3J0Y3V0KCkKKyAgICB7CisgICAgICAgIHRoaXMuZmluZEJhbm5lclJl dmVhbE5leHRSZXN1bHQodGhpcy5fZmluZEJhbm5lcik7CisgICAgfQorCisgICAgaGFuZGxlRmlu ZFByZXZpb3VzU2hvcnRjdXQoKQorICAgIHsKKyAgICAgICAgdGhpcy5maW5kQmFubmVyUmV2ZWFs UHJldmlvdXNSZXN1bHQodGhpcy5fZmluZEJhbm5lcik7CisgICAgfQorCiAgICAgZmluZEJhbm5l clJldmVhbFByZXZpb3VzUmVzdWx0KCkKICAgICB7CiAgICAgICAgIHRoaXMuaGlnaGxpZ2h0UHJl dmlvdXNTZWFyY2hNYXRjaCgpOwo=