164655 2016-11-11 14:59:29 -0800 Move to modern TouchBar methods 2016-11-11 16:10:10 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin sam thorton wenson_hsieh oldest_to_newest 1250434 0 bdakin 2016-11-11 14:59:29 -0800 Move to modern TouchBar methods 1250437 1 294546 bdakin 2016-11-11 15:03:56 -0800 Created attachment 294546 Patch 1250474 2 bdakin 2016-11-11 16:10:10 -0800 Thanks Wenson! https://trac.webkit.org/changeset/208623 294546 2016-11-11 15:03:56 -0800 2016-11-11 15:48:23 -0800 Patch for-review.txt text/plain 9149 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODYxMykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTExLTExICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHRvIG1vZGVybiBUb3VjaEJh ciBtZXRob2RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNjQ2NTUKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJv YmxlbS8yOTIyNjkxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGN1c3RvbWl6YXRpb25EZWZhdWx0SXRlbUlkZW50aWZpZXJzIC0+IGRlZmF1bHRJdGVt SWRlbnRpZmllcnMKKyAgICAgICAgaXRlbUlkZW50aWZpZXJzIC0+IGRlZmF1bHRJdGVtSWRlbnRp ZmllcnMKKyAgICAgICAgZGVmYXVsdEl0ZW1zIC0+IHRlbXBsYXRlSXRlbXMKKworICAgICAgICAq IFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6cGxhaW5U ZXh0VG91Y2hCYXJEZWZhdWx0SXRlbUlkZW50aWZpZXJzKToKKyAgICAgICAgKFdlYktpdDo6cmlj aFRleHRUb3VjaEJhckRlZmF1bHRJdGVtSWRlbnRpZmllcnMpOgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWV3SW1wbDo6c2V0VXBUZXh0VG91Y2hCYXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6dXBkYXRlVGV4dFRvdWNoQmFyKToKKyAgICAgICAgKFdlYktpdDo6cGxhaW5UZXh0VG91 Y2hCYXJDdXN0b21pemF0aW9uRGVmYXVsdEl0ZW1JZGVudGlmaWVycyk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJLaXQ6OnJpY2hUZXh0VG91Y2hCYXJDdXN0b21pemF0aW9uRGVmYXVsdEl0ZW1JZGVu dGlmaWVycyk6IERlbGV0ZWQuCisKIDIwMTYtMTEtMTEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hh bUBhcHBsZS5jb20+CiAKICAgICAgICAgR2V0IHJpZCBvZiBvbGQgc2FuZGJveCBydWxlcyBmb3Ig T1MncyB3ZSBubyBsb25nZXIgc3VwcG9ydApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0NvY29hL1dlYlZpZXdJbXBsLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQkocmV2aXNpb24gMjA4NTkzKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05 MDksMTIgKzkwOSwxMiBAQCBzdGF0aWMgTlNBcnJheTxOU1N0cmluZyAqPiAqdGV4dFRvdWNoQmFy CiAgICAgcmV0dXJuIEBbIE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllckNoYXJhY3RlclBpY2tlciwg TlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyVGV4dENvbG9yUGlja2VyLCBOU1RvdWNoQmFySXRlbUlk ZW50aWZpZXJUZXh0U3R5bGUsIE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllclRleHRBbGlnbm1lbnQs IE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllclRleHRMaXN0LCBOU1RvdWNoQmFySXRlbUlkZW50aWZp ZXJGbGV4aWJsZVNwYWNlIF07CiB9CiAKLXN0YXRpYyBOU0FycmF5PE5TU3RyaW5nICo+ICpwbGFp blRleHRUb3VjaEJhckN1c3RvbWl6YXRpb25EZWZhdWx0SXRlbUlkZW50aWZpZXJzKCkKK3N0YXRp YyBOU0FycmF5PE5TU3RyaW5nICo+ICpwbGFpblRleHRUb3VjaEJhckRlZmF1bHRJdGVtSWRlbnRp ZmllcnMoKQogewogICAgIHJldHVybiBAWyBOU1RvdWNoQmFySXRlbUlkZW50aWZpZXJDaGFyYWN0 ZXJQaWNrZXIsIE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllckNhbmRpZGF0ZUxpc3QgXTsKIH0KIAot c3RhdGljIE5TQXJyYXk8TlNTdHJpbmcgKj4gKnJpY2hUZXh0VG91Y2hCYXJDdXN0b21pemF0aW9u RGVmYXVsdEl0ZW1JZGVudGlmaWVycygpCitzdGF0aWMgTlNBcnJheTxOU1N0cmluZyAqPiAqcmlj aFRleHRUb3VjaEJhckRlZmF1bHRJdGVtSWRlbnRpZmllcnMoKQogewogICAgIHJldHVybiBAWyBO U1RvdWNoQmFySXRlbUlkZW50aWZpZXJDaGFyYWN0ZXJQaWNrZXIsIE5TVG91Y2hCYXJJdGVtSWRl bnRpZmllclRleHRGb3JtYXQsIE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllckNhbmRpZGF0ZUxpc3Qg XTsKIH0KQEAgLTkzNCw5ICs5MzQsOSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXRVcFRleHRUb3Vj aEJhcihOU1RvCiB7CiAgICAgYm9vbCBpc1JpY2hUZXh0VG91Y2hCYXIgPSB0b3VjaEJhciA9PSBt X3JpY2hUZXh0VG91Y2hCYXIuZ2V0KCk7CiAgICAgW3RvdWNoQmFyIHNldERlbGVnYXRlOm1fdGV4 dFRvdWNoQmFySXRlbUNvbnRyb2xsZXIuZ2V0KCldOwotICAgIFt0b3VjaEJhciBzZXREZWZhdWx0 SXRlbXM6W05TTXV0YWJsZVNldCBzZXRXaXRoT2JqZWN0OmlzUmljaFRleHRUb3VjaEJhciA/IG1f cmljaFRleHRDYW5kaWRhdGVMaXN0VG91Y2hCYXJJdGVtLmdldCgpIDogbV9wbGFpblRleHRDYW5k aWRhdGVMaXN0VG91Y2hCYXJJdGVtLmdldCgpXV07CisgICAgW3RvdWNoQmFyIHNldFRlbXBsYXRl SXRlbXM6W05TTXV0YWJsZVNldCBzZXRXaXRoT2JqZWN0OmlzUmljaFRleHRUb3VjaEJhciA/IG1f cmljaFRleHRDYW5kaWRhdGVMaXN0VG91Y2hCYXJJdGVtLmdldCgpIDogbV9wbGFpblRleHRDYW5k aWRhdGVMaXN0VG91Y2hCYXJJdGVtLmdldCgpXV07CiAgICAgW3RvdWNoQmFyIHNldEN1c3RvbWl6 YXRpb25BbGxvd2VkSXRlbUlkZW50aWZpZXJzOnRleHRUb3VjaEJhckN1c3RvbWl6YXRpb25BbGxv d2VkSWRlbnRpZmllcnMoKV07Ci0gICAgW3RvdWNoQmFyIHNldEN1c3RvbWl6YXRpb25EZWZhdWx0 SXRlbUlkZW50aWZpZXJzOmlzUmljaFRleHRUb3VjaEJhciA/IHJpY2hUZXh0VG91Y2hCYXJDdXN0 b21pemF0aW9uRGVmYXVsdEl0ZW1JZGVudGlmaWVycygpIDogcGxhaW5UZXh0VG91Y2hCYXJDdXN0 b21pemF0aW9uRGVmYXVsdEl0ZW1JZGVudGlmaWVycygpXTsKKyAgICBbdG91Y2hCYXIgc2V0RGVm YXVsdEl0ZW1JZGVudGlmaWVyczppc1JpY2hUZXh0VG91Y2hCYXIgPyByaWNoVGV4dFRvdWNoQmFy RGVmYXVsdEl0ZW1JZGVudGlmaWVycygpIDogcGxhaW5UZXh0VG91Y2hCYXJEZWZhdWx0SXRlbUlk ZW50aWZpZXJzKCldOwogCiAgICAgaWYgKE5TR3JvdXBUb3VjaEJhckl0ZW0gKnRleHRGb3JtYXRJ dGVtID0gKE5TR3JvdXBUb3VjaEJhckl0ZW0gKilbdG91Y2hCYXIgaXRlbUZvcklkZW50aWZpZXI6 TlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyVGV4dEZvcm1hdF0pCiAgICAgICAgIHRleHRGb3JtYXRJ dGVtLmdyb3VwVG91Y2hCYXIuY3VzdG9taXphdGlvbklkZW50aWZpZXIgPSBAIldLVGV4dEZvcm1h dFRvdWNoQmFyIjsKQEAgLTEwMzQsNyArMTAzNCw3IEBAIHZvaWQgV2ViVmlld0ltcGw6OnVwZGF0 ZVRleHRUb3VjaEJhcigpCiAgICAgfQogCiAgICAgTlNUb3VjaEJhciAqdGV4dFRvdWNoQmFyID0g dGhpcy0+dGV4dFRvdWNoQmFyKCk7Ci0gICAgQk9PTCBpc1Nob3dpbmdDb21iaW5lZFRleHRGb3Jt YXRJdGVtID0gW3RleHRUb3VjaEJhci5pdGVtSWRlbnRpZmllcnMgY29udGFpbnNPYmplY3Q6TlNU b3VjaEJhckl0ZW1JZGVudGlmaWVyVGV4dEZvcm1hdF07CisgICAgQk9PTCBpc1Nob3dpbmdDb21i aW5lZFRleHRGb3JtYXRJdGVtID0gW3RleHRUb3VjaEJhci5kZWZhdWx0SXRlbUlkZW50aWZpZXJz IGNvbnRhaW5zT2JqZWN0Ok5TVG91Y2hCYXJJdGVtSWRlbnRpZmllclRleHRGb3JtYXRdOwogICAg IFt0ZXh0VG91Y2hCYXIgc2V0UHJpbmNpcGFsSXRlbUlkZW50aWZpZXI6aXNTaG93aW5nQ29tYmlu ZWRUZXh0Rm9ybWF0SXRlbSA/IE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllclRleHRGb3JtYXQgOiBu aWxdOwogCiAgICAgLy8gU2V0IGN1cnJlbnQgdHlwaW5nIGF0dHJpYnV0ZXMgZm9yIHJpY2ggdGV4 dC4gVGhpcyB3aWxsIGVuc3VyZSB0aGF0IHRoZSBidXR0b25zIHJlZmxlY3QgdGhlIHN0YXRlIG9m CkBAIC0xMDQ5LDcgKzEwNDksNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVUZXh0VG91Y2hC YXIoKQogICAgICAgICAgICAgW1ttX3RleHRUb3VjaEJhckl0ZW1Db250cm9sbGVyIHRleHRMaXN0 VG91Y2hCYXJWaWV3Q29udHJvbGxlcl0gc2V0Q3VycmVudExpc3RUeXBlOihMaXN0VHlwZSltX3Bh Z2UtPmVkaXRvclN0YXRlKCkucG9zdExheW91dERhdGEoKS5lbmNsb3NpbmdMaXN0VHlwZV07CiAg ICAgICAgICAgICBbbV90ZXh0VG91Y2hCYXJJdGVtQ29udHJvbGxlciBzZXRDdXJyZW50VGV4dEFs aWdubWVudDpuc1RleHRBbGlnbm1lbnRGcm9tVGV4dEFsaWdubWVudCgoVGV4dEFsaWdubWVudCll ZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0YSgpLnRleHRBbGlnbm1lbnQpXTsKICAgICAgICAgfQot ICAgICAgICBCT09MIGlzU2hvd2luZ0NhbmRpZGF0ZUxpc3RJdGVtID0gW3RleHRUb3VjaEJhci5p dGVtSWRlbnRpZmllcnMgY29udGFpbnNPYmplY3Q6TlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyQ2Fu ZGlkYXRlTGlzdF0gJiYgW05TU3BlbGxDaGVja2VyIGlzQXV0b21hdGljVGV4dFJlcGxhY2VtZW50 RW5hYmxlZF07CisgICAgICAgIEJPT0wgaXNTaG93aW5nQ2FuZGlkYXRlTGlzdEl0ZW0gPSBbdGV4 dFRvdWNoQmFyLmRlZmF1bHRJdGVtSWRlbnRpZmllcnMgY29udGFpbnNPYmplY3Q6TlNUb3VjaEJh ckl0ZW1JZGVudGlmaWVyQ2FuZGlkYXRlTGlzdF0gJiYgW05TU3BlbGxDaGVja2VyIGlzQXV0b21h dGljVGV4dFJlcGxhY2VtZW50RW5hYmxlZF07CiAgICAgICAgIFttX3RleHRUb3VjaEJhckl0ZW1D b250cm9sbGVyIHNldFVzZXNOYXJyb3dUZXh0U3R5bGVJdGVtOmlzU2hvd2luZ0NvbWJpbmVkVGV4 dEZvcm1hdEl0ZW0gJiYgaXNTaG93aW5nQ2FuZGlkYXRlTGlzdEl0ZW1dOwogICAgIH0KIH0KSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODYxMykKKysrIFNvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTExLTExICBC ZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHRvIG1vZGVybiBU b3VjaEJhciBtZXRob2RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjQ2NTUKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFy Oi8vcHJvYmxlbS8yOTIyNjkxMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIGN1c3RvbWl6YXRpb25EZWZhdWx0SXRlbUlkZW50aWZpZXJzIC0+IGRlZmF1 bHRJdGVtSWRlbnRpZmllcnMKKyAgICAgICAgaXRlbUlkZW50aWZpZXJzIC0+IGRlZmF1bHRJdGVt SWRlbnRpZmllcnMKKyAgICAgICAgZGVmYXVsdEl0ZW1zIC0+IHRlbXBsYXRlSXRlbXMKKworICAg ICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcGxhaW5UZXh0 VG91Y2hCYXJEZWZhdWx0SXRlbUlkZW50aWZpZXJzXSk6CisgICAgICAgICgtW1dlYlZpZXcgX3Jp Y2hUZXh0VG91Y2hCYXJEZWZhdWx0SXRlbUlkZW50aWZpZXJzXSk6CisgICAgICAgICgtW1dlYlZp ZXcgc2V0VXBUZXh0VG91Y2hCYXI6XSk6CisgICAgICAgICgtW1dlYlZpZXcgdXBkYXRlVGV4dFRv dWNoQmFyXSk6CisgICAgICAgICgtW1dlYlZpZXcgX3BsYWluVGV4dFRvdWNoQmFyQ3VzdG9taXph dGlvbkRlZmF1bHRJdGVtSWRlbnRpZmllcnNdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViVmll dyBfcmljaFRleHRUb3VjaEJhckN1c3RvbWl6YXRpb25EZWZhdWx0SXRlbUlkZW50aWZpZXJzXSk6 IERlbGV0ZWQuCisKIDIwMTYtMTEtMTEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIE1vdmUgTm9kZSBmcm9tIEV4Y2VwdGlvbkNvZGUgdG8gRXhjZXB0aW9uT3IKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHJldmlzaW9uIDIwODU5MykKKysr IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAt OTI5NiwxMiArOTI5NiwxMiBAQCAtIChOU0FycmF5PE5TU3RyaW5nICo+ICopX3RleHRUb3VjaEJh ckN1CiAgICAgcmV0dXJuIEBbIE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllckNoYXJhY3RlclBpY2tl ciwgTlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyVGV4dENvbG9yUGlja2VyLCBOU1RvdWNoQmFySXRl bUlkZW50aWZpZXJUZXh0U3R5bGUsIE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllclRleHRBbGlnbm1l bnQsIE5TVG91Y2hCYXJJdGVtSWRlbnRpZmllclRleHRMaXN0LCBOU1RvdWNoQmFySXRlbUlkZW50 aWZpZXJGbGV4aWJsZVNwYWNlIF07CiB9CiAKLS0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKilfcGxh aW5UZXh0VG91Y2hCYXJDdXN0b21pemF0aW9uRGVmYXVsdEl0ZW1JZGVudGlmaWVycworLSAoTlNB cnJheTxOU1N0cmluZyAqPiAqKV9wbGFpblRleHRUb3VjaEJhckRlZmF1bHRJdGVtSWRlbnRpZmll cnMKIHsKICAgICByZXR1cm4gQFsgTlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyQ2hhcmFjdGVyUGlj a2VyLCBOU1RvdWNoQmFySXRlbUlkZW50aWZpZXJDYW5kaWRhdGVMaXN0IF07CiB9CiAKLS0gKE5T QXJyYXk8TlNTdHJpbmcgKj4gKilfcmljaFRleHRUb3VjaEJhckN1c3RvbWl6YXRpb25EZWZhdWx0 SXRlbUlkZW50aWZpZXJzCistIChOU0FycmF5PE5TU3RyaW5nICo+ICopX3JpY2hUZXh0VG91Y2hC YXJEZWZhdWx0SXRlbUlkZW50aWZpZXJzCiB7CiAgICAgcmV0dXJuIEBbIE5TVG91Y2hCYXJJdGVt SWRlbnRpZmllckNoYXJhY3RlclBpY2tlciwgTlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyVGV4dEZv cm1hdCwgTlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyQ2FuZGlkYXRlTGlzdCBdOwogfQpAQCAtOTMz MiwxMSArOTMzMiwxMSBAQCAtICh2b2lkKXNldFVwVGV4dFRvdWNoQmFyOihOU1RvdWNoQmFyICop CiB7CiAgICAgQk9PTCBpc1JpY2hUZXh0VG91Y2hCYXIgPSB0ZXh0VG91Y2hCYXIgPT0gX3ByaXZh dGUtPl9yaWNoVGV4dFRvdWNoQmFyOwogICAgIFt0ZXh0VG91Y2hCYXIgc2V0RGVsZWdhdGU6c2Vs Zl07Ci0gICAgW3RleHRUb3VjaEJhciBzZXREZWZhdWx0SXRlbXM6W05TTXV0YWJsZVNldCBzZXRX aXRoT2JqZWN0OmlzUmljaFRleHRUb3VjaEJhciA/IF9wcml2YXRlLT5fcmljaFRleHRDYW5kaWRh dGVMaXN0VG91Y2hCYXJJdGVtLmdldCgpIDogX3ByaXZhdGUtPl9wbGFpblRleHRDYW5kaWRhdGVM aXN0VG91Y2hCYXJJdGVtLmdldCgpXV07CisgICAgW3RleHRUb3VjaEJhciBzZXRUZW1wbGF0ZUl0 ZW1zOltOU011dGFibGVTZXQgc2V0V2l0aE9iamVjdDppc1JpY2hUZXh0VG91Y2hCYXIgPyBfcHJp dmF0ZS0+X3JpY2hUZXh0Q2FuZGlkYXRlTGlzdFRvdWNoQmFySXRlbS5nZXQoKSA6IF9wcml2YXRl LT5fcGxhaW5UZXh0Q2FuZGlkYXRlTGlzdFRvdWNoQmFySXRlbS5nZXQoKV1dOwogICAgIFt0ZXh0 VG91Y2hCYXIgc2V0Q3VzdG9taXphdGlvbkFsbG93ZWRJdGVtSWRlbnRpZmllcnM6W3NlbGYgX3Rl eHRUb3VjaEJhckN1c3RvbWl6YXRpb25BbGxvd2VkSWRlbnRpZmllcnNdXTsKIAotICAgIE5TQXJy YXk8TlNTdHJpbmcgKj4gKmRlZmF1bHRJZGVudGlmaWVycyA9IGlzUmljaFRleHRUb3VjaEJhciA/ IFtzZWxmIF9yaWNoVGV4dFRvdWNoQmFyQ3VzdG9taXphdGlvbkRlZmF1bHRJdGVtSWRlbnRpZmll cnNdIDogW3NlbGYgX3BsYWluVGV4dFRvdWNoQmFyQ3VzdG9taXphdGlvbkRlZmF1bHRJdGVtSWRl bnRpZmllcnNdOwotICAgIFt0ZXh0VG91Y2hCYXIgc2V0Q3VzdG9taXphdGlvbkRlZmF1bHRJdGVt SWRlbnRpZmllcnM6ZGVmYXVsdElkZW50aWZpZXJzXTsKKyAgICBOU0FycmF5PE5TU3RyaW5nICo+ ICpkZWZhdWx0SWRlbnRpZmllcnMgPSBpc1JpY2hUZXh0VG91Y2hCYXIgPyBbc2VsZiBfcmljaFRl eHRUb3VjaEJhckRlZmF1bHRJdGVtSWRlbnRpZmllcnNdIDogW3NlbGYgX3BsYWluVGV4dFRvdWNo QmFyRGVmYXVsdEl0ZW1JZGVudGlmaWVyc107CisgICAgW3RleHRUb3VjaEJhciBzZXREZWZhdWx0 SXRlbUlkZW50aWZpZXJzOmRlZmF1bHRJZGVudGlmaWVyc107CiAKICAgICBpZiAoTlNHcm91cFRv dWNoQmFySXRlbSAqdGV4dEZvcm1hdEl0ZW0gPSAoTlNHcm91cFRvdWNoQmFySXRlbSAqKVt0ZXh0 VG91Y2hCYXIgaXRlbUZvcklkZW50aWZpZXI6TlNUb3VjaEJhckl0ZW1JZGVudGlmaWVyVGV4dEZv cm1hdF0pCiAgICAgICAgIHRleHRGb3JtYXRJdGVtLmdyb3VwVG91Y2hCYXIuY3VzdG9taXphdGlv bklkZW50aWZpZXIgPSBAIldlYlRleHRGb3JtYXRUb3VjaEJhciI7CkBAIC05NDYwLDcgKzk0NjAs NyBAQCAtICh2b2lkKXVwZGF0ZVRleHRUb3VjaEJhcgogICAgIH0KIAogICAgIE5TVG91Y2hCYXIg KnRleHRUb3VjaEJhciA9IHNlbGYudGV4dFRvdWNoQmFyOwotICAgIE5TQXJyYXk8TlNTdHJpbmcg Kj4gKml0ZW1JZGVudGlmaWVycyA9IHRleHRUb3VjaEJhci5pdGVtSWRlbnRpZmllcnM7CisgICAg TlNBcnJheTxOU1N0cmluZyAqPiAqaXRlbUlkZW50aWZpZXJzID0gdGV4dFRvdWNoQmFyLmRlZmF1 bHRJdGVtSWRlbnRpZmllcnM7CiAgICAgQk9PTCBpc1Nob3dpbmdDb21iaW5lZFRleHRGb3JtYXRJ dGVtID0gW2l0ZW1JZGVudGlmaWVycyBjb250YWluc09iamVjdDpOU1RvdWNoQmFySXRlbUlkZW50 aWZpZXJUZXh0Rm9ybWF0XTsKICAgICBbdGV4dFRvdWNoQmFyIHNldFByaW5jaXBhbEl0ZW1JZGVu dGlmaWVyOmlzU2hvd2luZ0NvbWJpbmVkVGV4dEZvcm1hdEl0ZW0gPyBOU1RvdWNoQmFySXRlbUlk ZW50aWZpZXJUZXh0Rm9ybWF0IDogbmlsXTsKIAo=