19583 2008-06-16 09:44:50 -0700 Use tabIndex in the Web Inspector for focusable areas 2008-06-17 15:34:12 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Trivial --- 1 timothy timothy oldest_to_newest 83474 0 timothy 2008-06-16 09:44:50 -0700 The Web Inspector has it's own code for marking and tracking focusable areas. We should sue tabIndex now that it can focus any element. 83475 1 timothy 2008-06-16 09:45:05 -0700 I have a fix for this. 83505 2 21737 timothy 2008-06-16 11:34:51 -0700 Created attachment 21737 Proposed patch 83629 3 21737 aroben 2008-06-17 13:50:14 -0700 Comment on attachment 21737 Proposed patch - if (WebInspector.currentFocusElement === this.messagesElement) - WebInspector.currentFocusElement = this._previousFocusElement; - delete this._previousFocusElement; + if (this.element === WebInspector.currentFocusElement || this.element.isAncestor(WebInspector.currentFocusElement)) + WebInspector.currentFocusElement = WebInspector.previousFocusElement; This seems like a change in behavior. You do a similar check at the end of this patch. Can you explain it in the ChangeLog? r=me 83646 4 timothy 2008-06-17 15:34:12 -0700 Landed in r34631. 21737 2008-06-16 11:34:51 -0700 2008-06-17 13:50:14 -0700 Proposed patch 0001-Use-tabIndex-in-the-Web-Inspector-for-focusa.patch text/plain 21778 timothy RnJvbSA5NDBkNTA5MjhlNzJkMzA4MDhlMWZlMjNhY2JkY2I4OTZhMDk0ZGMzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBNb24sIDE2IEp1biAyMDA4IDEwOjI0OjEwIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gICAg ICAgICBVc2UgdGFiSW5kZXggaW4gdGhlIFdlYiBJbnNwZWN0b3IgZm9yIGZvY3VzYWJsZSBhcmVh cy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTgz CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIHBhZ2UvaW5z cGVjdG9yL0NvbnNvbGUuanM6CiAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlKTogTm8gbG9u Z2VyIG1ha2UgdGhlIG1lc3NhZ2VzRWxlbWVudAogICAgICAgIGZvY3VzYWJsZSBzaW5jZSB0aGUg ZW5naW5lIGhhbmRsZXMgdGhlIGNhc2UgZm9yIHVzLiBUaGUgcHJvbXB0RWxlbWVudAogICAgICAg IG5vdyBoYW5kbGVzIHRoZSBrZXkgZXZlbnRzLgogICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29s ZS5wcm90b3R5cGUuc2hvdyk6IFNldCB0aGUgY3VycmVudCBmb2N1cyBlbGVtZW50CiAgICAgICAg dG8gdGhlIHByb21wdCBlbGVtZW50LgogICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZS5wcm90 b3R5cGUuaGlkZSk6IFNldCB0aGUgY3VycmVudCBmb2N1cyBlbGVtZW50CiAgICAgICAgdG8gV2Vi SW5zcGVjdG9yLnByZXZpb3VzRm9jdXNFbGVtZW50LgogICAgICAgIChXZWJJbnNwZWN0b3IuQ29u c29sZS5wcm90b3R5cGUuX21lc3NhZ2VzRm9jdXNlZCk6IFJlbW92ZWQuCiAgICAgICAgKiBwYWdl L2luc3BlY3Rvci9EYXRhR3JpZC5qczoKICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkKTog UmVtb3ZlIHRoZSBmb2N1c2FibGUgY2xhc3MuCiAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9EYXRh YmFzZVF1ZXJ5Vmlldy5qczoKICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3 KTogUmVtb3ZlIHRoZSBmb2N1c2FibGUgY2xhc3MuIFNldAogICAgICAgIHRhYkluZGV4IHRvIDAu IFRoZSBwcm9tcHRFbGVtZW50IG5vdyBoYW5kbGVzIHRoZSBrZXkgZXZlbnRzLgogICAgICAgIChX ZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlLl9mb2N1c2VkKTogUmVtb3Zl ZC4KICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6IFVwZGF0ZWQgc2VsZWN0 b3JzIHRvIHVzZSA6Zm9jdXMKICAgICAgICBpbnN0ZWFkIG9mIC5mb2N1c2VkIGFuZCAuYmx1cnJl ZC4KICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sOiBSZW1vdmVkIGZvY3Vz YWJsZSwgZm9jdXNlZCBhbmQgYmx1cnJlZAogICAgICAgIGNsYXNzZXMgYW5kIGFkZGVkIHRhYmlu ZGV4IGF0dHJpYnV0ZXMuCiAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6CiAg ICAgICAgKFdlYkluc3BlY3Rvci5nZXQgcHJldmlvdXNGb2N1c0VsZW1lbnQpOiBBZGRlZC4gUmV0 dXJucyBfcHJldmlvdXNGb2N1c0VsZW1lbnQuCiAgICAgICAgKFdlYkluc3BlY3Rvci5zZXQgY3Vy cmVudEZvY3VzRWxlbWVudCk6IFNpbXBsaWZpZWQuIFN0b3JlcyB0aGUgcHJldmlvdXMgZWxlbWVu dAogICAgICAgIGluIF9wcmV2aW91c0ZvY3VzRWxlbWVudCBmb3IgY2xpZW50cyB0aGF0IG5lZWQg aXQuIENhbGxzIGZvY3VzIG9uIHRoZSBwYXNzZWQKICAgICAgICBpbiBlbGVtZW50IG9yIGJsdXIg b24gdGhlIHByZXZpb3VzIGVsZW1lbnQuCiAgICAgICAgKFdlYkluc3BlY3Rvci5sb2FkZWQpOiBS ZW1vdmVkIHRoZSBldmVudCBsaXN0ZW5lciBmb3IgbW91c2Vkb3duLiBSZW5hbWVkCiAgICAgICAg Y2hhbmdlRm9jdXMgdG8gZm9jdXNDaGFuZ2VkLgogICAgICAgIChXZWJJbnNwZWN0b3IuZm9jdXND aGFuZ2VkKTogUmVuYW1lZCBmcm9tIGNoYW5nZUZvY3VzLiBKdXN0IHNldHMgdGhlCiAgICAgICAg Y3VycmVudEZvY3VzRWxlbWVudCB0byB0aGUgZXZlbnQgdGFyZ2V0LgogICAgICAgIChXZWJJbnNw ZWN0b3Iuc3RhcnRFZGl0aW5nKTogQ2hhbmdlZCB0byB1c2UgdGFiSW5kZXggYW5kIGJsdXIgZXZl bnRzLgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg IDM3ICsrKysrKysrKysrKysrKwogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Db25zb2xlLmpzICAg ICAgICAgICB8ICAgMjAgKystLS0tLS0tCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0RhdGFHcmlk LmpzICAgICAgICAgIHwgICAgMiArLQogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9EYXRhYmFzZVF1 ZXJ5Vmlldy5qcyB8ICAgMTIgKy0tLS0KIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9y LmNzcyAgICAgICAgfCAgIDYxICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIFdlYkNvcmUvcGFn ZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwgICAgICAgfCAgICA2ICstCiBXZWJDb3JlL3BhZ2Uv aW5zcGVjdG9yL2luc3BlY3Rvci5qcyAgICAgICAgIHwgICA2NiArKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0KIDcgZmlsZXMgY2hhbmdlZCwgOTQgaW5zZXJ0aW9ucygrKSwgMTEwIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggM2Q1ZjMxMi4uZDU5OTU5MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAwOC0wNi0xNiAgVGltb3Ro eSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHRhYkluZGV4IGlu IHRoZSBXZWIgSW5zcGVjdG9yIGZvciBmb2N1c2FibGUgYXJlYXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU4MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvQ29uc29sZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlKTogTm8gbG9uZ2VyIG1ha2UgdGhlIG1l c3NhZ2VzRWxlbWVudAorICAgICAgICBmb2N1c2FibGUgc2luY2UgdGhlIGVuZ2luZSBoYW5kbGVz IHRoZSBjYXNlIGZvciB1cy4gVGhlIHByb21wdEVsZW1lbnQKKyAgICAgICAgbm93IGhhbmRsZXMg dGhlIGtleSBldmVudHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZS5wcm90b3R5cGUu c2hvdyk6IFNldCB0aGUgY3VycmVudCBmb2N1cyBlbGVtZW50CisgICAgICAgIHRvIHRoZSBwcm9t cHQgZWxlbWVudC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlLnByb3RvdHlwZS5oaWRl KTogU2V0IHRoZSBjdXJyZW50IGZvY3VzIGVsZW1lbnQKKyAgICAgICAgdG8gV2ViSW5zcGVjdG9y LnByZXZpb3VzRm9jdXNFbGVtZW50LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJv dG90eXBlLl9tZXNzYWdlc0ZvY3VzZWQpOiBSZW1vdmVkLgorICAgICAgICAqIHBhZ2UvaW5zcGVj dG9yL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkKTogUmVtb3Zl IHRoZSBmb2N1c2FibGUgY2xhc3MuCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvRGF0YWJhc2VR dWVyeVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcpOiBS ZW1vdmUgdGhlIGZvY3VzYWJsZSBjbGFzcy4gU2V0CisgICAgICAgIHRhYkluZGV4IHRvIDAuIFRo ZSBwcm9tcHRFbGVtZW50IG5vdyBoYW5kbGVzIHRoZSBrZXkgZXZlbnRzLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3LnByb3RvdHlwZS5fZm9jdXNlZCk6IFJlbW92ZWQu CisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzczogVXBkYXRlZCBzZWxlY3Rv cnMgdG8gdXNlIDpmb2N1cworICAgICAgICBpbnN0ZWFkIG9mIC5mb2N1c2VkIGFuZCAuYmx1cnJl ZC4KKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbDogUmVtb3ZlZCBmb2N1 c2FibGUsIGZvY3VzZWQgYW5kIGJsdXJyZWQKKyAgICAgICAgY2xhc3NlcyBhbmQgYWRkZWQgdGFi aW5kZXggYXR0cmlidXRlcy4KKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuZ2V0IHByZXZpb3VzRm9jdXNFbGVtZW50KTogQWRkZWQu IFJldHVybnMgX3ByZXZpb3VzRm9jdXNFbGVtZW50LgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNl dCBjdXJyZW50Rm9jdXNFbGVtZW50KTogU2ltcGxpZmllZC4gU3RvcmVzIHRoZSBwcmV2aW91cyBl bGVtZW50CisgICAgICAgIGluIF9wcmV2aW91c0ZvY3VzRWxlbWVudCBmb3IgY2xpZW50cyB0aGF0 IG5lZWQgaXQuIENhbGxzIGZvY3VzIG9uIHRoZSBwYXNzZWQKKyAgICAgICAgaW4gZWxlbWVudCBv ciBibHVyIG9uIHRoZSBwcmV2aW91cyBlbGVtZW50LgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxv YWRlZCk6IFJlbW92ZWQgdGhlIGV2ZW50IGxpc3RlbmVyIGZvciBtb3VzZWRvd24uIFJlbmFtZWQK KyAgICAgICAgY2hhbmdlRm9jdXMgdG8gZm9jdXNDaGFuZ2VkLgorICAgICAgICAoV2ViSW5zcGVj dG9yLmZvY3VzQ2hhbmdlZCk6IFJlbmFtZWQgZnJvbSBjaGFuZ2VGb2N1cy4gSnVzdCBzZXRzIHRo ZQorICAgICAgICBjdXJyZW50Rm9jdXNFbGVtZW50IHRvIHRoZSBldmVudCB0YXJnZXQuCisgICAg ICAgIChXZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5nKTogQ2hhbmdlZCB0byB1c2UgdGFiSW5kZXgg YW5kIGJsdXIgZXZlbnRzLgorCiAyMDA4LTA2LTE0ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmVkIHJlZHVuZGFudCBpZiBzdGF0ZW1lbnRzIGFu ZCBlYXJseSByZXR1cm5zIGZyb20KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3Iv Q29uc29sZS5qcyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvQ29uc29sZS5qcwppbmRleCAxMDhk MGZiLi5kZTVmOTYxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0NvbnNvbGUu anMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Db25zb2xlLmpzCkBAIC0zNiwxMiArMzYs OCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZSA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLm1lc3NhZ2Vz RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzZWxlY3RzdGFydCIsIHRoaXMuX21lc3NhZ2VzU2Vs ZWN0U3RhcnQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMubWVzc2FnZXNFbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbWVzc2FnZXNDbGlja2VkLmJpbmQodGhpcyks IHRydWUpOwogCi0gICAgLy8gVGhlIG1lc3NhZ2VzRWxlbWVudCBpcyB0aGUgZm9jdXNhYmxlIGVs ZW1lbnQgc28gY2xpY2tpbmcgYW55d2hlcmUgaW4gdGhlCi0gICAgLy8gY29uc29sZSBhcmVhIHdp bGwgZm9jdXMgdGhlIHByb21wdC4KLSAgICB0aGlzLm1lc3NhZ2VzRWxlbWVudC5mb2N1c2VkID0g dGhpcy5fbWVzc2FnZXNGb2N1c2VkLmJpbmQodGhpcyk7Ci0gICAgdGhpcy5tZXNzYWdlc0VsZW1l bnQuaGFuZGxlS2V5RXZlbnQgPSB0aGlzLl9wcm9tcHRLZXlEb3duLmJpbmQodGhpcyk7Ci0KICAg ICB0aGlzLnByb21wdEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZS1w cm9tcHQiKTsKKyAgICB0aGlzLnByb21wdEVsZW1lbnQuaGFuZGxlS2V5RXZlbnQgPSB0aGlzLl9w cm9tcHRLZXlEb3duLmJpbmQodGhpcyk7CiAgICAgdGhpcy5wcm9tcHQgPSBuZXcgV2ViSW5zcGVj dG9yLlRleHRQcm9tcHQodGhpcy5wcm9tcHRFbGVtZW50LCB0aGlzLmNvbXBsZXRpb25zLmJpbmQo dGhpcyksICIgLj06Wyh7OyIpOwogCiAgICAgdGhpcy50b2dnbGVCdXR0b24gPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiY29uc29sZS1zdGF0dXMtYmFyLWl0ZW0iKTsKQEAgLTg1LDcgKzgxLDcg QEAgV2ViSW5zcGVjdG9yLkNvbnNvbGUucHJvdG90eXBlID0gewogICAgICAgICB7CiAgICAgICAg ICAgICBpZiAoInVwZGF0ZVN0YXR1c0Jhckl0ZW1zIiBpbiBXZWJJbnNwZWN0b3IuY3VycmVudFBh bmVsKQogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50UGFuZWwudXBkYXRlU3Rh dHVzQmFySXRlbXMoKTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50Rm9jdXNFbGVt ZW50ID0gdGhpcy5tZXNzYWdlc0VsZW1lbnQ7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3Vy cmVudEZvY3VzRWxlbWVudCA9IHRoaXMucHJvbXB0RWxlbWVudDsKICAgICAgICAgICAgIGRlbGV0 ZSB0aGlzLl9hbmltYXRpbmc7CiAgICAgICAgIH0KIApAQCAtMTA3LDkgKzEwMyw4IEBAIFdlYklu c3BlY3Rvci5Db25zb2xlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy50b2dnbGVCdXR0b24u cmVtb3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwogICAgICAgICB0aGlzLnRvZ2dsZUJ1dHRv bi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyBjb25zb2xlLiIpOwogCi0gICAg ICAgIGlmIChXZWJJbnNwZWN0b3IuY3VycmVudEZvY3VzRWxlbWVudCA9PT0gdGhpcy5tZXNzYWdl c0VsZW1lbnQpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3VycmVudEZvY3VzRWxlbWVudCA9 IHRoaXMuX3ByZXZpb3VzRm9jdXNFbGVtZW50OwotICAgICAgICBkZWxldGUgdGhpcy5fcHJldmlv dXNGb2N1c0VsZW1lbnQ7CisgICAgICAgIGlmICh0aGlzLmVsZW1lbnQgPT09IFdlYkluc3BlY3Rv ci5jdXJyZW50Rm9jdXNFbGVtZW50IHx8IHRoaXMuZWxlbWVudC5pc0FuY2VzdG9yKFdlYkluc3Bl Y3Rvci5jdXJyZW50Rm9jdXNFbGVtZW50KSkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jdXJy ZW50Rm9jdXNFbGVtZW50ID0gV2ViSW5zcGVjdG9yLnByZXZpb3VzRm9jdXNFbGVtZW50OwogCiAg ICAgICAgIHZhciBhbmNob3JlZEl0ZW1zID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFuY2hv cmVkLXN0YXR1cy1iYXItaXRlbXMiKTsKIApAQCAtMjY0LDEzICsyNTksNiBAQCBXZWJJbnNwZWN0 b3IuQ29uc29sZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMucHJvbXB0LmhhbmRsZUtleUV2 ZW50KGV2ZW50KTsKICAgICB9LAogCi0gICAgX21lc3NhZ2VzRm9jdXNlZDogZnVuY3Rpb24ocHJl dmlvdXNGb2N1c0VsZW1lbnQpCi0gICAgewotICAgICAgICB0aGlzLl9wcmV2aW91c0ZvY3VzRWxl bWVudCA9IHByZXZpb3VzRm9jdXNFbGVtZW50OwotICAgICAgICBpZiAoIXRoaXMucHJvbXB0Lmlz Q2FyZXRJbnNpZGVQcm9tcHQoKSkKLSAgICAgICAgICAgIHRoaXMucHJvbXB0Lm1vdmVDYXJldFRv RW5kT2ZQcm9tcHQoKTsKLSAgICB9LAotCiAgICAgX3N0YXJ0U3RhdHVzQmFyRHJhZ2dpbmc6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLnZpc2libGUgfHwgZXZlbnQu dGFyZ2V0ICE9PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWFpbi1zdGF0dXMtYmFyIikpCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0RhdGFHcmlkLmpzIGIvV2ViQ29yZS9w YWdlL2luc3BlY3Rvci9EYXRhR3JpZC5qcwppbmRleCAwMWMyNTljLi42ZjEwM2VkIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0RhdGFHcmlkLmpzCisrKyBiL1dlYkNvcmUvcGFn ZS9pbnNwZWN0b3IvRGF0YUdyaWQuanMKQEAgLTI2LDcgKzI2LDcgQEAKIFdlYkluc3BlY3Rvci5E YXRhR3JpZCA9IGZ1bmN0aW9uKGNvbHVtbnMpCiB7CiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJk YXRhLWdyaWQgZm9jdXNhYmxlIjsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gImRhdGEt Z3JpZCI7CiAgICAgdGhpcy5lbGVtZW50LnRhYkluZGV4ID0gMDsKICAgICB0aGlzLmVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX2tleURvd24uYmluZCh0aGlzKSwgZmFs c2UpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0RhdGFiYXNlUXVlcnlW aWV3LmpzIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9EYXRhYmFzZVF1ZXJ5Vmlldy5qcwppbmRl eCBhYzMwMGIyLi42YTkxNjI1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0Rh dGFiYXNlUXVlcnlWaWV3LmpzCisrKyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvRGF0YWJhc2VR dWVyeVZpZXcuanMKQEAgLTMxLDE1ICszMSwxNCBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVy eVZpZXcgPSBmdW5jdGlvbihkYXRhYmFzZSkKIAogICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNs YXNzKCJkYXRhYmFzZS12aWV3Iik7CiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInF1 ZXJ5Iik7Ci0gICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImZvY3VzYWJsZSIpOworICAg IHRoaXMuZWxlbWVudC50YWJJbmRleCA9IDA7CiAKICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigic2VsZWN0c3RhcnQiLCB0aGlzLl9zZWxlY3RTdGFydC5iaW5kKHRoaXMpLCBmYWxz ZSk7Ci0gICAgdGhpcy5lbGVtZW50LmZvY3VzZWQgPSB0aGlzLl9mb2N1c2VkLmJpbmQodGhpcyk7 Ci0gICAgdGhpcy5lbGVtZW50LmhhbmRsZUtleUV2ZW50ID0gdGhpcy5fcHJvbXB0S2V5RG93bi5i aW5kKHRoaXMpOwogCiAgICAgdGhpcy5wcm9tcHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CiAgICAgdGhpcy5wcm9tcHRFbGVtZW50LmNsYXNzTmFtZSA9ICJkYXRhYmFz ZS1xdWVyeS1wcm9tcHQiOwogICAgIHRoaXMucHJvbXB0RWxlbWVudC5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJiciIpKTsKKyAgICB0aGlzLnByb21wdEVsZW1lbnQuaGFuZGxl S2V5RXZlbnQgPSB0aGlzLl9wcm9tcHRLZXlEb3duLmJpbmQodGhpcyk7CiAgICAgdGhpcy5lbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMucHJvbXB0RWxlbWVudCk7CiAKICAgICB0aGlzLnByb21wdCA9 IG5ldyBXZWJJbnNwZWN0b3IuVGV4dFByb21wdCh0aGlzLnByb21wdEVsZW1lbnQsIHRoaXMuY29t cGxldGlvbnMuYmluZCh0aGlzKSwgIiAiKTsKQEAgLTEwMCwxMyArOTksNiBAQCBXZWJJbnNwZWN0 b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnByb21wdC5o YW5kbGVLZXlFdmVudChldmVudCk7CiAgICAgfSwKIAotICAgIF9mb2N1c2VkOiBmdW5jdGlvbihw cmV2aW91c0ZvY3VzRWxlbWVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3ByZXZpb3VzRm9jdXNF bGVtZW50ID0gcHJldmlvdXNGb2N1c0VsZW1lbnQ7Ci0gICAgICAgIGlmICghdGhpcy5wcm9tcHQu aXNDYXJldEluc2lkZVByb21wdCgpKQotICAgICAgICAgICAgdGhpcy5wcm9tcHQubW92ZUNhcmV0 VG9FbmRPZlByb21wdCgpOwotICAgIH0sCi0KICAgICBfc2VsZWN0U3RhcnQ6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGlvblRpbWVvdXQpCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MgYi9XZWJDb3JlL3BhZ2Uv aW5zcGVjdG9yL2luc3BlY3Rvci5jc3MKaW5kZXggMjBjNDZmOC4uNmNjOWQ5NSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvcGFn ZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwpAQCAtNDIsNiArNDIsMTQgQEAgYm9keSB7CiAgICAg LXdlYmtpdC1ib3gtc2l6aW5nOiBib3JkZXItYm94OwogfQogCis6Zm9jdXMgeworICAgIG91dGxp bmU6IG5vbmU7Cit9CisKK2lucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzLCBpbnB1dFt0eXBlPSJ0 ZXh0Il06Zm9jdXMgeworICAgIG91dGxpbmU6IGF1dG8gNXB4IC13ZWJraXQtZm9jdXMtcmluZy1j b2xvcjsKK30KKwogaWZyYW1lLCBhIGltZyB7CiAgICAgYm9yZGVyOiBub25lOwogfQpAQCAtOTQs NyArMTAyLDYgQEAgYm9keS5hdHRhY2hlZC5pbmFjdGl2ZSAjdG9vbGJhciB7CiAgICAgYmFja2dy b3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLXN0eWxlOiBub25lOwogICAgIGJv cmRlci1jb2xvcjogdHJhbnNwYXJlbnQ7Ci0gICAgb3V0bGluZTogbm9uZTsKICAgICAtd2Via2l0 LWJveC1vcmllbnQ6IHZlcnRpY2FsOwogICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7CiAg ICAgLXdlYmtpdC1ib3gtcGFjazogZW5kOwpAQCAtMTg4LDE1ICsxOTUsMTEgQEAgYm9keS5hdHRh Y2hlZCAjc2VhcmNoLXRvb2xiYXItbGFiZWwgewogICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiB9 CiAKLS5zZWxlY3RlZCAuc2VhcmNoLXJlc3VsdHMtc2VjdGlvbiB7Cis6Zm9jdXMgLnNlbGVjdGVk IC5zZWFyY2gtcmVzdWx0cy1zZWN0aW9uIHsKICAgICBjb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1 LCAwLjgpOwogfQogCi1ib2R5LmluYWN0aXZlIC5mb2N1c2VkIC5zZWxlY3RlZCAuc2VhcmNoLXJl c3VsdHMtc2VjdGlvbiB7Ci0gICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC41KTsKLX0KLQotLmJs dXJyZWQgLnNlbGVjdGVkIC5zZWFyY2gtcmVzdWx0cy1zZWN0aW9uIHsKKy5zZWxlY3RlZCAuc2Vh cmNoLXJlc3VsdHMtc2VjdGlvbiB7CiAgICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC41KTsKIH0K IApAQCAtMzAzLDcgKzMwNiw2IEBAIGJ1dHRvbi5zdGF0dXMtYmFyLWl0ZW0gewogICAgIHdpZHRo OiAzMnB4OwogICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybChJbWFnZXMvc3RhdHVzYmFyQnV0dG9u cy5wbmcpOwogICAgIGJhY2tncm91bmQtcG9zaXRpb246IDAgMDsKLSAgICBvdXRsaW5lOiBub25l OwogfQogCiBidXR0b24uc3RhdHVzLWJhci1pdGVtOmFjdGl2ZSB7CkBAIC0zMTgsNyArMzIwLDYg QEAgYnV0dG9uLnN0YXR1cy1iYXItaXRlbTpkaXNhYmxlZCB7CiBzZWxlY3Quc3RhdHVzLWJhci1p dGVtIHsKICAgICBtaW4td2lkdGg6IDQ4cHg7CiAgICAgYm9yZGVyLXdpZHRoOiAwIDE3cHggMCAy cHg7Ci0gICAgb3V0bGluZTogbm9uZTsKICAgICBwYWRkaW5nOiAwIDJweCAwIDZweDsKICAgICBm b250LXdlaWdodDogYm9sZDsKICAgICBjb2xvcjogcmdiKDQ4LCA0OCwgNDgpOwpAQCAtNDQ4LDcg KzQ0OSw2IEBAIGJvZHkuY29uc29sZS12aXNpYmxlICNjb25zb2xlIHsKIAogI2NvbnNvbGUtcHJv bXB0IHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgb3V0bGluZTogbm9uZTsKICAgICBw YWRkaW5nOiAxcHggMjJweCAxcHggMjRweDsKICAgICBtaW4taGVpZ2h0OiAxNnB4OyAKICAgICB3 aGl0ZS1zcGFjZTogcHJlLXdyYXA7CkBAIC04MTcsMTYgKzgxNywxMyBAQCBib2R5LmNvbnNvbGUt dmlzaWJsZSAjY29uc29sZSB7CiAKIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkuc2VsZWN0ZWQgLnNl bGVjdGlvbiB7CiAgICAgZGlzcGxheTogYmxvY2s7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDIxMiwgMjEyLCAyMTIpOwogfQogCi0uZm9jdXNlZCAub3V0bGluZS1kaXNjbG9zdXJlIGxpLnNl bGVjdGVkIC5zZWxlY3Rpb24geworOmZvY3VzIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkuc2VsZWN0 ZWQgLnNlbGVjdGlvbiB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDU2LCAxMjEsIDIxNyk7 CiB9CiAKLS5ibHVycmVkIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkuc2VsZWN0ZWQgLnNlbGVjdGlv biwgYm9keS5pbmFjdGl2ZSAub3V0bGluZS1kaXNjbG9zdXJlIGxpLnNlbGVjdGVkIC5zZWxlY3Rp b24gewotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMTIsIDIxMiwgMjEyKTsKLX0KLQogLm91 dGxpbmUtZGlzY2xvc3VyZSA+IG9sIHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgICAgcGFk ZGluZzogMnB4IDZweCAhaW1wb3J0YW50OwpAQCAtODUxLDEyICs4NDgsMTIgQEAgYm9keS5jb25z b2xlLXZpc2libGUgI2NvbnNvbGUgewogICAgIHRleHQtaW5kZW50OiAtMnB4CiB9CiAKLS5ibHVy cmVkIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkuc2VsZWN0ZWQsIGJvZHkuaW5hY3RpdmUgLm91dGxp bmUtZGlzY2xvc3VyZSBsaS5zZWxlY3RlZCB7Ci0gICAgY29sb3I6IGJsYWNrOworOmZvY3VzIC5v dXRsaW5lLWRpc2Nsb3N1cmUgbGkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiB3aGl0ZTsKIH0KIAot Lm91dGxpbmUtZGlzY2xvc3VyZSBsaS5zZWxlY3RlZCB7Ci0gICAgY29sb3I6IHdoaXRlOworOmZv Y3VzIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkuc2VsZWN0ZWQgKiB7CisgICAgY29sb3I6IGluaGVy aXQ7CiB9CiAKIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkucGFyZW50IHsKQEAgLTg3NiwyMyArODcz LDE5IEBAIGJvZHkuY29uc29sZS12aXNpYmxlICNjb25zb2xlIHsKICAgICBwYWRkaW5nLXJpZ2h0 OiAycHg7CiB9CiAKLS5ibHVycmVkIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkucGFyZW50LnNlbGVj dGVkOjpiZWZvcmUsIGJvZHkuaW5hY3RpdmUgLm91dGxpbmUtZGlzY2xvc3VyZSBsaS5wYXJlbnQu c2VsZWN0ZWQ6OmJlZm9yZSB7Cisub3V0bGluZS1kaXNjbG9zdXJlIGxpLnBhcmVudDo6YmVmb3Jl IHsKICAgICBjb250ZW50OiB1cmwoSW1hZ2VzL3RyZWVSaWdodFRyaWFuZ2xlQmxhY2sucG5nKTsK IH0KIAotLm91dGxpbmUtZGlzY2xvc3VyZSBsaS5wYXJlbnQuc2VsZWN0ZWQ6OmJlZm9yZSB7Cis6 Zm9jdXMgLm91dGxpbmUtZGlzY2xvc3VyZSBsaS5wYXJlbnQuc2VsZWN0ZWQ6OmJlZm9yZSB7CiAg ICAgY29udGVudDogdXJsKEltYWdlcy90cmVlUmlnaHRUcmlhbmdsZVdoaXRlLnBuZyk7CiB9CiAK LS5ibHVycmVkIC5vdXRsaW5lLWRpc2Nsb3N1cmUgbGkucGFyZW50LmV4cGFuZGVkLnNlbGVjdGVk OjpiZWZvcmUsIGJvZHkuaW5hY3RpdmUgLm91dGxpbmUtZGlzY2xvc3VyZSBsaS5wYXJlbnQuZXhw YW5kZWQuc2VsZWN0ZWQ6OmJlZm9yZSB7Ci0gICAgY29udGVudDogdXJsKEltYWdlcy90cmVlRG93 blRyaWFuZ2xlQmxhY2sucG5nKTsKLX0KLQogLm91dGxpbmUtZGlzY2xvc3VyZSBsaS5wYXJlbnQu ZXhwYW5kZWQ6OmJlZm9yZSB7CiAgICAgY29udGVudDogdXJsKEltYWdlcy90cmVlRG93blRyaWFu Z2xlQmxhY2sucG5nKTsKIH0KIAotLm91dGxpbmUtZGlzY2xvc3VyZSBsaS5wYXJlbnQuZXhwYW5k ZWQuc2VsZWN0ZWQ6OmJlZm9yZSB7Cis6Zm9jdXMgLm91dGxpbmUtZGlzY2xvc3VyZSBsaS5wYXJl bnQuZXhwYW5kZWQuc2VsZWN0ZWQ6OmJlZm9yZSB7CiAgICAgY29udGVudDogdXJsKEltYWdlcy90 cmVlRG93blRyaWFuZ2xlV2hpdGUucG5nKTsKIH0KIApAQCAtOTQ0LDEwICs5MzcsNiBAQCBib2R5 LmNvbnNvbGUtdmlzaWJsZSAjY29uc29sZSB7CiAgICAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxp bmU7CiB9CiAKLWJvZHk6bm90KC5pbmFjdGl2ZSkgLmZvY3VzZWQgLm91dGxpbmUtZGlzY2xvc3Vy ZSBsaS5zZWxlY3RlZCAqIHsKLSAgICBjb2xvcjogaW5oZXJpdDsKLX0KLQogLnBsYWNhcmQgewog ICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICBtYXJnaW4tdG9wOiAxcHg7CkBAIC05NjcsNyAr OTU2LDcgQEAgYm9keTpub3QoLmluYWN0aXZlKSAuZm9jdXNlZCAub3V0bGluZS1kaXNjbG9zdXJl IGxpLnNlbGVjdGVkICogewogICAgIC13ZWJraXQtYmFja2dyb3VuZC1jbGlwOiBwYWRkaW5nOwog fQogCi0uZm9jdXNlZCAucGxhY2FyZC5zZWxlY3RlZCB7Cis6Zm9jdXMgLnBsYWNhcmQuc2VsZWN0 ZWQgewogICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoNjgsIDEyOCwgMjAwKTsKICAgICBi YWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQg Ym90dG9tLCBmcm9tKHJnYig5MiwgMTQ3LCAyMTMpKSwgdG8ocmdiKDIxLCA4MywgMTcwKSkpOwog fQpAQCAtMTA5Niw3ICsxMDg1LDYgQEAgYm9keS5pbmFjdGl2ZSAucGxhY2FyZC5zZWxlY3RlZCB7 CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiB0ZXh0Owog ICAgIGN1cnNvcjogYXV0bzsKLSAgICBvdXRsaW5lOiBub25lOwogfQogCiAuc2VjdGlvbiAucHJv cGVydGllcyBsaS5wYXJlbnQgewpAQCAtMTQzNCwxMCArMTQyMiw2IEBAIGJvZHkuaW5hY3RpdmUg LnNpZGViYXIgewogICAgIGJvcmRlcjogMXB4IHNvbGlkICNhYWE7CiB9CiAKLS5kYXRhLWdyaWQ6 Zm9jdXMgewotICAgIG91dGxpbmU6IG5vbmU7Ci19Ci0KIC5kYXRhLWdyaWQgdGFibGUgewogICAg IHRhYmxlLWxheW91dDogZml4ZWQ7CiAgICAgYm9yZGVyLXNwYWNpbmc6IDA7CkBAIC0xNjI0LDcg KzE2MDgsNiBAQCBib2R5LmluYWN0aXZlIC5kYXRhLWdyaWQgdGguc29ydC1hc2NlbmRpbmcsIGJv ZHkuaW5hY3RpdmUgLmRhdGEtZ3JpZCB0aC5zb3J0LWRlcwogCiAuZGF0YWJhc2UtcXVlcnktcHJv bXB0IHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgb3V0bGluZTogbm9uZTsKICAgICBw YWRkaW5nOiAxcHggMjJweCAxcHggMjRweDsKICAgICBtaW4taGVpZ2h0OiAxNnB4OyAKICAgICB3 aGl0ZS1zcGFjZTogcHJlLXdyYXA7CkBAIC0yMjcyLDcgKzIyNTUsNyBAQCBib2R5LmluYWN0aXZl IC5zaWRlYmFyLXRyZWUtaXRlbSAuZGlzY2xvc3VyZS1idXR0b246YWN0aXZlIHsKICAgICBjb2xv cjogcmdiKDEzMiwgMTU0LCAxOTApICFpbXBvcnRhbnQ7CiB9CiAKLS5mb2N1c2VkIC5zaWRlYmFy LXRyZWUtaXRlbS5zZWxlY3RlZCAuc3RhdHVzIC5idWJibGUgeworOmZvY3VzIC5zaWRlYmFyLXRy ZWUtaXRlbS5zZWxlY3RlZCAuc3RhdHVzIC5idWJibGUgewogICAgIGNvbG9yOiByZ2IoMzYsIDk4 LCAxNzIpICFpbXBvcnRhbnQ7CiB9CiAKQEAgLTIzMDQsNyArMjI4Nyw3IEBAIGJvZHkuaW5hY3Rp dmUgLnNpZGViYXItdHJlZS1pdGVtLnNlbGVjdGVkIC5zdGF0dXMgLmJ1YmJsZSB7CiAgICAgLXdl YmtpdC1iYWNrZ3JvdW5kLWNsaXA6IHBhZGRpbmc7CiB9CiAKLS5mb2N1c2VkIC5zaWRlYmFyLXRy ZWUtaXRlbS5zZWxlY3RlZCB7Cis6Zm9jdXMgLnNpZGViYXItdHJlZS1pdGVtLnNlbGVjdGVkIHsK ICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDY4LCAxMjgsIDIwMCk7CiAgICAgYmFja2dy b3VuZC1pbWFnZTogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRv bSwgZnJvbShyZ2IoOTIsIDE0NywgMjEzKSksIHRvKHJnYigyMSwgODMsIDE3MCkpKTsKIH0KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwgYi9XZWJDb3Jl L3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sCmluZGV4IGNiMGJmZjguLmZlYmU3M2YgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwKKysrIGIvV2Vi Q29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbApAQCAtNzYsMTMgKzc2LDEzIEBAIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCiAgICAgICAgIDxkaXYgY2xhc3M9InRvb2xiYXItaXRlbSI+PGlucHV0IGlkPSJzZWFy Y2giIHR5cGU9InNlYXJjaCIgcmVzdWx0cz0iMjAiIGluY3JlbWVudGFsPSJpbmNyZW1lbnRhbCIg b25zZWFyY2g9IldlYkluc3BlY3Rvci5wZXJmb3JtU2VhcmNoKHRoaXMudmFsdWUpIj48ZGl2IGlk PSJzZWFyY2gtdG9vbGJhci1sYWJlbCIgY2xhc3M9InRvb2xiYXItbGFiZWwiPjwvZGl2PjwvZGl2 PgogICAgIDwvZGl2PgogICAgIDxkaXYgaWQ9Im1haW4iPgotICAgICAgICA8ZGl2IGlkPSJzZWFy Y2hSZXN1bHRzIiBjbGFzcz0iZm9jdXNhYmxlIGhpZGRlbiI+PC9kaXY+CisgICAgICAgIDxkaXYg aWQ9InNlYXJjaFJlc3VsdHMiIHRhYmluZGV4PSIwIj48L2Rpdj4KICAgICAgICAgPGRpdiBpZD0i c2VhcmNoUmVzdWx0c1Jlc2l6ZXIiIGNsYXNzPSJoaWRkZW4iPjwvZGl2PgotICAgICAgICA8ZGl2 IGlkPSJtYWluLXBhbmVscyIgY2xhc3M9ImZvY3VzYWJsZSBmb2N1c2VkIj48L2Rpdj4KKyAgICAg ICAgPGRpdiBpZD0ibWFpbi1wYW5lbHMiIHRhYmluZGV4PSIwIj48L2Rpdj4KICAgICAgICAgPGRp diBpZD0ibWFpbi1zdGF0dXMtYmFyIiBjbGFzcz0ic3RhdHVzLWJhciI+PGRpdiBpZD0iYW5jaG9y ZWQtc3RhdHVzLWJhci1pdGVtcyI+PGJ1dHRvbiBpZD0iZG9jay1zdGF0dXMtYmFyLWl0ZW0iIGNs YXNzPSJzdGF0dXMtYmFyLWl0ZW0gdG9nZ2xlZCI+PC9idXR0b24+PGJ1dHRvbiBpZD0iY29uc29s ZS1zdGF0dXMtYmFyLWl0ZW0iIGNsYXNzPSJzdGF0dXMtYmFyLWl0ZW0iPjwvYnV0dG9uPjxkaXYg aWQ9ImVycm9yLXdhcm5pbmctY291bnQiIGNsYXNzPSJoaWRkZW4iPjwvZGl2PjwvZGl2PjwvZGl2 PgogICAgIDwvZGl2PgogICAgIDxkaXYgaWQ9ImNvbnNvbGUiPgotICAgICAgICA8ZGl2IGlkPSJj b25zb2xlLW1lc3NhZ2VzIiBjbGFzcz0iZm9jdXNhYmxlIGJsdXJyZWQiPjxkaXYgaWQ9ImNvbnNv bGUtcHJvbXB0Ij48YnI+PC9kaXY+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9ImNvbnNvbGUtbWVz c2FnZXMiPjxkaXYgaWQ9ImNvbnNvbGUtcHJvbXB0Ij48YnI+PC9kaXY+PC9kaXY+CiAgICAgICAg IDxkaXYgaWQ9ImNvbnNvbGUtc3RhdHVzLWJhciIgY2xhc3M9InN0YXR1cy1iYXIiPjxkaXYgaWQ9 Im90aGVyLWNvbnNvbGUtc3RhdHVzLWJhci1pdGVtcyI+PGJ1dHRvbiBpZD0iY2xlYXItY29uc29s ZS1zdGF0dXMtYmFyLWl0ZW0iIGNsYXNzPSJzdGF0dXMtYmFyLWl0ZW0iPjwvYnV0dG9uPjwvZGl2 PjwvZGl2PgogICAgIDwvZGl2PgogPC9ib2R5PgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL2lu c3BlY3Rvci9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5q cwppbmRleCA1MGU5M2ZlLi43NzdkZjIxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVj dG9yL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5q cwpAQCAtNDYsNiArNDYsMTEgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICBzZWFyY2hSZXN1 bHRzSGVpZ2h0OiAxMDAsCiAgICAgbWlzc2luZ0xvY2FsaXplZFN0cmluZ3M6IHt9LAogCisgICAg Z2V0IHByZXZpb3VzRm9jdXNFbGVtZW50KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9w cmV2aW91c0ZvY3VzRWxlbWVudDsKKyAgICB9LAorCiAgICAgZ2V0IGN1cnJlbnRGb2N1c0VsZW1l bnQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQ7CkBA IC01NiwyNSArNjEsMTEgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAgICAgaWYgKCF4IHx8 IHRoaXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQgPT09IHgpCiAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQpIHsKLSAgICAgICAgICAgIHRo aXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiZm9jdXNlZCIpOwotICAg ICAgICAgICAgdGhpcy5fY3VycmVudEZvY3VzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJibHVycmVk Iik7Ci0gICAgICAgICAgICBpZiAodGhpcy5fY3VycmVudEZvY3VzRWxlbWVudC5ibHVyKQotICAg ICAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQuYmx1cigpOwotICAgICAgICAg ICAgaWYgKHRoaXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQuYmx1cnJlZCkKLSAgICAgICAgICAgICAg ICB0aGlzLl9jdXJyZW50Rm9jdXNFbGVtZW50LmJsdXJyZWQoeCk7Ci0gICAgICAgIH0KLQotICAg ICAgICB2YXIgcHJldmlvdXNGb2N1c0VsZW1lbnQgPSB0aGlzLl9jdXJyZW50Rm9jdXNFbGVtZW50 OworICAgICAgICB0aGlzLl9wcmV2aW91c0ZvY3VzRWxlbWVudCA9IHRoaXMuX2N1cnJlbnRGb2N1 c0VsZW1lbnQ7CiAgICAgICAgIHRoaXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQgPSB4OwogCi0gICAg ICAgIGlmICh4KSB7Ci0gICAgICAgICAgICB4LmFkZFN0eWxlQ2xhc3MoImZvY3VzZWQiKTsKLSAg ICAgICAgICAgIHgucmVtb3ZlU3R5bGVDbGFzcygiYmx1cnJlZCIpOwotICAgICAgICAgICAgaWYg KHRoaXMuX2N1cnJlbnRGb2N1c0VsZW1lbnQuZm9jdXMpCi0gICAgICAgICAgICAgICAgdGhpcy5f Y3VycmVudEZvY3VzRWxlbWVudC5mb2N1cygpOwotICAgICAgICAgICAgaWYgKHRoaXMuX2N1cnJl bnRGb2N1c0VsZW1lbnQuZm9jdXNlZCkKLSAgICAgICAgICAgICAgICB0aGlzLl9jdXJyZW50Rm9j dXNFbGVtZW50LmZvY3VzZWQocHJldmlvdXNGb2N1c0VsZW1lbnQpOworICAgICAgICBpZiAodGhp cy5fY3VycmVudEZvY3VzRWxlbWVudCkgeworICAgICAgICAgICAgdGhpcy5fY3VycmVudEZvY3Vz RWxlbWVudC5mb2N1cygpOwogCiAgICAgICAgICAgICAvLyBNYWtlIGEgY2FyZXQgc2VsZWN0aW9u IGluc2lkZSB0aGUgbmV3IGVsZW1lbnQgaWYgdGhlcmUgaXNuJ3QgYSByYW5nZSBzZWxlY3Rpb24g YW5kCiAgICAgICAgICAgICAvLyB0aGVyZSBpc24ndCBhbHJlYWR5IGEgY2FyZXQgc2VsZWN0aW9u IGluc2lkZS4KQEAgLTg3LDcgKzc4LDggQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAgICAg ICAgICAgICBzZWxlY3Rpb24ucmVtb3ZlQWxsUmFuZ2VzKCk7CiAgICAgICAgICAgICAgICAgc2Vs ZWN0aW9uLmFkZFJhbmdlKHNlbGVjdGlvblJhbmdlKTsKICAgICAgICAgICAgIH0KLSAgICAgICAg fQorICAgICAgICB9IGVsc2UgaWYgKHRoaXMuX3ByZXZpb3VzRm9jdXNFbGVtZW50KQorICAgICAg ICAgICAgdGhpcy5fcHJldmlvdXNGb2N1c0VsZW1lbnQuYmx1cigpOwogICAgIH0sCiAKICAgICBn ZXQgY3VycmVudFBhbmVsKCkKQEAgLTMxNyw4ICszMDksNyBAQCBXZWJJbnNwZWN0b3IubG9hZGVk ID0gZnVuY3Rpb24oKQogICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJ1bmxvYWQiLCB0aGlz LndpbmRvd1VubG9hZC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0 ZW5lcigicmVzaXplIiwgdGhpcy53aW5kb3dSZXNpemUuYmluZCh0aGlzKSwgdHJ1ZSk7CiAKLSAg ICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLmNoYW5nZUZvY3Vz LmJpbmQodGhpcyksIHRydWUpOwotICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3Vz IiwgdGhpcy5jaGFuZ2VGb2N1cy5iaW5kKHRoaXMpLCB0cnVlKTsKKyAgICBkb2N1bWVudC5hZGRF dmVudExpc3RlbmVyKCJmb2N1cyIsIHRoaXMuZm9jdXNDaGFuZ2VkLmJpbmQodGhpcyksIHRydWUp OwogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLmRvY3VtZW50 S2V5RG93bi5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVy KCJrZXl1cCIsIHRoaXMuZG9jdW1lbnRLZXlVcC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICBkb2N1 bWVudC5hZGRFdmVudExpc3RlbmVyKCJiZWZvcmVjb3B5IiwgdGhpcy5kb2N1bWVudENhbkNvcHku YmluZCh0aGlzKSwgdHJ1ZSk7CkBAIC0zOTQsMjEgKzM4NSw5IEBAIFdlYkluc3BlY3Rvci53aW5k b3dCbHVyZWQgPSBmdW5jdGlvbihldmVudCkKICAgICAgICAgZG9jdW1lbnQuYm9keS5hZGRTdHls ZUNsYXNzKCJpbmFjdGl2ZSIpOwogfQogCi1XZWJJbnNwZWN0b3IuY2hhbmdlRm9jdXMgPSBmdW5j dGlvbihldmVudCkKK1dlYkluc3BlY3Rvci5mb2N1c0NoYW5nZWQgPSBmdW5jdGlvbihldmVudCkK IHsKLSAgICB2YXIgbmV4dEZvY3VzRWxlbWVudDsKLQotICAgIHZhciBjdXJyZW50ID0gZXZlbnQu dGFyZ2V0OwotICAgIHdoaWxlIChjdXJyZW50KSB7Ci0gICAgICAgIGlmIChjdXJyZW50Lm5vZGVO YW1lLnRvTG93ZXJDYXNlKCkgPT09ICJpbnB1dCIpCi0gICAgICAgICAgICBuZXh0Rm9jdXNFbGVt ZW50ID0gY3VycmVudDsKLSAgICAgICAgY3VycmVudCA9IGN1cnJlbnQucGFyZW50Tm9kZTsKLSAg ICB9Ci0KLSAgICBpZiAoIW5leHRGb2N1c0VsZW1lbnQpCi0gICAgICAgIG5leHRGb2N1c0VsZW1l bnQgPSBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygiZm9jdXNhYmxl Iik7Ci0KLSAgICB0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQgPSBuZXh0Rm9jdXNFbGVtZW50Owor ICAgIHRoaXMuY3VycmVudEZvY3VzRWxlbWVudCA9IGV2ZW50LnRhcmdldDsKIH0KIAogV2ViSW5z cGVjdG9yLmRvY3VtZW50Q2xpY2sgPSBmdW5jdGlvbihldmVudCkKQEAgLTExMzMsMjMgKzExMTIs MjggQEAgV2ViSW5zcGVjdG9yLnN0YXJ0RWRpdGluZyA9IGZ1bmN0aW9uKGVsZW1lbnQsIGNvbW1p dHRlZENhbGxiYWNrLCBjYW5jZWxsZWRDYWxsYmEKIAogICAgIHZhciBvbGRUZXh0ID0gZWxlbWVu dC50ZXh0Q29udGVudDsKICAgICB2YXIgaGFuZGxlS2V5RXZlbnQgPSBlbGVtZW50LmhhbmRsZUtl eUV2ZW50OwotICAgIHZhciBibHVycmVkID0gZWxlbWVudC5ibHVycmVkOwogCiAgICAgZWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJlZGl0aW5nIik7Ci0gICAgZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJm b2N1c2FibGUiKTsKIAotICAgIHZhciBwcmV2aW91c0ZvY3VzRWxlbWVudCA9IFdlYkluc3BlY3Rv ci5jdXJyZW50Rm9jdXNFbGVtZW50OworICAgIHZhciBvbGRUYWJJbmRleCA9IGVsZW1lbnQudGFi SW5kZXg7CisgICAgaWYgKGVsZW1lbnQudGFiSW5kZXggPCAwKQorICAgICAgICBlbGVtZW50LnRh YkluZGV4ID0gMDsKKworICAgIGZ1bmN0aW9uIGJsdXJFdmVudExpc3RlbmVyKCkgeworICAgICAg ICBlZGl0aW5nQ2FuY2VsbGVkLmNhbGwoZWxlbWVudCk7CisgICAgfQogCiAgICAgZnVuY3Rpb24g Y2xlYW5VcEFmdGVyRWRpdGluZygpIHsKICAgICAgICAgZGVsZXRlIHRoaXMuX19lZGl0aW5nOwog CiAgICAgICAgIHRoaXMucmVtb3ZlU3R5bGVDbGFzcygiZWRpdGluZyIpOwotICAgICAgICB0aGlz LnJlbW92ZVN0eWxlQ2xhc3MoImZvY3VzYWJsZSIpOworICAgICAgICB0aGlzLnRhYkluZGV4ID0g b2xkVGFiSW5kZXg7CiAKICAgICAgICAgdGhpcy5oYW5kbGVLZXlFdmVudCA9IGhhbmRsZUtleUV2 ZW50OwotICAgICAgICB0aGlzLmJsdXJyZWQgPSBibHVycmVkOworICAgICAgICBlbGVtZW50LnJl bW92ZUV2ZW50TGlzdGVuZXIoImJsdXIiLCBibHVyRXZlbnRMaXN0ZW5lciwgZmFsc2UpOwogCi0g ICAgICAgIFdlYkluc3BlY3Rvci5jdXJyZW50Rm9jdXNFbGVtZW50ID0gcHJldmlvdXNGb2N1c0Vs ZW1lbnQ7CisgICAgICAgIGlmIChlbGVtZW50ID09PSBXZWJJbnNwZWN0b3IuY3VycmVudEZvY3Vz RWxlbWVudCB8fCBlbGVtZW50LmlzQW5jZXN0b3IoV2ViSW5zcGVjdG9yLmN1cnJlbnRGb2N1c0Vs ZW1lbnQpKQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRGb2N1c0VsZW1lbnQgPSBX ZWJJbnNwZWN0b3IucHJldmlvdXNGb2N1c0VsZW1lbnQ7CiAgICAgfQogCiAgICAgZnVuY3Rpb24g ZWRpdGluZ0NhbmNlbGxlZCgpIHsKQEAgLTExNzcsNyArMTE2MSw3IEBAIFdlYkluc3BlY3Rvci5z dGFydEVkaXRpbmcgPSBmdW5jdGlvbihlbGVtZW50LCBjb21taXR0ZWRDYWxsYmFjaywgY2FuY2Vs bGVkQ2FsbGJhCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBlbGVtZW50LmJsdXJyZWQgPSBmdW5j dGlvbigpIHsgZWRpdGluZ0NhbmNlbGxlZC5jYWxsKGVsZW1lbnQpOyB9CisgICAgZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJibHVyIiwgYmx1ckV2ZW50TGlzdGVuZXIsIGZhbHNlKTsKIAogICAg IFdlYkluc3BlY3Rvci5jdXJyZW50Rm9jdXNFbGVtZW50ID0gZWxlbWVudDsKIH0KLS0gCjEuNS40 LjQKCg==