138716 2014-11-13 16:02:27 -0800 WK1: Clean up WebActionMenuController to use the _hitTestResult ivar 2014-11-13 16:39:44 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin thorton oldest_to_newest 1048543 0 bdakin 2014-11-13 16:02:27 -0800 WK1: Clean up WebActionMenuController to use the _hitTestResult ivar 1048544 1 241515 bdakin 2014-11-13 16:04:28 -0800 Created attachment 241515 Patch 1048556 2 bdakin 2014-11-13 16:39:44 -0800 Thanks! http://trac.webkit.org/changeset/176107 241515 2014-11-13 16:04:28 -0800 2014-11-13 16:27:24 -0800 Patch for-review.txt text/plain 17971 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjEwMikKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE0LTExLTEz ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXSzE6IENsZWFuIHVw IFdlYkFjdGlvbk1lbnVDb250cm9sbGVyIHRvIHVzZSB0aGUgX2hpdFRlc3RSZXN1bHQgaXZhcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NzE2Cisg ICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTg5Nzcy MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdOKA mXMgbm90IG5lY2Vzc2FyeSB0byB1c2UgdGhlIFdlYkVsZW1lbnREaWN0aW9uYXJ5IGZvciBzbyBt YW55IHRoaW5ncyBub3cgdGhhdCB3ZSAKKyAgICAgICAgYXJlIGNhY2hpbmcgdGhlIEhpdFRlc3RS ZXN1bHQuIFdlIHNob3VsZCBqdXN0IHVzZSB0aGUgSGl0VGVzdFJlc3VsdC4KKworICAgICAgICAq IFdlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYkFjdGlv bk1lbnVDb250cm9sbGVyIHByZXBhcmVGb3JNZW51OndpdGhFdmVudDpdKToKKyAgICAgICAgKC1b V2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX29wZW5VUkxGcm9tQWN0aW9uTWVudTpdKToKKyAgICAg ICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX2FkZFRvUmVhZGluZ0xpc3RGcm9tQWN0aW9u TWVudTpdKToKKyAgICAgICAgKGVsZW1lbnRCb3VuZGluZ0JveEZyb21Ob2RlKToKKyAgICAgICAg KC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX3F1aWNrTG9va1VSTEZyb21BY3Rpb25NZW51Ol0p OgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVtc0Zv ckxpbmtdKToKKyAgICAgICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51 SXRlbXNGb3JJbWFnZV0pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVm YXVsdE1lbnVJdGVtc0ZvclZpZGVvXSk6CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9s bGVyIF9kZWZhdWx0TWVudUl0ZW1zRm9yVGV4dF0pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51 Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4dF0pOgorICAgICAgICAo LVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4 dFdpdGhTdWdnZXN0aW9uc10pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBf ZGVmYXVsdE1lbnVJdGVtc0ZvcldoaXRlc3BhY2VJbkVkaXRhYmxlQXJlYV0pOgorICAgICAgICAo LVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6XSk6 CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zXSk6 CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9lbGVtZW50Qm91bmRpbmdCb3hG cm9tRE9NRWxlbWVudDpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViQWN0aW9uTWVudUNvbnRy b2xsZXIgX2RlZmF1bHRNZW51SXRlbXNGb3JMaW5rOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtX ZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVtc0ZvckltYWdlOl0pOiBEZWxl dGVkLgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVt c0ZvclZpZGVvOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxl ciBfZGVmYXVsdE1lbnVJdGVtc0ZvclRleHQ6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkFj dGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zRm9yRWRpdGFibGVUZXh0Ol0pOiBE ZWxldGVkLgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJ dGVtc0ZvckVkaXRhYmxlVGV4dFdpdGhTdWdnZXN0aW9uczpdKTogRGVsZXRlZC4KKyAgICAgICAg KC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNGb3JXaGl0ZXNwYWNl SW5FZGl0YWJsZUFyZWE6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250 cm9sbGVyIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzp3aXRoSGl0VGVzdFJlc3VsdDpdKTog RGVsZXRlZC4KKyAgICAgICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51 SXRlbXNGb3JIaXRUZXN0UmVzdWx0Ol0pOiBEZWxldGVkLgorCiAyMDE0LTExLTEzICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBXSzE6IFN1cHBvcnQgZGVmYXVsdCBh Y3Rpb25zIGZvciB2aWRlbwpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rp b25NZW51Q29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkFjdGlvbk1lbnVDb250cm9sbGVyLm1tCShyZXZpc2lvbiAxNzYwOTkpCisrKyBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkFjdGlvbk1lbnVDb250cm9sbGVyLm1tCSh3b3JraW5n IGNvcHkpCkBAIC0xMzQsNyArMTM0LDcgQEAgLSAodm9pZClwcmVwYXJlRm9yTWVudTooTlNNZW51 ICopbWVudSB3aQogICAgIFthY3Rpb25NZW51IHJlbW92ZUFsbEl0ZW1zXTsKIAogICAgIFdlYkVs ZW1lbnREaWN0aW9uYXJ5ICpoaXRUZXN0UmVzdWx0ID0gW3NlbGYgcGVyZm9ybUhpdFRlc3RBdFBv aW50OmV2ZW50LmxvY2F0aW9uSW5XaW5kb3ddOwotICAgIE5TQXJyYXkgKm1lbnVJdGVtcyA9IFtz ZWxmIF9kZWZhdWx0TWVudUl0ZW1zRm9ySGl0VGVzdFJlc3VsdDpoaXRUZXN0UmVzdWx0XTsKKyAg ICBOU0FycmF5ICptZW51SXRlbXMgPSBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc107CiAKICAgICAv LyBBbGxvdyBjbGllbnRzIHRvIGN1c3RvbWl6ZSB0aGUgbWVudSBpdGVtcy4KICAgICBpZiAoW1tf d2ViVmlldyBVSURlbGVnYXRlXSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3 OmFjdGlvbk1lbnVJdGVtc0ZvckhpdFRlc3RSZXN1bHQ6d2l0aFR5cGU6ZGVmYXVsdEFjdGlvbk1l bnVJdGVtczopXSkKQEAgLTE4MSwxMyArMTgxLDcgQEAgLSAodm9pZClfb3BlblVSTEZyb21BY3Rp b25NZW51OihpZClzZW5kZQogICAgIGlmICghX3dlYlZpZXcpCiAgICAgICAgIHJldHVybjsKIAot ICAgIE5TVVJMICp1cmwgPSBbc2VuZGVyIHJlcHJlc2VudGVkT2JqZWN0XTsKLSAgICBpZiAoIXVy bCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgQVNTRVJUKFt1cmwgaXNLaW5kT2ZDbGFzczpbTlNV UkwgY2xhc3NdXSk7Ci0KLSAgICBbW05TV29ya3NwYWNlIHNoYXJlZFdvcmtzcGFjZV0gb3BlblVS TDp1cmxdOworICAgIFtbTlNXb3Jrc3BhY2Ugc2hhcmVkV29ya3NwYWNlXSBvcGVuVVJMOl9oaXRU ZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpXTsKIH0KIAogLSAodm9pZClfYWRkVG9SZWFkaW5n TGlzdEZyb21BY3Rpb25NZW51OihpZClzZW5kZXIKQEAgLTE5NSwyOSArMTg5LDIzIEBAIC0gKHZv aWQpX2FkZFRvUmVhZGluZ0xpc3RGcm9tQWN0aW9uTWVudToKICAgICBpZiAoIV93ZWJWaWV3KQog ICAgICAgICByZXR1cm47CiAKLSAgICBOU1VSTCAqdXJsID0gW3NlbmRlciByZXByZXNlbnRlZE9i amVjdF07Ci0gICAgaWYgKCF1cmwpCi0gICAgICAgIHJldHVybjsKLQotICAgIEFTU0VSVChbdXJs IGlzS2luZE9mQ2xhc3M6W05TVVJMIGNsYXNzXV0pOwotCisgICAgTlNVUkwgKnVybCA9IF9oaXRU ZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpOwogICAgIE5TU2hhcmluZ1NlcnZpY2UgKnNlcnZp Y2UgPSBbTlNTaGFyaW5nU2VydmljZSBzaGFyaW5nU2VydmljZU5hbWVkOk5TU2hhcmluZ1NlcnZp Y2VOYW1lQWRkVG9TYWZhcmlSZWFkaW5nTGlzdF07CiAgICAgW3NlcnZpY2UgcGVyZm9ybVdpdGhJ dGVtczpAWyB1cmwgXV07CiB9CiAKLS0gKE5TUmVjdClfZWxlbWVudEJvdW5kaW5nQm94RnJvbURP TUVsZW1lbnQ6KERPTUVsZW1lbnQgKilkb21FbGVtZW50CitzdGF0aWMgSW50UmVjdCBlbGVtZW50 Qm91bmRpbmdCb3hGcm9tTm9kZShOb2RlKiBub2RlKQogewotICAgIGlmICghZG9tRWxlbWVudCkK LSAgICAgICAgcmV0dXJuIE5TWmVyb1JlY3Q7CisgICAgaWYgKCFub2RlKQorICAgICAgICByZXR1 cm4gSW50UmVjdCgpOwogCi0gICAgTm9kZSogbm9kZSA9IGNvcmUoZG9tRWxlbWVudCk7CiAgICAg RnJhbWUqIGZyYW1lID0gbm9kZS0+ZG9jdW1lbnQoKS5mcmFtZSgpOwogICAgIGlmICghZnJhbWUp Ci0gICAgICAgIHJldHVybiBOU1plcm9SZWN0OworICAgICAgICByZXR1cm4gSW50UmVjdCgpOwog CiAgICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZpZXcoKTsKICAgICBpZiAoIXZpZXcpCi0g ICAgICAgIHJldHVybiBOU1plcm9SZWN0OworICAgICAgICByZXR1cm4gSW50UmVjdCgpOwogCiAg ICAgcmV0dXJuIHZpZXctPmNvbnRlbnRzVG9XaW5kb3cobm9kZS0+cGl4ZWxTbmFwcGVkQm91bmRp bmdCb3goKSk7CiB9CkBAIC0yMjcsMjEgKzIxNSwxNSBAQCAtICh2b2lkKV9xdWlja0xvb2tVUkxG cm9tQWN0aW9uTWVudTooaWQpCiAgICAgaWYgKCFfd2ViVmlldykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgTlNEaWN0aW9uYXJ5ICpoaXRUZXN0UmVzdWx0ID0gW3NlbmRlciByZXByZXNlbnRlZE9i amVjdF07Ci0gICAgaWYgKCFoaXRUZXN0UmVzdWx0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBB U1NFUlQoW2hpdFRlc3RSZXN1bHQgaXNLaW5kT2ZDbGFzczpbTlNEaWN0aW9uYXJ5IGNsYXNzXV0p OwotCi0gICAgTlNVUkwgKnVybCA9IFtoaXRUZXN0UmVzdWx0IG9iamVjdEZvcktleTpXZWJFbGVt ZW50TGlua1VSTEtleV07CisgICAgTlNVUkwgKnVybCA9IF9oaXRUZXN0UmVzdWx0LmFic29sdXRl TGlua1VSTCgpOwogICAgIGlmICghdXJsKQogICAgICAgICByZXR1cm47CiAKLSAgICBET01FbGVt ZW50ICpkb21FbGVtZW50ID0gW2hpdFRlc3RSZXN1bHQgb2JqZWN0Rm9yS2V5OldlYkVsZW1lbnRE T01Ob2RlS2V5XTsKLSAgICBpZiAoIWRvbUVsZW1lbnQpCisgICAgTm9kZSogbm9kZSA9IF9oaXRU ZXN0UmVzdWx0LmlubmVyTm9kZSgpOworICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgTlNSZWN0IGl0ZW1GcmFtZSA9IFtfd2ViVmlldyBjb252ZXJ0UmVjdDpbc2VsZiBfZWxl bWVudEJvdW5kaW5nQm94RnJvbURPTUVsZW1lbnQ6ZG9tRWxlbWVudF0gdG9WaWV3Om5pbF07Cisg ICAgTlNSZWN0IGl0ZW1GcmFtZSA9IFtfd2ViVmlldyBjb252ZXJ0UmVjdDplbGVtZW50Qm91bmRp bmdCb3hGcm9tTm9kZShub2RlKSB0b1ZpZXc6bmlsXTsKICAgICBOU1NpemUgbWF4aW11bVByZXZp ZXdTaXplID0gTlNNYWtlU2l6ZShfd2ViVmlldy5ib3VuZHMuc2l6ZS53aWR0aCAqIDAuNzUsIF93 ZWJWaWV3LmJvdW5kcy5zaXplLmhlaWdodCAqIDAuNzUpOwogCiAgICAgUmV0YWluUHRyPFFMUHJl dmlld0J1YmJsZT4gYnViYmxlID0gYWRvcHROUyhbW2dldFFMUHJldmlld0J1YmJsZUNsYXNzKCkg YWxsb2NdIGluaXRdKTsKQEAgLTI1Nyw0MCArMjM5LDM5IEBAIC0gKHZvaWQpX3F1aWNrTG9va1VS TEZyb21BY3Rpb25NZW51OihpZCkKICAgICBbYnViYmxlIHNob3dQcmV2aWV3SXRlbTp1cmwgaXRl bUZyYW1lOml0ZW1GcmFtZV07CiB9CiAKLS0gKE5TQXJyYXkgKilfZGVmYXVsdE1lbnVJdGVtc0Zv ckxpbms6KFdlYkVsZW1lbnREaWN0aW9uYXJ5ICopaGl0VGVzdFJlc3VsdAorLSAoTlNBcnJheSAq KV9kZWZhdWx0TWVudUl0ZW1zRm9yTGluawogewotICAgIE5TVVJMICp1cmwgPSBbaGl0VGVzdFJl c3VsdCBvYmplY3RGb3JLZXk6V2ViRWxlbWVudExpbmtVUkxLZXldOworICAgIE5TVVJMICp1cmwg PSBfaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxpbmtVUkwoKTsKICAgICBpZiAoIXVybCkKICAgICAg ICAgcmV0dXJuIEBbIF07CiAKICAgICBpZiAoIVdlYkNvcmU6OnByb3RvY29sSXNJbkhUVFBGYW1p bHkoW3VybCBhYnNvbHV0ZVN0cmluZ10pKQogICAgICAgICByZXR1cm4gQFsgXTsKIAotICAgIFJl dGFpblB0cjxOU01lbnVJdGVtPiBvcGVuTGlua0l0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVu dUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdPcGVuTGlua0luRGVmYXVsdEJyb3dzZXIg d2l0aEhpdFRlc3RSZXN1bHQ6aGl0VGVzdFJlc3VsdF07Ci0gICAgUmV0YWluUHRyPE5TTWVudUl0 ZW0+IHByZXZpZXdMaW5rSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpX ZWJBY3Rpb25NZW51SXRlbVRhZ1ByZXZpZXdMaW5rIHdpdGhIaXRUZXN0UmVzdWx0OmhpdFRlc3RS ZXN1bHRdOwotICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiByZWFkaW5nTGlzdEl0ZW0gPSBbc2Vs ZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdBZGRMaW5r VG9TYWZhcmlSZWFkaW5nTGlzdCB3aXRoSGl0VGVzdFJlc3VsdDpoaXRUZXN0UmVzdWx0XTsKKyAg ICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gb3BlbkxpbmtJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlv bk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnT3BlbkxpbmtJbkRlZmF1bHRCcm93 c2VyXTsKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gcHJldmlld0xpbmtJdGVtID0gW3NlbGYg X2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnUHJldmlld0xp bmtdOworICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiByZWFkaW5nTGlzdEl0ZW0gPSBbc2VsZiBf Y3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdBZGRMaW5rVG9T YWZhcmlSZWFkaW5nTGlzdF07CiAKICAgICByZXR1cm4gQFsgb3BlbkxpbmtJdGVtLmdldCgpLCBw cmV2aWV3TGlua0l0ZW0uZ2V0KCksIFtOU01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dLCByZWFkaW5n TGlzdEl0ZW0uZ2V0KCkgXTsKIH0KIAogI3ByYWdtYSBtYXJrIEltYWdlIGFjdGlvbnMKIAotLSAo TlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9ySW1hZ2U6KFdlYkVsZW1lbnREaWN0aW9uYXJ5 ICopaGl0VGVzdFJlc3VsdAorLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9ySW1hZ2UK IHsKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gY29weUltYWdlSXRlbSA9IFtzZWxmIF9jcmVh dGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ0NvcHlJbWFnZSB3aXRo SGl0VGVzdFJlc3VsdDpoaXRUZXN0UmVzdWx0XTsKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4g Y29weUltYWdlSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rp b25NZW51SXRlbVRhZ0NvcHlJbWFnZV07CiAKICAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gYWRk VG9QaG90b3NJdGVtOwogICAgIGlmIChbc2VsZiBfY2FuQWRkTWVkaWFUb1Bob3Rvc10pCi0gICAg ICAgIGFkZFRvUGhvdG9zSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpX ZWJBY3Rpb25NZW51SXRlbVRhZ0FkZEltYWdlVG9QaG90b3Mgd2l0aEhpdFRlc3RSZXN1bHQ6aGl0 VGVzdFJlc3VsdF07CisgICAgICAgIGFkZFRvUGhvdG9zSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rp b25NZW51SXRlbUZvclRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ0FkZEltYWdlVG9QaG90b3NdOwog ICAgIGVsc2UKICAgICAgICAgYWRkVG9QaG90b3NJdGVtID0gW05TTWVudUl0ZW0gc2VwYXJhdG9y SXRlbV07CiAKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gc2F2ZVRvRG93bmxvYWRzSXRlbSA9 IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ1Nh dmVJbWFnZVRvRG93bmxvYWRzIHdpdGhIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1bHRdOworICAg IFJldGFpblB0cjxOU01lbnVJdGVtPiBzYXZlVG9Eb3dubG9hZHNJdGVtID0gW3NlbGYgX2NyZWF0 ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnU2F2ZUltYWdlVG9Eb3du bG9hZHNdOwogICAgIGlmICghX3dlYlZpZXcuZG93bmxvYWREZWxlZ2F0ZSkKICAgICAgICAgW3Nh dmVUb0Rvd25sb2Fkc0l0ZW0gc2V0RW5hYmxlZDpOT107CiAKLQotICAgIFJldGFpblB0cjxOU01l bnVJdGVtPiBzaGFyZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2Vi QWN0aW9uTWVudUl0ZW1UYWdTaGFyZUltYWdlIHdpdGhIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1 bHRdOworICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBzaGFyZUl0ZW0gPSBbc2VsZiBfY3JlYXRl QWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZUltYWdlXTsKICAg ICBpZiAoSW1hZ2UqIGltYWdlID0gX2hpdFRlc3RSZXN1bHQuaW1hZ2UoKSkgewogICAgICAgICBS ZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY2dJbWFnZSA9IGltYWdlLT5nZXRDR0ltYWdlUmVmKCk7CiAg ICAgICAgIFJldGFpblB0cjxOU0ltYWdlPiBuc0ltYWdlID0gYWRvcHROUyhbW05TSW1hZ2UgYWxs b2NdIGluaXRXaXRoQ0dJbWFnZTpjZ0ltYWdlLmdldCgpIHNpemU6TlNaZXJvU2l6ZV0pOwpAQCAt Mzk2LDE1ICszNzcsMTUgQEAgLSAodm9pZClfc2F2ZUltYWdlVG9Eb3dubG9hZHM6KGlkKXNlbmRl cgogCiAjcHJhZ21hIG1hcmsgVmlkZW8gYWN0aW9ucwogCi0tIChOU0FycmF5KilfZGVmYXVsdE1l bnVJdGVtc0ZvclZpZGVvOihXZWJFbGVtZW50RGljdGlvbmFyeSAqKWhpdFRlc3RSZXN1bHQKKy0g KE5TQXJyYXkqKV9kZWZhdWx0TWVudUl0ZW1zRm9yVmlkZW8KIHsKLSAgICBSZXRhaW5QdHI8TlNN ZW51SXRlbT4gY29weVZpZGVvVVJMSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZv clRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ0NvcHlWaWRlb1VSTCB3aXRoSGl0VGVzdFJlc3VsdDpo aXRUZXN0UmVzdWx0XTsKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gY29weVZpZGVvVVJMSXRl bSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rpb25NZW51SXRlbVRh Z0NvcHlWaWRlb1VSTF07CiAKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gc2F2ZVRvRG93bmxv YWRzSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rpb25NZW51 SXRlbVRhZ1NhdmVWaWRlb1RvRG93bmxvYWRzIHdpdGhIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1 bHRdOworICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBzYXZlVG9Eb3dubG9hZHNJdGVtID0gW3Nl bGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnU2F2ZVZp ZGVvVG9Eb3dubG9hZHNdOwogICAgIGlmICghX2hpdFRlc3RSZXN1bHQuaXNEb3dubG9hZGFibGVN ZWRpYSgpIHx8ICFfd2ViVmlldy5kb3dubG9hZERlbGVnYXRlKQogICAgICAgICBbc2F2ZVRvRG93 bmxvYWRzSXRlbSBzZXRFbmFibGVkOk5PXTsKIAotICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBz aGFyZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVu dUl0ZW1UYWdTaGFyZVZpZGVvIHdpdGhIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1bHRdOworICAg IFJldGFpblB0cjxOU01lbnVJdGVtPiBzaGFyZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVu dUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdTaGFyZVZpZGVvXTsKICAgICBOU1N0cmlu ZyAqdXJsVG9TaGFyZSA9IF9oaXRUZXN0UmVzdWx0LmFic29sdXRlTWVkaWFVUkwoKTsKICAgICBp ZiAoIV9oaXRUZXN0UmVzdWx0LmlzRG93bmxvYWRhYmxlTWVkaWEoKSkgewogICAgICAgICBbc2F2 ZVRvRG93bmxvYWRzSXRlbSBzZXRFbmFibGVkOk5PXTsKQEAgLTQzNCwyNCArNDE1LDI0IEBAIC0g KHZvaWQpX3NhdmVWaWRlb1RvRG93bmxvYWRzOihpZClzZW5kZXIKIAogI3ByYWdtYSBtYXJrIFRl eHQgYWN0aW9ucwogCi0tIChOU0FycmF5ICopX2RlZmF1bHRNZW51SXRlbXNGb3JUZXh0OihXZWJF bGVtZW50RGljdGlvbmFyeSAqKWhpdFRlc3RSZXN1bHQKKy0gKE5TQXJyYXkgKilfZGVmYXVsdE1l bnVJdGVtc0ZvclRleHQKIHsKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gY29weVRleHRJdGVt ID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFn Q29weVRleHQgd2l0aEhpdFRlc3RSZXN1bHQ6aGl0VGVzdFJlc3VsdF07Ci0gICAgUmV0YWluUHRy PE5TTWVudUl0ZW0+IGxvb2t1cFRleHRJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVt Rm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnTG9va3VwVGV4dCB3aXRoSGl0VGVzdFJlc3VsdDpo aXRUZXN0UmVzdWx0XTsKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gY29weVRleHRJdGVtID0g W3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnQ29w eVRleHRdOworICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBsb29rdXBUZXh0SXRlbSA9IFtzZWxm IF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ0xvb2t1cFRl eHRdOwogCiAgICAgcmV0dXJuIEBbIGNvcHlUZXh0SXRlbS5nZXQoKSwgbG9va3VwVGV4dEl0ZW0u Z2V0KCkgXTsKIH0KIAotLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9yRWRpdGFibGVU ZXh0OihXZWJFbGVtZW50RGljdGlvbmFyeSAqKWhpdFRlc3RSZXN1bHQKKy0gKE5TQXJyYXkgKilf ZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4dAogewotICAgIFJldGFpblB0cjxOU01lbnVJ dGVtPiBjb3B5VGV4dEl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2Vi QWN0aW9uTWVudUl0ZW1UYWdDb3B5VGV4dCB3aXRoSGl0VGVzdFJlc3VsdDpoaXRUZXN0UmVzdWx0 XTsKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gbG9va3VwVGV4dEl0ZW0gPSBbc2VsZiBfY3Jl YXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdMb29rdXBUZXh0IHdp dGhIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1bHRdOwotICAgIFJldGFpblB0cjxOU01lbnVJdGVt PiBwYXN0ZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9u TWVudUl0ZW1UYWdQYXN0ZSB3aXRoSGl0VGVzdFJlc3VsdDpoaXRUZXN0UmVzdWx0XTsKKyAgICBS ZXRhaW5QdHI8TlNNZW51SXRlbT4gY29weVRleHRJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1l bnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnQ29weVRleHRdOworICAgIFJldGFpblB0 cjxOU01lbnVJdGVtPiBsb29rdXBUZXh0SXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRl bUZvclRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ0xvb2t1cFRleHRdOworICAgIFJldGFpblB0cjxO U01lbnVJdGVtPiBwYXN0ZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6 V2ViQWN0aW9uTWVudUl0ZW1UYWdQYXN0ZV07CiAKICAgICByZXR1cm4gQFsgY29weVRleHRJdGVt LmdldCgpLCBsb29rdXBUZXh0SXRlbS5nZXQoKSwgcGFzdGVJdGVtLmdldCgpIF07CiB9CiAKLS0g KE5TQXJyYXkgKilfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4dFdpdGhTdWdnZXN0aW9u czooV2ViRWxlbWVudERpY3Rpb25hcnkgKiloaXRUZXN0UmVzdWx0CistIChOU0FycmF5ICopX2Rl ZmF1bHRNZW51SXRlbXNGb3JFZGl0YWJsZVRleHRXaXRoU3VnZ2VzdGlvbnMKIHsKICAgICBGcmFt ZSogZnJhbWUgPSBjb3JlKFtfd2ViVmlldyBfc2VsZWN0ZWRPck1haW5GcmFtZV0pOwogICAgIGlm ICghZnJhbWUpCkBAIC00ODQsMTAgKzQ2NSwxMCBAQCAtIChOU0FycmF5ICopX2RlZmF1bHRNZW51 SXRlbXNGb3JFZGl0YWJsCiAgICAgICAgIFtzcGVsbGluZ1N1Yk1lbnUgYWRkSXRlbTppdGVtLmdl dCgpXTsKICAgICB9CiAKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gY29weVRleHRJdGVtID0g W3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnQ29w eVRleHQgd2l0aEhpdFRlc3RSZXN1bHQ6aGl0VGVzdFJlc3VsdF07Ci0gICAgUmV0YWluUHRyPE5T TWVudUl0ZW0+IGxvb2t1cFRleHRJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9y VGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnTG9va3VwVGV4dCB3aXRoSGl0VGVzdFJlc3VsdDpoaXRU ZXN0UmVzdWx0XTsKLSAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gcGFzdGVJdGVtID0gW3NlbGYg X2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnUGFzdGUgd2l0 aEhpdFRlc3RSZXN1bHQ6aGl0VGVzdFJlc3VsdF07Ci0gICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+ IHRleHRTdWdnZXN0aW9uc0l0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6 V2ViQWN0aW9uTWVudUl0ZW1UYWdUZXh0U3VnZ2VzdGlvbnMgd2l0aEhpdFRlc3RSZXN1bHQ6aGl0 VGVzdFJlc3VsdF07CisgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IGNvcHlUZXh0SXRlbSA9IFtz ZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ0NvcHlU ZXh0XTsKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gbG9va3VwVGV4dEl0ZW0gPSBbc2VsZiBf Y3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdMb29rdXBUZXh0 XTsKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gcGFzdGVJdGVtID0gW3NlbGYgX2NyZWF0ZUFj dGlvbk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnUGFzdGVdOworICAgIFJldGFp blB0cjxOU01lbnVJdGVtPiB0ZXh0U3VnZ2VzdGlvbnNJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlv bk1lbnVJdGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnVGV4dFN1Z2dlc3Rpb25zXTsKIAog ICAgIFt0ZXh0U3VnZ2VzdGlvbnNJdGVtIHNldFN1Ym1lbnU6c3BlbGxpbmdTdWJNZW51LmdldCgp XTsKIApAQCAtNjAwLDkgKzU4MSw5IEBAIHN0YXRpYyBEaWN0aW9uYXJ5UG9wdXBJbmZvIHBlcmZv cm1EaWN0aW8KIAogI3ByYWdtYSBtYXJrIFdoaXRlc3BhY2UgYWN0aW9ucwogCi0tIChOU0FycmF5 ICopX2RlZmF1bHRNZW51SXRlbXNGb3JXaGl0ZXNwYWNlSW5FZGl0YWJsZUFyZWE6KFdlYkVsZW1l bnREaWN0aW9uYXJ5ICopaGl0VGVzdFJlc3VsdAorLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0 ZW1zRm9yV2hpdGVzcGFjZUluRWRpdGFibGVBcmVhCiB7Ci0gICAgUmV0YWluUHRyPE5TTWVudUl0 ZW0+IHBhc3RlSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rp b25NZW51SXRlbVRhZ1Bhc3RlIHdpdGhIaXRUZXN0UmVzdWx0OmhpdFRlc3RSZXN1bHRdOworICAg IFJldGFpblB0cjxOU01lbnVJdGVtPiBwYXN0ZUl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVu dUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdQYXN0ZV07CiAKICAgICByZXR1cm4gQFsg W05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0sIFtOU01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dLCBw YXN0ZUl0ZW0uZ2V0KCkgXTsKIH0KQEAgLTYzNiwzMyArNjE3LDI5IEBAIC0gKE5TV2luZG93ICop c2hhcmluZ1NlcnZpY2U6KE5TU2hhcmluZ1MKIAogI3ByYWdtYSBtYXJrIE1lbnUgSXRlbXMKIAot LSAoUmV0YWluUHRyPE5TTWVudUl0ZW0+KV9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzoodWlu dDMyX3QpdGFnIHdpdGhIaXRUZXN0UmVzdWx0OihXZWJFbGVtZW50RGljdGlvbmFyeSAqKWhpdFRl c3RSZXN1bHQKKy0gKFJldGFpblB0cjxOU01lbnVJdGVtPilfY3JlYXRlQWN0aW9uTWVudUl0ZW1G b3JUYWc6KHVpbnQzMl90KXRhZwogewogICAgIFNFTCBzZWxlY3RvciA9IG51bGxwdHI7CiAgICAg TlNTdHJpbmcgKnRpdGxlID0gbmlsOwogICAgIE5TSW1hZ2UgKmltYWdlID0gbmlsOwotICAgIGlk IHJlcHJlc2VudGVkT2JqZWN0ID0gbmlsOwogCiAgICAgc3dpdGNoICh0YWcpIHsKICAgICBjYXNl IFdlYkFjdGlvbk1lbnVJdGVtVGFnT3BlbkxpbmtJbkRlZmF1bHRCcm93c2VyOgogICAgICAgICBz ZWxlY3RvciA9IEBzZWxlY3Rvcihfb3BlblVSTEZyb21BY3Rpb25NZW51Oik7CiAgICAgICAgIHRp dGxlID0gV0VCX1VJX1NUUklOR19LRVkoIk9wZW4iLCAiT3BlbiAoYWN0aW9uIG1lbnUgaXRlbSki LCAiYWN0aW9uIG1lbnUgaXRlbSIpOwogICAgICAgICBpbWFnZSA9IHdlYktpdEJ1bmRsZUltYWdl TmFtZWQoQCJPcGVuSW5OZXdXaW5kb3dUZW1wbGF0ZSIpOwotICAgICAgICByZXByZXNlbnRlZE9i amVjdCA9IFtoaXRUZXN0UmVzdWx0IG9iamVjdEZvcktleTpXZWJFbGVtZW50TGlua1VSTEtleV07 CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBXZWJBY3Rpb25NZW51SXRlbVRhZ1ByZXZpZXdM aW5rOgogICAgICAgICBzZWxlY3RvciA9IEBzZWxlY3RvcihfcXVpY2tMb29rVVJMRnJvbUFjdGlv bk1lbnU6KTsKICAgICAgICAgdGl0bGUgPSBXRUJfVUlfU1RSSU5HX0tFWSgiUHJldmlldyIsICJQ cmV2aWV3IChhY3Rpb24gbWVudSBpdGVtKSIsICJhY3Rpb24gbWVudSBpdGVtIik7CiAgICAgICAg IGltYWdlID0gW05TSW1hZ2UgaW1hZ2VOYW1lZDpAIk5TQWN0aW9uTWVudVF1aWNrTG9vayJdOwot ICAgICAgICByZXByZXNlbnRlZE9iamVjdCA9IGhpdFRlc3RSZXN1bHQ7CiAgICAgICAgIGJyZWFr OwogCiAgICAgY2FzZSBXZWJBY3Rpb25NZW51SXRlbVRhZ0FkZExpbmtUb1NhZmFyaVJlYWRpbmdM aXN0OgogICAgICAgICBzZWxlY3RvciA9IEBzZWxlY3RvcihfYWRkVG9SZWFkaW5nTGlzdEZyb21B Y3Rpb25NZW51Oik7CiAgICAgICAgIHRpdGxlID0gV0VCX1VJX1NUUklOR19LRVkoIkFkZCB0byBS ZWFkaW5nIExpc3QiLCAiQWRkIHRvIFJlYWRpbmcgTGlzdCAoYWN0aW9uIG1lbnUgaXRlbSkiLCAi YWN0aW9uIG1lbnUgaXRlbSIpOwogICAgICAgICBpbWFnZSA9IFtOU0ltYWdlIGltYWdlTmFtZWQ6 QCJOU0FjdGlvbk1lbnVBZGRUb1JlYWRpbmdMaXN0Il07Ci0gICAgICAgIHJlcHJlc2VudGVkT2Jq ZWN0ID0gW2hpdFRlc3RSZXN1bHQgb2JqZWN0Rm9yS2V5OldlYkVsZW1lbnRMaW5rVVJMS2V5XTsK ICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFdlYkFjdGlvbk1lbnVJdGVtVGFnQ29weVRleHQ6 CkBAIC03MzcsNyArNzE0LDYgQEAgLSAoUmV0YWluUHRyPE5TTWVudUl0ZW0+KV9jcmVhdGVBY3Rp b25NZQogICAgIFtpdGVtIHNldEltYWdlOmltYWdlXTsKICAgICBbaXRlbSBzZXRUYXJnZXQ6c2Vs Zl07CiAgICAgW2l0ZW0gc2V0VGFnOnRhZ107Ci0gICAgW2l0ZW0gc2V0UmVwcmVzZW50ZWRPYmpl Y3Q6cmVwcmVzZW50ZWRPYmplY3RdOwogICAgIHJldHVybiBpdGVtOwogfQogCkBAIC03NDYsNDQg KzcyMiw0NCBAQCBzdGF0aWMgTlNJbWFnZSAqd2ViS2l0QnVuZGxlSW1hZ2VOYW1lZChOCiAgICAg cmV0dXJuIFtbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6TlNDbGFzc0Zyb21TdHJpbmcoQCJXS1Zp ZXciKV0gaW1hZ2VGb3JSZXNvdXJjZTpuYW1lXTsKIH0KIAotLSAoTlNBcnJheSAqKV9kZWZhdWx0 TWVudUl0ZW1zRm9ySGl0VGVzdFJlc3VsdDooV2ViRWxlbWVudERpY3Rpb25hcnkgKiloaXRUZXN0 UmVzdWx0CistIChOU0FycmF5ICopX2RlZmF1bHRNZW51SXRlbXMKIHsKLSAgICBOU1VSTCAqdXJs ID0gW2hpdFRlc3RSZXN1bHQgb2JqZWN0Rm9yS2V5OldlYkVsZW1lbnRMaW5rVVJMS2V5XTsKKyAg ICBOU1VSTCAqdXJsID0gX2hpdFRlc3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCk7CiAgICAgaWYg KHVybCkgewogICAgICAgICBfdHlwZSA9IFdlYkFjdGlvbk1lbnVMaW5rOwotICAgICAgICByZXR1 cm4gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXNGb3JMaW5rOmhpdFRlc3RSZXN1bHRdOworICAgICAg ICByZXR1cm4gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXNGb3JMaW5rXTsKICAgICB9CiAKICAgICBp ZiAoIV9oaXRUZXN0UmVzdWx0LmFic29sdXRlTWVkaWFVUkwoKS5pc0VtcHR5KCkpIHsKICAgICAg ICAgX3R5cGUgPSBXZWJBY3Rpb25NZW51VmlkZW87Ci0gICAgICAgIHJldHVybiBbc2VsZiBfZGVm YXVsdE1lbnVJdGVtc0ZvclZpZGVvOmhpdFRlc3RSZXN1bHRdOworICAgICAgICByZXR1cm4gW3Nl bGYgX2RlZmF1bHRNZW51SXRlbXNGb3JWaWRlb107CiAgICAgfQogCiAgICAgaWYgKF9oaXRUZXN0 UmVzdWx0LmltYWdlKCkgJiYgIV9oaXRUZXN0UmVzdWx0LmFic29sdXRlSW1hZ2VVUkwoKS5pc0Vt cHR5KCkpIHsKICAgICAgICAgX3R5cGUgPSBXZWJBY3Rpb25NZW51SW1hZ2U7Ci0gICAgICAgIHJl dHVybiBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvckltYWdlOmhpdFRlc3RSZXN1bHRdOworICAg ICAgICByZXR1cm4gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXNGb3JJbWFnZV07CiAgICAgfQogCiAg ICAgTm9kZSogbm9kZSA9IF9oaXRUZXN0UmVzdWx0LmlubmVyTm9kZSgpOwogICAgIGlmIChub2Rl ICYmIG5vZGUtPmlzVGV4dE5vZGUoKSkgewogICAgICAgICBpZiAoX2hpdFRlc3RSZXN1bHQuaXND b250ZW50RWRpdGFibGUoKSkgewotICAgICAgICAgICAgTlNBcnJheSAqZWRpdGFibGVUZXh0V2l0 aFN1Z2dlc3Rpb25zID0gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXNGb3JFZGl0YWJsZVRleHRXaXRo U3VnZ2VzdGlvbnM6aGl0VGVzdFJlc3VsdF07CisgICAgICAgICAgICBOU0FycmF5ICplZGl0YWJs ZVRleHRXaXRoU3VnZ2VzdGlvbnMgPSBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxl VGV4dFdpdGhTdWdnZXN0aW9uc107CiAgICAgICAgICAgICBpZiAoZWRpdGFibGVUZXh0V2l0aFN1 Z2dlc3Rpb25zLmNvdW50KSB7CiAgICAgICAgICAgICAgICAgX3R5cGUgPSBXZWJBY3Rpb25NZW51 RWRpdGFibGVUZXh0V2l0aFN1Z2dlc3Rpb25zOwogICAgICAgICAgICAgICAgIHJldHVybiBlZGl0 YWJsZVRleHRXaXRoU3VnZ2VzdGlvbnM7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIF90 eXBlID0gV2ViQWN0aW9uTWVudUVkaXRhYmxlVGV4dDsKLSAgICAgICAgICAgIHJldHVybiBbc2Vs ZiBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4dDpoaXRUZXN0UmVzdWx0XTsKKyAgICAg ICAgICAgIHJldHVybiBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4dF07CiAg ICAgICAgIH0KIAogICAgICAgICBfdHlwZSA9IFdlYkFjdGlvbk1lbnVSZWFkT25seVRleHQ7Ci0g ICAgICAgIHJldHVybiBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvclRleHQ6aGl0VGVzdFJlc3Vs dF07CisgICAgICAgIHJldHVybiBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvclRleHRdOwogICAg IH0KIAogICAgIGlmIChfaGl0VGVzdFJlc3VsdC5pc0NvbnRlbnRFZGl0YWJsZSgpKSB7CiAgICAg ICAgIF90eXBlID0gV2ViQWN0aW9uTWVudVdoaXRlc3BhY2VJbkVkaXRhYmxlQXJlYTsKLSAgICAg ICAgcmV0dXJuIFtzZWxmIF9kZWZhdWx0TWVudUl0ZW1zRm9yV2hpdGVzcGFjZUluRWRpdGFibGVB cmVhOmhpdFRlc3RSZXN1bHRdOworICAgICAgICByZXR1cm4gW3NlbGYgX2RlZmF1bHRNZW51SXRl bXNGb3JXaGl0ZXNwYWNlSW5FZGl0YWJsZUFyZWFdOwogICAgIH0KIAogICAgIF90eXBlID0gV2Vi QWN0aW9uTWVudU5vbmU7Cg==