157813 2016-05-17 14:46:59 -0700 Web Inspector: NavigationSidebarPanel should coordinate item selection between its tree outlines 2016-05-17 19:25:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 157713 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1193991 0 mattbaker 2016-05-17 14:46:59 -0700 * SUMMARY NavigationSidebarPanel should coordinate item selection between its tree outlines. Debugger sidebar panel deselect tree elements as needed to prevent two selections in the sidebar, but this should be done by the base class. * NOTE DebuggerSidebarPanel._treeSelectionDidChange shadows the event listener in NavigationSidebarPanel, which means NavigationSidebarPanel._selectedContentTreeOutline will be in a base state. I'll address the issue as part of this change. 1193992 1 webkit-bug-importer 2016-05-17 14:47:37 -0700 <rdar://problem/26331779> 1193994 2 webkit-bug-importer 2016-05-17 14:48:21 -0700 <rdar://problem/26331796> 1194059 3 279184 mattbaker 2016-05-17 16:53:57 -0700 Created attachment 279184 [Patch] Proposed Fix 1194077 4 279184 timothy 2016-05-17 17:39:32 -0700 Comment on attachment 279184 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=279184&action=review > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:653 > + if (treeElement) { Return early instead? > Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:664 > + this._selectedContentTreeOutline = selectedTreeOutline; Not used? 1194093 5 279184 mattbaker 2016-05-17 18:23:30 -0700 Comment on attachment 279184 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=279184&action=review >> Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js:664 >> + this._selectedContentTreeOutline = selectedTreeOutline; > > Not used? Used in NavigationSidebarPanel.show. 1194096 6 279193 mattbaker 2016-05-17 18:26:44 -0700 Created attachment 279193 [Patch] Proposed Fix 1194105 7 279198 mattbaker 2016-05-17 18:55:31 -0700 Created attachment 279198 [Patch] For Landing 1194118 8 279198 commit-queue 2016-05-17 19:25:15 -0700 Comment on attachment 279198 [Patch] For Landing Clearing flags on attachment: 279198 Committed r201068: <http://trac.webkit.org/changeset/201068> 1194120 9 commit-queue 2016-05-17 19:25:24 -0700 All reviewed patches have been landed. Closing bug. 279184 2016-05-17 16:53:57 -0700 2016-05-17 18:26:41 -0700 [Patch] Proposed Fix bug-157813-20160517165455.patch text/plain 6427 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl NTFjZTM2NTdjMGFhNWMzM2NlYjUzMmE3ODllMTk2NzIzZWRlNTUyLi44ZTY5ZTViOWQyYTNjOWIy Y2JiZjM4OWE4MjNkZDA1MTg3OGM0ZTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxNi0wNS0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTmF2aWdhdGlvblNpZGViYXJQYW5lbCBzaG91bGQg Y29vcmRpbmF0ZSBpdGVtIHNlbGVjdGlvbiBiZXR3ZWVuIGl0cyB0cmVlIG91dGxpbmVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc4MTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI2MzMxNzc5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGVi YXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5w cm90b3R5cGUuX3RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UpOgorICAgICAgICBEZXNlbGVjdGluZyBl bGVtZW50cyBpbiBvdGhlciB0cmVlIG91dGxpbmVzIGlzIG5vdyBkb25lIGluIHRoZSBiYXNlIGNs YXNzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJv dG90eXBlLmNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZSk6CisgICAgICAgIExpc3RlbiBmb3Igc2Vs ZWN0aW9uIGNoYW5nZWQgZXZlbnRzIG9uIGFsbCBjb250ZW50IHRyZWUgb3V0bGluZXMuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUudHJlZUVs ZW1lbnRBZGRlZE9yQ2hhbmdlZCk6CisgICAgICAgIE1vdmVkIHN0dWIgZnJvbSB0aGUgcHVibGlj IHNlY3Rpb24gdG8gdGhlIHByb3RlY3RlZCBzZWN0aW9uLgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9jb250ZW50VHJlZU91dGxpbmVUcmVl U2VsZWN0aW9uRGlkQ2hhbmdlKToKKyAgICAgICAgRGVzZWxlY3QgdHJlZSBlbGVtZW50cyBpbiBh bnkgY29udGVudCB0cmVlIG91dGxpbmUgdGhhdCBpcyBub3QgdGhlCisgICAgICAgIHBhcmVudCBv ZiB0aGUgc2VsZWN0ZWQgZWxlbWVudC4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRp b25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl90cmVlU2VsZWN0aW9uRGlkQ2hhbmdlKTogRGVsZXRl ZC4KKyAgICAgICAgUmVuYW1lIF9jb250ZW50VHJlZU91dGxpbmVUcmVlU2VsZWN0aW9uRGlkQ2hh bmdlLCB0byBwcmV2ZW50IGJlaW5nCisgICAgICAgIHNoYWRvd2VkIGJ5IHN1YmNsYXNzZXMgd2l0 aCBfdHJlZVNlbGVjdGlvbkRpZENoYW5nZSBldmVudCBoYW5kbGVycy4KKwogMjAxNi0wNS0xNyAg QnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBp bnNwZWN0b3IgdGVzdHMgc2hvdWxkIHJlZGlyZWN0IGFuZCBsb2cgY29uc29sZS50cmFjZSgpIGNh bGxzIGluIHRlc3Qgb3V0cHV0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4 IDI0ODYwMDk5NjYwOWZkMWYwZDAwZDQ4NjVjNTVkNDg2OWZjYzg0YjIuLmU4YWI0M2ZiNDk4MzBh MWM2ZDQ4YjkxYzFiMWJkYWRkOWRjNTNhM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBh bmVsLmpzCkBAIC02OTIsMTYgKzY5Miw2IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQ YW5lbCA9IGNsYXNzIERlYnVnZ2VyU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAg ICAgIGlmICghdHJlZUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgLy8g RGVzZWxlY3QgYW55IG90aGVyIHRyZWUgZWxlbWVudHMgdG8gcHJldmVudCB0d28gc2VsZWN0aW9u cyBpbiB0aGUgc2lkZWJhci4KLSAgICAgICAgZm9yIChsZXQgdHJlZU91dGxpbmUgb2YgdGhpcy52 aXNpYmxlQ29udGVudFRyZWVPdXRsaW5lcykgewotICAgICAgICAgICAgaWYgKHRyZWVPdXRsaW5l ID09PSB0cmVlRWxlbWVudC50cmVlT3V0bGluZSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsK LQotICAgICAgICAgICAgbGV0IHNlbGVjdGVkVHJlZUVsZW1lbnQgPSB0cmVlT3V0bGluZS5zZWxl Y3RlZFRyZWVFbGVtZW50OwotICAgICAgICAgICAgaWYgKHNlbGVjdGVkVHJlZUVsZW1lbnQpCi0g ICAgICAgICAgICAgICAgc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOwotICAgICAgICB9 Ci0KICAgICAgICAgaWYgKHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZUVsZW1lbnQgfHwgdHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2Ny aXB0VHJlZUVsZW1lbnQpIHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291cmNlQ29k ZSh0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgICAgICAgICByZXR1cm47CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZp Z2F0aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwppbmRleCBmYTQ3YzkwZmQ0ZmI5M2Fk ZTBhMDU2ODhkYjIxNjI0MDVjMTRmZGE4Li5jM2FjNTRiNDY1NGFmOWYyNGY4YWQ4OGE4ZTk4OWNk ZmMyMDJiOTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTE1 Miw2ICsxNTIsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNz IE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICBjb250ZW50VHJl ZU91dGxpbmUuYWxsb3dzUmVwZWF0U2VsZWN0aW9uID0gdHJ1ZTsKICAgICAgICAgY29udGVudFRy ZWVPdXRsaW5lLmhpZGRlbiA9ICFkb250SGlkZUJ5RGVmYXVsdDsKICAgICAgICAgY29udGVudFRy ZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50U3R5bGVDbGFzc05hbWUpOworICAg ICAgICBjb250ZW50VHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVHJl ZU91dGxpbmUuRXZlbnQuU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzLl9jb250ZW50VHJlZU91dGxp bmVUcmVlU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKIAogICAgICAgICB0aGlzLmNvbnRlbnRW aWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVudFRyZWVPdXRsaW5lLmVsZW1lbnQpOwogCkBA IC0xNTksNyArMTYwLDYgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBj bGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgICAgIGNv bnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UcmVlT3V0bGlu ZS5FdmVudC5FbGVtZW50QWRkZWQsIHRoaXMuX3RyZWVFbGVtZW50QWRkZWRPckNoYW5nZWQsIHRo aXMpOwogICAgICAgICAgICAgY29udGVudFRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnREaWRDaGFuZ2UsIHRoaXMuX3RyZWVF bGVtZW50QWRkZWRPckNoYW5nZWQsIHRoaXMpOwogICAgICAgICAgICAgY29udGVudFRyZWVPdXRs aW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1l bnREaXNjbG9zdXJlRGlkQ2hhbmdlZCwgdGhpcy5fdHJlZUVsZW1lbnREaXNjbG9zdXJlRGlkQ2hh bmdlLCB0aGlzKTsKLSAgICAgICAgICAgIGNvbnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5FdmVudC5TZWxlY3Rpb25EaWRDaGFuZ2UsIHRo aXMuX3RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICB9CiAKICAgICAgICAg Y29udGVudFRyZWVPdXRsaW5lW1dlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLlN1 cHByZXNzRmlsdGVyaW5nU3ltYm9sXSA9IHN1cHByZXNzRmlsdGVyaW5nOwpAQCAtNDI4LDExICs0 MjgsNiBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmln YXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICB0cmVlRWxlbWVudC5oaWRk ZW4gPSB0cnVlOwogICAgIH0KIAotICAgIHRyZWVFbGVtZW50QWRkZWRPckNoYW5nZWQodHJlZUVs ZW1lbnQpCi0gICAgewotICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGlmIG5l ZWRlZC4KLSAgICB9Ci0KICAgICBzaG93KCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5wYXJl bnRTaWRlYmFyKQpAQCAtNDg1LDYgKzQ4MCwxMSBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp ZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgog ICAgICAgICB9CiAgICAgfQogCisgICAgdHJlZUVsZW1lbnRBZGRlZE9yQ2hhbmdlZCh0cmVlRWxl bWVudCkKKyAgICB7CisgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMgaWYgbmVl ZGVkLgorICAgIH0KKwogICAgIC8vIFByaXZhdGUKIAogICAgIF91cGRhdGVDb250ZW50T3ZlcmZs b3dTaGFkb3dWaXNpYmlsaXR5KCkKQEAgLTY0NiwxMCArNjQ2LDIyIEBAIFdlYkluc3BlY3Rvci5O YXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRl bmRzIFdlYkluCiAgICAgICAgIHRoaXMuc29vbi5fdXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93 VmlzaWJpbGl0eSgpOwogICAgIH0KIAotICAgIF90cmVlU2VsZWN0aW9uRGlkQ2hhbmdlKGV2ZW50 KQorICAgIF9jb250ZW50VHJlZU91dGxpbmVUcmVlU2VsZWN0aW9uRGlkQ2hhbmdlKGV2ZW50KQog ICAgIHsKLSAgICAgICAgbGV0IHNlbGVjdGVkRWxlbWVudCA9IGV2ZW50LmRhdGEuc2VsZWN0ZWRF bGVtZW50OwotICAgICAgICB0aGlzLl9zZWxlY3RlZENvbnRlbnRUcmVlT3V0bGluZSA9IHNlbGVj dGVkRWxlbWVudCA/IHNlbGVjdGVkRWxlbWVudC50cmVlT3V0bGluZSA6IG51bGw7CisgICAgICAg IGxldCB0cmVlRWxlbWVudCA9IGV2ZW50LmRhdGEuc2VsZWN0ZWRFbGVtZW50OworICAgICAgICBs ZXQgc2VsZWN0ZWRUcmVlT3V0bGluZSA9IHRyZWVFbGVtZW50ID8gdHJlZUVsZW1lbnQudHJlZU91 dGxpbmUgOiBudWxsOworICAgICAgICBpZiAodHJlZUVsZW1lbnQpIHsKKyAgICAgICAgICAgIC8v IERlc2VsZWN0IGFueSBvdGhlciB0cmVlIGVsZW1lbnRzIHRvIHByZXZlbnQgdHdvIHNlbGVjdGlv bnMgaW4gdGhlIHNpZGViYXIuCisgICAgICAgICAgICBmb3IgKGxldCB0cmVlT3V0bGluZSBvZiB0 aGlzLnZpc2libGVDb250ZW50VHJlZU91dGxpbmVzKSB7CisgICAgICAgICAgICAgICAgaWYgKHRy ZWVPdXRsaW5lID09PSBzZWxlY3RlZFRyZWVPdXRsaW5lKQorICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKKworICAgICAgICAgICAgICAgIGlmICh0cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVF bGVtZW50KQorICAgICAgICAgICAgICAgICAgICB0cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVt ZW50LmRlc2VsZWN0KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICB0aGlz Ll9zZWxlY3RlZENvbnRlbnRUcmVlT3V0bGluZSA9IHNlbGVjdGVkVHJlZU91dGxpbmU7CiAgICAg fQogCiAgICAgX2NoZWNrRm9yU3RhbGVSZXNvdXJjZXNJZk5lZWRlZCgpCg== 279193 2016-05-17 18:26:44 -0700 2016-05-17 18:55:28 -0700 [Patch] Proposed Fix bug-157813-20160517182741.patch text/plain 6400 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAy MDQ3MWZiZTk5NGE3MzY0OWZkODFjOTk4MDUwNDU2ZWFjOTMzMDUzLi4xMzNmMTZkYTM4N2Y5YTE4 YWQ2MjNkODUxZmMyNWMzY2M5MTdiNDFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMCBAQAogMjAxNi0wNS0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTmF2aWdhdGlvblNpZGViYXJQYW5lbCBzaG91bGQg Y29vcmRpbmF0ZSBpdGVtIHNlbGVjdGlvbiBiZXR3ZWVuIGl0cyB0cmVlIG91dGxpbmVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc4MTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI2MzMxNzc5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGVi YXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5w cm90b3R5cGUuX3RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UpOgorICAgICAgICBEZXNlbGVjdGluZyBl bGVtZW50cyBpbiBvdGhlciB0cmVlIG91dGxpbmVzIGlzIG5vdyBkb25lIGluIHRoZSBiYXNlIGNs YXNzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJv dG90eXBlLmNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZSk6CisgICAgICAgIExpc3RlbiBmb3Igc2Vs ZWN0aW9uIGNoYW5nZWQgZXZlbnRzIG9uIGFsbCBjb250ZW50IHRyZWUgb3V0bGluZXMuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUudHJlZUVs ZW1lbnRBZGRlZE9yQ2hhbmdlZCk6CisgICAgICAgIE1vdmVkIHN0dWIgZnJvbSB0aGUgcHVibGlj IHNlY3Rpb24gdG8gdGhlIHByb3RlY3RlZCBzZWN0aW9uLgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl9jb250ZW50VHJlZU91dGxpbmVUcmVl U2VsZWN0aW9uRGlkQ2hhbmdlKToKKyAgICAgICAgRGVzZWxlY3QgdHJlZSBlbGVtZW50cyBpbiBh bnkgY29udGVudCB0cmVlIG91dGxpbmUgdGhhdCBpcyBub3QgdGhlCisgICAgICAgIHBhcmVudCBv ZiB0aGUgc2VsZWN0ZWQgZWxlbWVudC4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRp b25TaWRlYmFyUGFuZWwucHJvdG90eXBlLl90cmVlU2VsZWN0aW9uRGlkQ2hhbmdlKTogRGVsZXRl ZC4KKyAgICAgICAgUmVuYW1lIF9jb250ZW50VHJlZU91dGxpbmVUcmVlU2VsZWN0aW9uRGlkQ2hh bmdlLCB0byBwcmV2ZW50IGJlaW5nCisgICAgICAgIHNoYWRvd2VkIGJ5IHN1YmNsYXNzZXMgd2l0 aCBfdHJlZVNlbGVjdGlvbkRpZENoYW5nZSBldmVudCBoYW5kbGVycy4KKworMjAxNi0wNS0xNyAg TWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVtb3ZlIFRpbWVsaW5lU2lkZWJhclBhbmVsLmpzIGFzIGl0J3Mgbm8gbG9uZ2VyIHJlZmVy ZW5jZWQgYW55d2hlcmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1NzgxOQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4IDI0 ODYwMDk5NjYwOWZkMWYwZDAwZDQ4NjVjNTVkNDg2OWZjYzg0YjIuLmU4YWI0M2ZiNDk4MzBhMWM2 ZDQ4YjkxYzFiMWJkYWRkOWRjNTNhM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVs LmpzCkBAIC02OTIsMTYgKzY5Miw2IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5l bCA9IGNsYXNzIERlYnVnZ2VyU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAg IGlmICghdHJlZUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgLy8gRGVz ZWxlY3QgYW55IG90aGVyIHRyZWUgZWxlbWVudHMgdG8gcHJldmVudCB0d28gc2VsZWN0aW9ucyBp biB0aGUgc2lkZWJhci4KLSAgICAgICAgZm9yIChsZXQgdHJlZU91dGxpbmUgb2YgdGhpcy52aXNp YmxlQ29udGVudFRyZWVPdXRsaW5lcykgewotICAgICAgICAgICAgaWYgKHRyZWVPdXRsaW5lID09 PSB0cmVlRWxlbWVudC50cmVlT3V0bGluZSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLQot ICAgICAgICAgICAgbGV0IHNlbGVjdGVkVHJlZUVsZW1lbnQgPSB0cmVlT3V0bGluZS5zZWxlY3Rl ZFRyZWVFbGVtZW50OwotICAgICAgICAgICAgaWYgKHNlbGVjdGVkVHJlZUVsZW1lbnQpCi0gICAg ICAgICAgICAgICAgc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOwotICAgICAgICB9Ci0K ICAgICAgICAgaWYgKHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZUVsZW1lbnQgfHwgdHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2NyaXB0 VHJlZUVsZW1lbnQpIHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291cmNlQ29kZSh0 cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgICAgICAgICByZXR1cm47CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0 aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwppbmRleCBmYTQ3YzkwZmQ0ZmI5M2FkZTBh MDU2ODhkYjIxNjI0MDVjMTRmZGE4Li4xNDdiNWI0MTk4ODFmZThjY2I0MGJhYTA4OGYyOTkwZmU4 ZmQ2YTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKQEAgLTE1Miw2 ICsxNTIsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5h dmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICBjb250ZW50VHJlZU91 dGxpbmUuYWxsb3dzUmVwZWF0U2VsZWN0aW9uID0gdHJ1ZTsKICAgICAgICAgY29udGVudFRyZWVP dXRsaW5lLmhpZGRlbiA9ICFkb250SGlkZUJ5RGVmYXVsdDsKICAgICAgICAgY29udGVudFRyZWVP dXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50U3R5bGVDbGFzc05hbWUpOworICAgICAg ICBjb250ZW50VHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVHJlZU91 dGxpbmUuRXZlbnQuU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzLl9jb250ZW50VHJlZU91dGxpbmVU cmVlU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKIAogICAgICAgICB0aGlzLmNvbnRlbnRWaWV3 LmVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVudFRyZWVPdXRsaW5lLmVsZW1lbnQpOwogCkBAIC0x NTksNyArMTYwLDYgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFz cyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgICAgIGNvbnRl bnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5F dmVudC5FbGVtZW50QWRkZWQsIHRoaXMuX3RyZWVFbGVtZW50QWRkZWRPckNoYW5nZWQsIHRoaXMp OwogICAgICAgICAgICAgY29udGVudFRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnREaWRDaGFuZ2UsIHRoaXMuX3RyZWVFbGVt ZW50QWRkZWRPckNoYW5nZWQsIHRoaXMpOwogICAgICAgICAgICAgY29udGVudFRyZWVPdXRsaW5l LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnRE aXNjbG9zdXJlRGlkQ2hhbmdlZCwgdGhpcy5fdHJlZUVsZW1lbnREaXNjbG9zdXJlRGlkQ2hhbmdl LCB0aGlzKTsKLSAgICAgICAgICAgIGNvbnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5FdmVudC5TZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMu X3RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICB9CiAKICAgICAgICAgY29u dGVudFRyZWVPdXRsaW5lW1dlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLlN1cHBy ZXNzRmlsdGVyaW5nU3ltYm9sXSA9IHN1cHByZXNzRmlsdGVyaW5nOwpAQCAtNDI4LDExICs0Mjgs NiBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRp b25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICB0cmVlRWxlbWVudC5oaWRkZW4g PSB0cnVlOwogICAgIH0KIAotICAgIHRyZWVFbGVtZW50QWRkZWRPckNoYW5nZWQodHJlZUVsZW1l bnQpCi0gICAgewotICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGlmIG5lZWRl ZC4KLSAgICB9Ci0KICAgICBzaG93KCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5wYXJlbnRT aWRlYmFyKQpAQCAtNDg1LDYgKzQ4MCwxMSBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGVi YXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAg ICAgICB9CiAgICAgfQogCisgICAgdHJlZUVsZW1lbnRBZGRlZE9yQ2hhbmdlZCh0cmVlRWxlbWVu dCkKKyAgICB7CisgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMgaWYgbmVlZGVk LgorICAgIH0KKwogICAgIC8vIFByaXZhdGUKIAogICAgIF91cGRhdGVDb250ZW50T3ZlcmZsb3dT aGFkb3dWaXNpYmlsaXR5KCkKQEAgLTY0NiwxMCArNjQ2LDIyIEBAIFdlYkluc3BlY3Rvci5OYXZp Z2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRz IFdlYkluCiAgICAgICAgIHRoaXMuc29vbi5fdXBkYXRlQ29udGVudE92ZXJmbG93U2hhZG93Vmlz aWJpbGl0eSgpOwogICAgIH0KIAotICAgIF90cmVlU2VsZWN0aW9uRGlkQ2hhbmdlKGV2ZW50KQor ICAgIF9jb250ZW50VHJlZU91dGxpbmVUcmVlU2VsZWN0aW9uRGlkQ2hhbmdlKGV2ZW50KQogICAg IHsKLSAgICAgICAgbGV0IHNlbGVjdGVkRWxlbWVudCA9IGV2ZW50LmRhdGEuc2VsZWN0ZWRFbGVt ZW50OwotICAgICAgICB0aGlzLl9zZWxlY3RlZENvbnRlbnRUcmVlT3V0bGluZSA9IHNlbGVjdGVk RWxlbWVudCA/IHNlbGVjdGVkRWxlbWVudC50cmVlT3V0bGluZSA6IG51bGw7CisgICAgICAgIGxl dCB0cmVlRWxlbWVudCA9IGV2ZW50LmRhdGEuc2VsZWN0ZWRFbGVtZW50OworICAgICAgICBpZiAo IXRyZWVFbGVtZW50KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX3NlbGVj dGVkQ29udGVudFRyZWVPdXRsaW5lID0gdHJlZUVsZW1lbnQudHJlZU91dGxpbmU7CisKKyAgICAg ICAgLy8gRGVzZWxlY3QgYW55IG90aGVyIHRyZWUgZWxlbWVudHMgdG8gcHJldmVudCB0d28gc2Vs ZWN0aW9ucyBpbiB0aGUgc2lkZWJhci4KKyAgICAgICAgZm9yIChsZXQgdHJlZU91dGxpbmUgb2Yg dGhpcy52aXNpYmxlQ29udGVudFRyZWVPdXRsaW5lcykgeworICAgICAgICAgICAgaWYgKHRyZWVP dXRsaW5lID09PSB0aGlzLl9zZWxlY3RlZENvbnRlbnRUcmVlT3V0bGluZSkKKyAgICAgICAgICAg ICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgaWYgKHRyZWVPdXRsaW5lLnNlbGVjdGVkVHJl ZUVsZW1lbnQpCisgICAgICAgICAgICAgICAgdHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVu dC5kZXNlbGVjdCgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgX2NoZWNrRm9yU3RhbGVSZXNv dXJjZXNJZk5lZWRlZCgpCg== 279198 2016-05-17 18:55:31 -0700 2016-05-17 19:25:15 -0700 [Patch] For Landing bug-157813-20160517185629.patch text/plain 6401 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAy MDQ3MWZiZTk5NGE3MzY0OWZkODFjOTk4MDUwNDU2ZWFjOTMzMDUzLi41MWQ3ODcxNzA0NDJlYjdl NDRkMDVlZWE2OGIzMzQ4YWIxYjNhMzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMCBAQAogMjAxNi0wNS0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTmF2aWdhdGlvblNpZGViYXJQYW5lbCBzaG91bGQg Y29vcmRpbmF0ZSBpdGVtIHNlbGVjdGlvbiBiZXR3ZWVuIGl0cyB0cmVlIG91dGxpbmVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTc4MTMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI2MzMxNzc5PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90 aHkgSGF0Y2hlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRl YmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwu cHJvdG90eXBlLl90cmVlU2VsZWN0aW9uRGlkQ2hhbmdlKToKKyAgICAgICAgRGVzZWxlY3Rpbmcg ZWxlbWVudHMgaW4gb3RoZXIgdHJlZSBvdXRsaW5lcyBpcyBub3cgZG9uZSBpbiB0aGUgYmFzZSBj bGFzcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQ YW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnBy b3RvdHlwZS5jcmVhdGVDb250ZW50VHJlZU91dGxpbmUpOgorICAgICAgICBMaXN0ZW4gZm9yIHNl bGVjdGlvbiBjaGFuZ2VkIGV2ZW50cyBvbiBhbGwgY29udGVudCB0cmVlIG91dGxpbmVzLgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLnRyZWVF bGVtZW50QWRkZWRPckNoYW5nZWQpOgorICAgICAgICBNb3ZlZCBzdHViIGZyb20gdGhlIHB1Ymxp YyBzZWN0aW9uIHRvIHRoZSBwcm90ZWN0ZWQgc2VjdGlvbi4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY29udGVudFRyZWVPdXRsaW5lVHJl ZVNlbGVjdGlvbkRpZENoYW5nZSk6CisgICAgICAgIERlc2VsZWN0IHRyZWUgZWxlbWVudHMgaW4g YW55IGNvbnRlbnQgdHJlZSBvdXRsaW5lIHRoYXQgaXMgbm90IHRoZQorICAgICAgICBwYXJlbnQg b2YgdGhlIHNlbGVjdGVkIGVsZW1lbnQuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0 aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdHJlZVNlbGVjdGlvbkRpZENoYW5nZSk6IERlbGV0 ZWQuCisgICAgICAgIFJlbmFtZSBfY29udGVudFRyZWVPdXRsaW5lVHJlZVNlbGVjdGlvbkRpZENo YW5nZSwgdG8gcHJldmVudCBiZWluZworICAgICAgICBzaGFkb3dlZCBieSBzdWJjbGFzc2VzIHdp dGggX3RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UgZXZlbnQgaGFuZGxlcnMuCisKKzIwMTYtMDUtMTcg IE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlbW92ZSBUaW1lbGluZVNpZGViYXJQYW5lbC5qcyBhcyBpdCdzIG5vIGxvbmdlciByZWZl cmVuY2VkIGFueXdoZXJlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTc4MTkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcwppbmRleCAy NDg2MDA5OTY2MDlmZDFmMGQwMGQ0ODY1YzU1ZDQ4NjlmY2M4NGIyLi5lOGFiNDNmYjQ5ODMwYTFj NmQ0OGI5MWMxYjFiZGFkZDlkYzUzYTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5lbC5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5l bC5qcwpAQCAtNjkyLDE2ICs2OTIsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFu ZWwgPSBjbGFzcyBEZWJ1Z2dlclNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAgICAg ICBpZiAoIXRyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIC8vIERl c2VsZWN0IGFueSBvdGhlciB0cmVlIGVsZW1lbnRzIHRvIHByZXZlbnQgdHdvIHNlbGVjdGlvbnMg aW4gdGhlIHNpZGViYXIuCi0gICAgICAgIGZvciAobGV0IHRyZWVPdXRsaW5lIG9mIHRoaXMudmlz aWJsZUNvbnRlbnRUcmVlT3V0bGluZXMpIHsKLSAgICAgICAgICAgIGlmICh0cmVlT3V0bGluZSA9 PT0gdHJlZUVsZW1lbnQudHJlZU91dGxpbmUpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0K LSAgICAgICAgICAgIGxldCBzZWxlY3RlZFRyZWVFbGVtZW50ID0gdHJlZU91dGxpbmUuc2VsZWN0 ZWRUcmVlRWxlbWVudDsKLSAgICAgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50KQotICAg ICAgICAgICAgICAgIHNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKLSAgICAgICAgfQot CiAgICAgICAgIGlmICh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVFbGVtZW50IHx8IHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlw dFRyZWVFbGVtZW50KSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGUo dHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggZmE0N2M5MGZkNGZiOTNhZGUw YTA1Njg4ZGIyMTYyNDA1YzE0ZmRhOC4uMTQ3YjViNDE5ODgxZmU4Y2NiNDBiYWEwODhmMjk5MGZl OGZkNmEyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC0xNTIs NiArMTUyLDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBO YXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgY29udGVudFRyZWVP dXRsaW5lLmFsbG93c1JlcGVhdFNlbGVjdGlvbiA9IHRydWU7CiAgICAgICAgIGNvbnRlbnRUcmVl T3V0bGluZS5oaWRkZW4gPSAhZG9udEhpZGVCeURlZmF1bHQ7CiAgICAgICAgIGNvbnRlbnRUcmVl T3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRl YmFyUGFuZWwuQ29udGVudFRyZWVPdXRsaW5lRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKKyAgICAg ICAgY29udGVudFRyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRyZWVP dXRsaW5lLkV2ZW50LlNlbGVjdGlvbkRpZENoYW5nZSwgdGhpcy5fY29udGVudFRyZWVPdXRsaW5l VHJlZVNlbGVjdGlvbkRpZENoYW5nZSwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5jb250ZW50Vmll dy5lbGVtZW50LmFwcGVuZENoaWxkKGNvbnRlbnRUcmVlT3V0bGluZS5lbGVtZW50KTsKIApAQCAt MTU5LDcgKzE2MCw2IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xh c3MgTmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluCiAgICAgICAgICAgICBjb250 ZW50VHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUu RXZlbnQuRWxlbWVudEFkZGVkLCB0aGlzLl90cmVlRWxlbWVudEFkZGVkT3JDaGFuZ2VkLCB0aGlz KTsKICAgICAgICAgICAgIGNvbnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5UcmVlT3V0bGluZS5FdmVudC5FbGVtZW50RGlkQ2hhbmdlLCB0aGlzLl90cmVlRWxl bWVudEFkZGVkT3JDaGFuZ2VkLCB0aGlzKTsKICAgICAgICAgICAgIGNvbnRlbnRUcmVlT3V0bGlu ZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5FdmVudC5FbGVtZW50 RGlzY2xvc3VyZURpZENoYW5nZWQsIHRoaXMuX3RyZWVFbGVtZW50RGlzY2xvc3VyZURpZENoYW5n ZSwgdGhpcyk7Ci0gICAgICAgICAgICBjb250ZW50VHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUuRXZlbnQuU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlz Ll90cmVlU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgfQogCiAgICAgICAgIGNv bnRlbnRUcmVlT3V0bGluZVtXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5TdXBw cmVzc0ZpbHRlcmluZ1N5bWJvbF0gPSBzdXBwcmVzc0ZpbHRlcmluZzsKQEAgLTQyOCwxMSArNDI4 LDYgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0 aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgdHJlZUVsZW1lbnQuaGlkZGVu ID0gdHJ1ZTsKICAgICB9CiAKLSAgICB0cmVlRWxlbWVudEFkZGVkT3JDaGFuZ2VkKHRyZWVFbGVt ZW50KQotICAgIHsKLSAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkgc3ViY2xhc3NlcyBpZiBuZWVk ZWQuCi0gICAgfQotCiAgICAgc2hvdygpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMucGFyZW50 U2lkZWJhcikKQEAgLTQ4NSw2ICs0ODAsMTEgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRl YmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAg ICAgICAgfQogICAgIH0KIAorICAgIHRyZWVFbGVtZW50QWRkZWRPckNoYW5nZWQodHJlZUVsZW1l bnQpCisgICAgeworICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGlmIG5lZWRl ZC4KKyAgICB9CisKICAgICAvLyBQcml2YXRlCiAKICAgICBfdXBkYXRlQ29udGVudE92ZXJmbG93 U2hhZG93VmlzaWJpbGl0eSgpCkBAIC02NDYsMTAgKzY0NiwyMiBAQCBXZWJJbnNwZWN0b3IuTmF2 aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5k cyBXZWJJbgogICAgICAgICB0aGlzLnNvb24uX3VwZGF0ZUNvbnRlbnRPdmVyZmxvd1NoYWRvd1Zp c2liaWxpdHkoKTsKICAgICB9CiAKLSAgICBfdHJlZVNlbGVjdGlvbkRpZENoYW5nZShldmVudCkK KyAgICBfY29udGVudFRyZWVPdXRsaW5lVHJlZVNlbGVjdGlvbkRpZENoYW5nZShldmVudCkKICAg ICB7Ci0gICAgICAgIGxldCBzZWxlY3RlZEVsZW1lbnQgPSBldmVudC5kYXRhLnNlbGVjdGVkRWxl bWVudDsKLSAgICAgICAgdGhpcy5fc2VsZWN0ZWRDb250ZW50VHJlZU91dGxpbmUgPSBzZWxlY3Rl ZEVsZW1lbnQgPyBzZWxlY3RlZEVsZW1lbnQudHJlZU91dGxpbmUgOiBudWxsOworICAgICAgICBs ZXQgdHJlZUVsZW1lbnQgPSBldmVudC5kYXRhLnNlbGVjdGVkRWxlbWVudDsKKyAgICAgICAgaWYg KCF0cmVlRWxlbWVudCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9zZWxl Y3RlZENvbnRlbnRUcmVlT3V0bGluZSA9IHRyZWVFbGVtZW50LnRyZWVPdXRsaW5lOworCisgICAg ICAgIC8vIERlc2VsZWN0IGFueSBvdGhlciB0cmVlIGVsZW1lbnRzIHRvIHByZXZlbnQgdHdvIHNl bGVjdGlvbnMgaW4gdGhlIHNpZGViYXIuCisgICAgICAgIGZvciAobGV0IHRyZWVPdXRsaW5lIG9m IHRoaXMudmlzaWJsZUNvbnRlbnRUcmVlT3V0bGluZXMpIHsKKyAgICAgICAgICAgIGlmICh0cmVl T3V0bGluZSA9PT0gdGhpcy5fc2VsZWN0ZWRDb250ZW50VHJlZU91dGxpbmUpCisgICAgICAgICAg ICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGlmICh0cmVlT3V0bGluZS5zZWxlY3RlZFRy ZWVFbGVtZW50KQorICAgICAgICAgICAgICAgIHRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1l bnQuZGVzZWxlY3QoKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIF9jaGVja0ZvclN0YWxlUmVz b3VyY2VzSWZOZWVkZWQoKQo=