179371 2017-11-07 03:27:40 -0800 WebDriver: WebDriverService::matchCapabilities should follow the spec 2017-11-15 09:39:59 -0800 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cgarcia webkit-unassigned bburg webkit-bug-importer oldest_to_newest 1368967 0 cgarcia 2017-11-07 03:27:40 -0800 The returned object should contain all the entries mentioned in the spec, not only the ones already present in the passed in capabilities object. 1368968 1 326203 cgarcia 2017-11-07 03:29:42 -0800 Created attachment 326203 Patch 1370040 2 326203 bburg 2017-11-09 13:53:02 -0800 Comment on attachment 326203 Patch r=me 1370256 3 cgarcia 2017-11-09 23:27:38 -0800 Committed r224668: <https://trac.webkit.org/changeset/224668> 1371949 4 webkit-bug-importer 2017-11-15 09:39:59 -0800 <rdar://problem/35562184> 326203 2017-11-07 03:29:42 -0800 2017-11-09 13:53:02 -0800 Patch wd-matched-capabilities.diff text/plain 8643 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggZjIwMDNlNDUwYzcuLjQxMWU2MmUxMjEyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBXZWJEcml2ZXI6IFdlYkRyaXZlclNlcnZpY2U6 Om1hdGNoQ2FwYWJpbGl0aWVzIHNob3VsZCBmb2xsb3cgdGhlIHNwZWMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTM3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSByZXR1cm5lZCBvYmplY3Qgc2hv dWxkIGNvbnRhaW4gYWxsIHRoZSBlbnRyaWVzIG1lbnRpb25lZCBpbiB0aGUgc3BlYywgbm90IG9u bHkgdGhlIG9uZXMgYWxyZWFkeSBwcmVzZW50IGluCisgICAgICAgIHRoZSBwYXNzZWQgaW4gY2Fw YWJpbGl0aWVzIG9iamVjdC4KKworICAgICAgICA3LjIgUHJvY2Vzc2luZyBDYXBhYmlsaXRpZXMK KyAgICAgICAgaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3dlYmRyaXZlci93ZWJkcml2ZXItc3BlYy5o dG1sI2Rmbi1tYXRjaGluZy1jYXBhYmlsaXRpZXMKKworICAgICAgICAqIFdlYkRyaXZlclNlcnZp Y2UuY3BwOgorICAgICAgICAoV2ViRHJpdmVyOjpXZWJEcml2ZXJTZXJ2aWNlOjptYXRjaENhcGFi aWxpdGllcyBjb25zdCk6CisgICAgICAgIChXZWJEcml2ZXI6OldlYkRyaXZlclNlcnZpY2U6OnBy b2Nlc3NDYXBhYmlsaXRpZXMgY29uc3QpOgorICAgICAgICAqIFdlYkRyaXZlclNlcnZpY2UuaDoK KwogMjAxNy0xMS0wNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgV2ViRHJpdmVyOiBjYXBhYmlsaXRpZXMgd2l0aCBudWxsIHZhbHVlIHNob3Vs ZG4ndCBiZSBhZGRlZCB0byB0aGUgdmFsaWRhdGVkIGNhcGFiaWxpdGllcyBvYmplY3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVyU2VydmljZS5jcHAgYi9Tb3VyY2UvV2Vi RHJpdmVyL1dlYkRyaXZlclNlcnZpY2UuY3BwCmluZGV4IGM0N2VjMzQxNmU3Li40MjNiOGM1NDVj MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9XZWJEcml2ZXJTZXJ2aWNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViRHJpdmVyL1dlYkRyaXZlclNlcnZpY2UuY3BwCkBAIC00MzAsNDMgKzQzMCw2 NCBAQCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBXZWJEcml2ZXJTZXJ2aWNlOjptZXJnZUNhcGFi aWxpdGllcyhjb25zdCBJbnNwZWN0b3JPYmplYwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXN0 ZDo6b3B0aW9uYWw8U3RyaW5nPiBXZWJEcml2ZXJTZXJ2aWNlOjptYXRjaENhcGFiaWxpdGllcyhj b25zdCBJbnNwZWN0b3JPYmplY3QmIG1lcmdlZENhcGFiaWxpdGllcykgY29uc3QKK1JlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IFdlYkRyaXZlclNlcnZpY2U6Om1hdGNoQ2FwYWJpbGl0aWVzKGNvbnN0 IEluc3BlY3Rvck9iamVjdCYgbWVyZ2VkQ2FwYWJpbGl0aWVzLCBzdGQ6Om9wdGlvbmFsPFN0cmlu Zz4mIGVycm9yU3RyaW5nKSBjb25zdAogewogICAgIC8vIMKnNy4yIFByb2Nlc3NpbmcgQ2FwYWJp bGl0aWVzLgogICAgIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby93ZWJkcml2ZXIvd2ViZHJpdmVy LXNwZWMuaHRtbCNkZm4tbWF0Y2hpbmctY2FwYWJpbGl0aWVzCi0gICAgQ2FwYWJpbGl0aWVzIG1h dGNoZWRDYXBhYmlsaXRpZXMgPSBwbGF0Zm9ybUNhcGFiaWxpdGllcygpOworICAgIENhcGFiaWxp dGllcyBwbGF0Zm9ybUNhcGFiaWxpdGllcyA9IHRoaXMtPnBsYXRmb3JtQ2FwYWJpbGl0aWVzKCk7 CiAKICAgICAvLyBTb21lIGNhcGFiaWxpdGllcyBsaWtlIGJyb3dzZXIgbmFtZSBhbmQgdmVyc2lv biBtaWdodCBuZWVkIHRvIGxhdW5jaCB0aGUgYnJvd3NlciwKICAgICAvLyBzbyB3ZSBvbmx5IHJl amVjdCB0aGUga25vd24gY2FwYWJpbGl0aWVzIHRoYXQgZG9uJ3QgbWF0Y2guCisgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gbWF0Y2hlZENhcGFiaWxpdGllcyA9IEluc3BlY3Rvck9iamVjdDo6 Y3JlYXRlKCk7CisgICAgaWYgKHBsYXRmb3JtQ2FwYWJpbGl0aWVzLmJyb3dzZXJOYW1lKQorICAg ICAgICBtYXRjaGVkQ2FwYWJpbGl0aWVzLT5zZXRTdHJpbmcoQVNDSUlMaXRlcmFsKCJicm93c2Vy TmFtZSIpLCBwbGF0Zm9ybUNhcGFiaWxpdGllcy5icm93c2VyTmFtZS52YWx1ZSgpKTsKKyAgICBp ZiAocGxhdGZvcm1DYXBhYmlsaXRpZXMuYnJvd3NlclZlcnNpb24pCisgICAgICAgIG1hdGNoZWRD YXBhYmlsaXRpZXMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoImJyb3dzZXJWZXJzaW9uIiksIHBs YXRmb3JtQ2FwYWJpbGl0aWVzLmJyb3dzZXJWZXJzaW9uLnZhbHVlKCkpOworICAgIGlmIChwbGF0 Zm9ybUNhcGFiaWxpdGllcy5wbGF0Zm9ybU5hbWUpCisgICAgICAgIG1hdGNoZWRDYXBhYmlsaXRp ZXMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoInBsYXRmb3JtTmFtZSIpLCBwbGF0Zm9ybUNhcGFi aWxpdGllcy5wbGF0Zm9ybU5hbWUudmFsdWUoKSk7CisgICAgaWYgKHBsYXRmb3JtQ2FwYWJpbGl0 aWVzLmFjY2VwdEluc2VjdXJlQ2VydHMpCisgICAgICAgIG1hdGNoZWRDYXBhYmlsaXRpZXMtPnNl dEJvb2xlYW4oQVNDSUlMaXRlcmFsKCJhY2NlcHRJbnNlY3VyZUNlcnRzIiksIHBsYXRmb3JtQ2Fw YWJpbGl0aWVzLmFjY2VwdEluc2VjdXJlQ2VydHMudmFsdWUoKSk7CisKICAgICBhdXRvIGVuZCA9 IG1lcmdlZENhcGFiaWxpdGllcy5lbmQoKTsKICAgICBmb3IgKGF1dG8gaXQgPSBtZXJnZWRDYXBh YmlsaXRpZXMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGlmIChpdC0+a2V5 ID09ICJicm93c2VyTmFtZSIgJiYgbWF0Y2hlZENhcGFiaWxpdGllcy5icm93c2VyTmFtZSkgewor ICAgICAgICBpZiAoaXQtPmtleSA9PSAiYnJvd3Nlck5hbWUiICYmIHBsYXRmb3JtQ2FwYWJpbGl0 aWVzLmJyb3dzZXJOYW1lKSB7CiAgICAgICAgICAgICBTdHJpbmcgYnJvd3Nlck5hbWU7CiAgICAg ICAgICAgICBpdC0+dmFsdWUtPmFzU3RyaW5nKGJyb3dzZXJOYW1lKTsKLSAgICAgICAgICAgIGlm ICghZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShtYXRjaGVkQ2FwYWJpbGl0aWVzLmJyb3dzZXJOYW1l LnZhbHVlKCksIGJyb3dzZXJOYW1lKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbWFrZVN0cmlu ZygiZXhwZWN0ZWQgYnJvd3Nlck5hbWUgIiwgbWF0Y2hlZENhcGFiaWxpdGllcy5icm93c2VyTmFt ZS52YWx1ZSgpLCAiIGJ1dCBnb3QgIiwgYnJvd3Nlck5hbWUpOwotICAgICAgICB9IGVsc2UgaWYg KGl0LT5rZXkgPT0gImJyb3dzZXJWZXJzaW9uIiAmJiBtYXRjaGVkQ2FwYWJpbGl0aWVzLmJyb3dz ZXJWZXJzaW9uKSB7CisgICAgICAgICAgICBpZiAoIWVxdWFsSWdub3JpbmdBU0NJSUNhc2UocGxh dGZvcm1DYXBhYmlsaXRpZXMuYnJvd3Nlck5hbWUudmFsdWUoKSwgYnJvd3Nlck5hbWUpKSB7Cisg ICAgICAgICAgICAgICAgZXJyb3JTdHJpbmcgPSBtYWtlU3RyaW5nKCJleHBlY3RlZCBicm93c2Vy TmFtZSAiLCBwbGF0Zm9ybUNhcGFiaWxpdGllcy5icm93c2VyTmFtZS52YWx1ZSgpLCAiIGJ1dCBn b3QgIiwgYnJvd3Nlck5hbWUpOworICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAg ICAgICAgICAgfQorICAgICAgICB9IGVsc2UgaWYgKGl0LT5rZXkgPT0gImJyb3dzZXJWZXJzaW9u IiAmJiBwbGF0Zm9ybUNhcGFiaWxpdGllcy5icm93c2VyVmVyc2lvbikgewogICAgICAgICAgICAg U3RyaW5nIGJyb3dzZXJWZXJzaW9uOwogICAgICAgICAgICAgaXQtPnZhbHVlLT5hc1N0cmluZyhi cm93c2VyVmVyc2lvbik7Ci0gICAgICAgICAgICBpZiAoIXBsYXRmb3JtQ29tcGFyZUJyb3dzZXJW ZXJzaW9ucyhicm93c2VyVmVyc2lvbiwgbWF0Y2hlZENhcGFiaWxpdGllcy5icm93c2VyVmVyc2lv bi52YWx1ZSgpKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbWFrZVN0cmluZygicmVxdWVzdGVk IGJyb3dzZXJWZXJzaW9uIGlzICIsIGJyb3dzZXJWZXJzaW9uLCAiIGJ1dCBhY3R1YWwgdmVyc2lv biBpcyAiLCBtYXRjaGVkQ2FwYWJpbGl0aWVzLmJyb3dzZXJWZXJzaW9uLnZhbHVlKCkpOwotICAg ICAgICB9IGVsc2UgaWYgKGl0LT5rZXkgPT0gInBsYXRmb3JtTmFtZSIgJiYgbWF0Y2hlZENhcGFi aWxpdGllcy5wbGF0Zm9ybU5hbWUpIHsKKyAgICAgICAgICAgIGlmICghcGxhdGZvcm1Db21wYXJl QnJvd3NlclZlcnNpb25zKGJyb3dzZXJWZXJzaW9uLCBwbGF0Zm9ybUNhcGFiaWxpdGllcy5icm93 c2VyVmVyc2lvbi52YWx1ZSgpKSkgeworICAgICAgICAgICAgICAgIGVycm9yU3RyaW5nID0gbWFr ZVN0cmluZygicmVxdWVzdGVkIGJyb3dzZXJWZXJzaW9uIGlzICIsIGJyb3dzZXJWZXJzaW9uLCAi IGJ1dCBhY3R1YWwgdmVyc2lvbiBpcyAiLCBwbGF0Zm9ybUNhcGFiaWxpdGllcy5icm93c2VyVmVy c2lvbi52YWx1ZSgpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChpdC0+a2V5ID09ICJwbGF0Zm9ybU5hbWUiICYmIHBs YXRmb3JtQ2FwYWJpbGl0aWVzLnBsYXRmb3JtTmFtZSkgewogICAgICAgICAgICAgU3RyaW5nIHBs YXRmb3JtTmFtZTsKICAgICAgICAgICAgIGl0LT52YWx1ZS0+YXNTdHJpbmcocGxhdGZvcm1OYW1l KTsKLSAgICAgICAgICAgIGlmICghZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UocGxhdGZv cm1OYW1lLCAiYW55IikgJiYgIWVxdWFsSWdub3JpbmdBU0NJSUNhc2UobWF0Y2hlZENhcGFiaWxp dGllcy5wbGF0Zm9ybU5hbWUudmFsdWUoKSwgcGxhdGZvcm1OYW1lKSkKLSAgICAgICAgICAgICAg ICByZXR1cm4gbWFrZVN0cmluZygiZXhwZWN0ZWQgcGxhdGZvcm1OYW1lICIsIG1hdGNoZWRDYXBh YmlsaXRpZXMucGxhdGZvcm1OYW1lLnZhbHVlKCksICIgYnV0IGdvdCAiLCBwbGF0Zm9ybU5hbWUp OwotICAgICAgICB9IGVsc2UgaWYgKGl0LT5rZXkgPT0gImFjY2VwdEluc2VjdXJlQ2VydHMiICYm IG1hdGNoZWRDYXBhYmlsaXRpZXMuYWNjZXB0SW5zZWN1cmVDZXJ0cykgeworICAgICAgICAgICAg aWYgKCFlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShwbGF0Zm9ybU5hbWUsICJhbnkiKSAm JiAhZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShwbGF0Zm9ybUNhcGFiaWxpdGllcy5wbGF0Zm9ybU5h bWUudmFsdWUoKSwgcGxhdGZvcm1OYW1lKSkgeworICAgICAgICAgICAgICAgIGVycm9yU3RyaW5n ID0gbWFrZVN0cmluZygiZXhwZWN0ZWQgcGxhdGZvcm1OYW1lICIsIHBsYXRmb3JtQ2FwYWJpbGl0 aWVzLnBsYXRmb3JtTmFtZS52YWx1ZSgpLCAiIGJ1dCBnb3QgIiwgcGxhdGZvcm1OYW1lKTsKKyAg ICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBl bHNlIGlmIChpdC0+a2V5ID09ICJhY2NlcHRJbnNlY3VyZUNlcnRzIiAmJiBwbGF0Zm9ybUNhcGFi aWxpdGllcy5hY2NlcHRJbnNlY3VyZUNlcnRzKSB7CiAgICAgICAgICAgICBib29sIGFjY2VwdElu c2VjdXJlQ2VydHM7CiAgICAgICAgICAgICBpdC0+dmFsdWUtPmFzQm9vbGVhbihhY2NlcHRJbnNl Y3VyZUNlcnRzKTsKLSAgICAgICAgICAgIGlmIChhY2NlcHRJbnNlY3VyZUNlcnRzICYmICFtYXRj aGVkQ2FwYWJpbGl0aWVzLmFjY2VwdEluc2VjdXJlQ2VydHMudmFsdWUoKSkKLSAgICAgICAgICAg ICAgICByZXR1cm4gU3RyaW5nKCJicm93c2VyIGRvZXNuJ3QgYWNjZXB0IGluc2VjdXJlIFRMUyBj ZXJ0aWZpY2F0ZXMiKTsKKyAgICAgICAgICAgIGlmIChhY2NlcHRJbnNlY3VyZUNlcnRzICYmICFw bGF0Zm9ybUNhcGFiaWxpdGllcy5hY2NlcHRJbnNlY3VyZUNlcnRzLnZhbHVlKCkpIHsKKyAgICAg ICAgICAgICAgICBlcnJvclN0cmluZyA9IFN0cmluZygiYnJvd3NlciBkb2Vzbid0IGFjY2VwdCBp bnNlY3VyZSBUTFMgY2VydGlmaWNhdGVzIik7CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxw dHI7CisgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAoaXQtPmtleSA9PSAicHJveHki KSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogaW1wbGVtZW50IHByb3h5IHN1cHBvcnQuCi0gICAg ICAgIH0gZWxzZSBpZiAoYXV0byBlcnJvclN0cmluZyA9IHBsYXRmb3JtTWF0Y2hDYXBhYmlsaXR5 KGl0LT5rZXksIGl0LT52YWx1ZSkpCi0gICAgICAgICAgICByZXR1cm4gZXJyb3JTdHJpbmc7Cisg ICAgICAgIH0gZWxzZSBpZiAoYXV0byBwbGF0Zm9ybUVycm9yU3RyaW5nID0gcGxhdGZvcm1NYXRj aENhcGFiaWxpdHkoaXQtPmtleSwgaXQtPnZhbHVlKSkgeworICAgICAgICAgICAgZXJyb3JTdHJp bmcgPSBwbGF0Zm9ybUVycm9yU3RyaW5nOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Cisg ICAgICAgIH0KKyAgICAgICAgbWF0Y2hlZENhcGFiaWxpdGllcy0+c2V0VmFsdWUoaXQtPmtleSwg UmVmUHRyPEluc3BlY3RvclZhbHVlPihpdC0+dmFsdWUpKTsKICAgICB9CiAKLSAgICByZXR1cm4g c3RkOjpudWxsb3B0OworICAgIHJldHVybiBtYXRjaGVkQ2FwYWJpbGl0aWVzOwogfQogCiBSZWZQ dHI8SW5zcGVjdG9yT2JqZWN0PiBXZWJEcml2ZXJTZXJ2aWNlOjpwcm9jZXNzQ2FwYWJpbGl0aWVz KGNvbnN0IEluc3BlY3Rvck9iamVjdCYgcGFyYW1ldGVycywgRnVuY3Rpb248dm9pZCAoQ29tbWFu ZFJlc3VsdCYmKT4mIGNvbXBsZXRpb25IYW5kbGVyKSBjb25zdApAQCAtNTQ0LDEwICs1NjUsMTAg QEAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gV2ViRHJpdmVyU2VydmljZTo6cHJvY2Vzc0NhcGFi aWxpdGllcyhjb25zdCBJbnNwZWN0b3JPYmoKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgICAgICB9CiAgICAgICAgIC8vIDYuMi4gTGV0IG1hdGNoZWQgY2FwYWJpbGl0aWVzIGJlIHRo ZSByZXN1bHQgb2YgdHJ5aW5nIHRvIG1hdGNoIGNhcGFiaWxpdGllcyB3aXRoIG1lcmdlZCBjYXBh YmlsaXRpZXMgYXMgYW4gYXJndW1lbnQuCi0gICAgICAgIGVycm9yU3RyaW5nID0gbWF0Y2hDYXBh YmlsaXRpZXMoKm1lcmdlZENhcGFiaWxpdGllcyk7Ci0gICAgICAgIGlmICghZXJyb3JTdHJpbmcp IHsKKyAgICAgICAgYXV0byBtYXRjaGVkQ2FwYWJpbGl0aWVzID0gbWF0Y2hDYXBhYmlsaXRpZXMo Km1lcmdlZENhcGFiaWxpdGllcywgZXJyb3JTdHJpbmcpOworICAgICAgICBpZiAobWF0Y2hlZENh cGFiaWxpdGllcykgewogICAgICAgICAgICAgLy8gNi4zLiBJZiBtYXRjaGVkIGNhcGFiaWxpdGll cyBpcyBub3QgbnVsbCByZXR1cm4gbWF0Y2hlZCBjYXBhYmlsaXRpZXMuCi0gICAgICAgICAgICBy ZXR1cm4gbWVyZ2VkQ2FwYWJpbGl0aWVzOworICAgICAgICAgICAgcmV0dXJuIG1hdGNoZWRDYXBh YmlsaXRpZXM7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2 ZXIvV2ViRHJpdmVyU2VydmljZS5oIGIvU291cmNlL1dlYkRyaXZlci9XZWJEcml2ZXJTZXJ2aWNl LmgKaW5kZXggZmU4NzM1ODA1MzUuLmQyOTYwOTAwZjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi RHJpdmVyL1dlYkRyaXZlclNlcnZpY2UuaAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL1dlYkRyaXZl clNlcnZpY2UuaApAQCAtMTE0LDcgKzExNCw3IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPEluc3Bl Y3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBwcm9jZXNzQ2FwYWJpbGl0aWVzKGNvbnN0IEluc3BlY3Rv cjo6SW5zcGVjdG9yT2JqZWN0JiwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mKSBj b25zdDsKICAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IHZhbGlkYXRlZENh cGFiaWxpdGllcyhjb25zdCBJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdCYpIGNvbnN0OwogICAg IFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gbWVyZ2VDYXBhYmlsaXRpZXMoY29u c3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3QmLCBjb25zdCBJbnNwZWN0b3I6Okluc3BlY3Rv ck9iamVjdCYpIGNvbnN0OwotICAgIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBtYXRjaENhcGFiaWxp dGllcyhjb25zdCBJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdCYpIGNvbnN0OworICAgIFJlZlB0 cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gbWF0Y2hDYXBhYmlsaXRpZXMoY29uc3QgSW5z cGVjdG9yOjpJbnNwZWN0b3JPYmplY3QmLCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4mKSBjb25zdDsK ICAgICBib29sIHBsYXRmb3JtVmFsaWRhdGVDYXBhYmlsaXR5KGNvbnN0IFN0cmluZyYsIGNvbnN0 IFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3RvclZhbHVlPiYpIGNvbnN0OwogICAgIHN0ZDo6b3B0 aW9uYWw8U3RyaW5nPiBwbGF0Zm9ybU1hdGNoQ2FwYWJpbGl0eShjb25zdCBTdHJpbmcmLCBjb25z dCBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JWYWx1ZT4mKSBjb25zdDsKICAgICB2b2lkIHBh cnNlQ2FwYWJpbGl0aWVzKGNvbnN0IEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0JiBkZXNpcmVk Q2FwYWJpbGl0aWVzLCBDYXBhYmlsaXRpZXMmKSBjb25zdDsK