232212 2021-10-23 20:58:09 -0700 Add an ImageDiff option to print out WPT-style pixel differences 2021-10-24 13:48:13 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232201 1 simon.fraser simon.fraser ap darin fujii gsnedders jbedard simon.fraser webkit-bug-importer oldest_to_newest 1808164 0 simon.fraser 2021-10-23 20:58:09 -0700 Add an ImageDiff option to print out WPT-style pixel differences 1808165 1 442291 simon.fraser 2021-10-23 21:00:35 -0700 Created attachment 442291 Patch 1808170 2 442291 darin 2021-10-23 22:05:00 -0700 Comment on attachment 442291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442291&action=review r=me even though this current version of the patch doesn’t apply yet > Tools/ImageDiff/ImageDiff.cpp:52 > +static int processImages(std::unique_ptr<PlatformImage>&& actualImage, std::unique_ptr<PlatformImage>&& baselineImage, float tolerance, bool printDifferance) There’s a spelling error here where difference has an a instead of an E. I recommend searching for “ifferance” and fixing them all. > Tools/ImageDiff/ImageDiff.cpp:136 > + " -d, --difference print WTP-style maxDifference and totalPixels data\n" \ I think we mean WPT not WTP 1808236 3 simon.fraser 2021-10-24 11:24:20 -0700 https://trac.webkit.org/changeset/284764/webkit 1808237 4 webkit-bug-importer 2021-10-24 11:25:17 -0700 <rdar://problem/84595508> 442291 2021-10-23 21:00:35 -0700 2021-10-23 22:05:00 -0700 Patch bug-232212-20211023210034.patch text/plain 12534 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NzEwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmY2MzhhYzIzYjkyYmM3ZmEwNTBiMzg5NDE5YTE1MzBl ZGYwODllNy4uYzhhZWJjZjlkMTU0NzY1YzBjNGFkNjU1ZDU0OTJkYzY0YTk4Mzg2ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIxLTEwLTIzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEFkZCBhbiBJbWFnZURpZmYgb3B0aW9uIHRvIHByaW50IG91dCBXUFQtc3R5bGUg cGl4ZWwgZGlmZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzMjIxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor ICAgICAgICAKKyAgICAgICAgV2hlbiBwYXNzZWQgYC0tZGlmZmVyZW5jZWAsIEltYWdlRGlmZiB3 aWxsIGNvbXB1dGUgYW5kIHByaW50IG91dCB0aGUgIm1heERpZmZlcmVuY2U9O3RvdGFsUGl4ZWxz PSIKKyAgICAgICAgdmFsdWVzIGRvY3VtZW50ZWQgYXQgaHR0cHM6Ly93ZWItcGxhdGZvcm0tdGVz dHMub3JnL3dyaXRpbmctdGVzdHMvcmVmdGVzdHMuaHRtbC4gV2l0aCB0aGVzZSB2YWx1ZXMsCisg ICAgICAgIHRoZXJlIGlzIG5vIGJ1aWx0LWluIHRvbGVyYW5jZSBhcyB0aGVyZSBpcyB3aXRoIHRo ZSBsZWdhY3kgZGlmZmVyZW5jZSBjb21wdXRhdGlvbi4KKworICAgICAgICBSZW5hbWUgdmFyaWFi bGVzIHJlbGF0ZWQgdG8gdGhlIGxlZ2FjeSBjb21wdXRhdGlvbi4KKworICAgICAgICAqIEltYWdl RGlmZi9JbWFnZURpZmYuY3BwOgorICAgICAgICAocHJvY2Vzc0ltYWdlcyk6CisgICAgICAgICht YWluKToKKyAgICAgICAgKiBJbWFnZURpZmYvUGxhdGZvcm1JbWFnZS5jcHA6CisgICAgICAgIChJ bWFnZURpZmY6OlBsYXRmb3JtSW1hZ2U6OmRpZmZlcmVuY2UpOgorICAgICAgICAqIEltYWdlRGlm Zi9QbGF0Zm9ybUltYWdlLmg6CisKIDIwMjEtMTAtMjMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgSW1hZ2VEaWZmIHRvIHJlYWQgZnJvbSBm aWxlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZmL0ltYWdlRGlmZi5jcHAgYi9Ub29scy9J bWFnZURpZmYvSW1hZ2VEaWZmLmNwcAppbmRleCBlYWFhMjJhNWI5Njc2NmI3ODJiNTA5Y2U2M2Qz NGIwMjk2MTgzZjMwLi4zZTJmZDU0N2NiZTc2OGM0YjFhYzQ1ZDI4YzYzYjNhOTdiZGE0ZmIyIDEw MDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYvSW1hZ2VEaWZmLmNwcAorKysgYi9Ub29scy9JbWFn ZURpZmYvSW1hZ2VEaWZmLmNwcApAQCAtMSw0ICsxLDUgQEAKIC8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAy MDE3IElnYWxpYSBTLkwuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDcsIDIwMTUgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA1IEJlbiBMYSBN b25pY2EgPGJlbi5sYW1vbmljYUBnbWFpbC5jb20+LiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KQEAg LTQ4LDcgKzQ5LDcgQEAgdXNpbmcgbmFtZXNwYWNlIEltYWdlRGlmZjsKICNkZWZpbmUgRk9STUFU X1NJWkVfVCAienUiCiAjZW5kaWYKIAotc3RhdGljIGludCBwcm9jZXNzSW1hZ2VzKHN0ZDo6dW5p cXVlX3B0cjxQbGF0Zm9ybUltYWdlPiYmIGFjdHVhbEltYWdlLCBzdGQ6OnVuaXF1ZV9wdHI8UGxh dGZvcm1JbWFnZT4mJiBiYXNlbGluZUltYWdlLCBmbG9hdCB0b2xlcmFuY2UpCitzdGF0aWMgaW50 IHByb2Nlc3NJbWFnZXMoc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtSW1hZ2U+JiYgYWN0dWFsSW1h Z2UsIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdlPiYmIGJhc2VsaW5lSW1hZ2UsIGZsb2F0 IHRvbGVyYW5jZSwgYm9vbCBwcmludERpZmZlcmFuY2UpCiB7CiAgICAgaWYgKCFhY3R1YWxJbWFn ZS0+aXNDb21wYXRpYmxlKCpiYXNlbGluZUltYWdlKSkgewogICAgICAgICBpZiAoYWN0dWFsSW1h Z2UtPndpZHRoKCkgIT0gYmFzZWxpbmVJbWFnZS0+d2lkdGgoKSB8fCBhY3R1YWxJbWFnZS0+aGVp Z2h0KCkgIT0gYmFzZWxpbmVJbWFnZS0+aGVpZ2h0KCkpIHsKQEAgLTYyLDIxICs2MywyNSBAQCBz dGF0aWMgaW50IHByb2Nlc3NJbWFnZXMoc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtSW1hZ2U+JiYg YWN0dWFsSW1hZ2UsIHN0ZDo6dW5pcQogICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogICAg IH0KIAotICAgIGZsb2F0IGRpZmZlcmVuY2UgPSAxMDAuMGY7Ci0gICAgc3RkOjp1bmlxdWVfcHRy PFBsYXRmb3JtSW1hZ2U+IGRpZmZJbWFnZSA9IGFjdHVhbEltYWdlLT5kaWZmZXJlbmNlKCpiYXNl bGluZUltYWdlLCBkaWZmZXJlbmNlKTsKLSAgICBpZiAoZGlmZmVyZW5jZSA8PSB0b2xlcmFuY2Up Ci0gICAgICAgIGRpZmZlcmVuY2UgPSAwLjBmOworICAgIFBsYXRmb3JtSW1hZ2U6OkRpZmZlcmVu Y2UgZGlmZmVyZW5jZURhdGEgPSB7IDEwMCwgMCwgMCB9OworICAgIHN0ZDo6dW5pcXVlX3B0cjxQ bGF0Zm9ybUltYWdlPiBkaWZmSW1hZ2UgPSBhY3R1YWxJbWFnZS0+ZGlmZmVyZW5jZSgqYmFzZWxp bmVJbWFnZSwgZGlmZmVyZW5jZURhdGEpOworICAgIGZsb2F0IGxlZ2FjeURpZmZlcmVuY2UgPSBk aWZmZXJlbmNlRGF0YS5wZXJjZW50YWdlRGlmZmVyZW5jZTsKKyAgICBpZiAobGVnYWN5RGlmZmVy ZW5jZSA8PSB0b2xlcmFuY2UpCisgICAgICAgIGxlZ2FjeURpZmZlcmVuY2UgPSAwLjBmOwogICAg IGVsc2UgewotICAgICAgICBkaWZmZXJlbmNlID0gcm91bmRmKGRpZmZlcmVuY2UgKiAxMDAuMGYp IC8gMTAwLjBmOwotICAgICAgICBkaWZmZXJlbmNlID0gc3RkOjptYXg8ZmxvYXQ+KGRpZmZlcmVu Y2UsIDAuMDFmKTsgLy8gcm91bmQgdG8gMiBkZWNpbWFsIHBsYWNlcworICAgICAgICBsZWdhY3lE aWZmZXJlbmNlID0gcm91bmRmKGxlZ2FjeURpZmZlcmVuY2UgKiAxMDAuMGYpIC8gMTAwLjBmOwor ICAgICAgICBsZWdhY3lEaWZmZXJlbmNlID0gc3RkOjptYXg8ZmxvYXQ+KGxlZ2FjeURpZmZlcmVu Y2UsIDAuMDFmKTsgLy8gcm91bmQgdG8gMiBkZWNpbWFsIHBsYWNlcwogICAgIH0KIAotICAgIGlm IChkaWZmZXJlbmNlID4gMC4wZikgeworICAgIGlmIChsZWdhY3lEaWZmZXJlbmNlID4gMC4wZikg ewogICAgICAgICBpZiAoZGlmZkltYWdlKQogICAgICAgICAgICAgZGlmZkltYWdlLT53cml0ZUFz UE5HVG9TdGRvdXQoKTsKLSAgICAgICAgZnByaW50ZihzdGRvdXQsICJkaWZmOiAlMDEuMmYlJSBm YWlsZWRcbiIsIGRpZmZlcmVuY2UpOworICAgICAgICBmcHJpbnRmKHN0ZG91dCwgImRpZmY6ICUw MS4yZiUlIGZhaWxlZFxuIiwgbGVnYWN5RGlmZmVyZW5jZSk7CiAgICAgfSBlbHNlCi0gICAgICAg IGZwcmludGYoc3Rkb3V0LCAiZGlmZjogJTAxLjJmJSUgcGFzc2VkXG4iLCBkaWZmZXJlbmNlKTsK KyAgICAgICAgZnByaW50ZihzdGRvdXQsICJkaWZmOiAlMDEuMmYlJSBwYXNzZWRcbiIsIGxlZ2Fj eURpZmZlcmVuY2UpOworCisgICAgaWYgKHByaW50RGlmZmVyYW5jZSkKKyAgICAgICAgZnByaW50 ZihzdGRvdXQsICJtYXhEaWZmZXJlbmNlPSV1OyB0b3RhbFBpeGVscz0lbHVcbiIsIGRpZmZlcmVu Y2VEYXRhLm1heERpZmZlcmVuY2UsIGRpZmZlcmVuY2VEYXRhLnRvdGFsUGl4ZWxzKTsKIAogICAg IHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CkBAIC05MCw2ICs5NSw3IEBAIGludCBtYWluKGludCBh cmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAKICAgICBmbG9hdCB0b2xlcmFuY2UgPSAwLjBmOwog ICAgIGJvb2wgdmVyYm9zZSA9IGZhbHNlOworICAgIGJvb2wgcHJpbnREaWZmZXJhbmNlID0gZmFs c2U7CiAKICAgICBmb3IgKGludCBpID0gMTsgaSA8IGFyZ2M7ICsraSkgewogICAgICAgICBpZiAo IXN0cmNtcChhcmd2W2ldLCAiLXQiKSB8fCAhc3RyY21wKGFyZ3ZbaV0sICItLXRvbGVyYW5jZSIp KSB7CkBAIC0xMTEsOSArMTE3LDE0IEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBh cmd2W10pCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCisgICAgICAgIGlmICgh c3RyY21wKGFyZ3ZbaV0sICItZCIpIHx8ICFzdHJjbXAoYXJndltpXSwgIi0tZGlmZmVyZW5jZSIp KSB7CisgICAgICAgICAgICBwcmludERpZmZlcmFuY2UgPSB0cnVlOworICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgIH0KKwogICAgICAgICBpZiAoIXN0cmNtcChhcmd2W2ldLCAiLWgiKSB8 fCAhc3RyY21wKGFyZ3ZbaV0sICItLWhlbHAiKSkgewogICAgICAgICAgICAgZnByaW50ZihzdGRv dXQsCi0gICAgICAgICAgICAgICAgInVzYWdlOiBJbWFnZURpZmYgWy1oXSBbLXQgVE9MRVJBTkNF XSBbLXZdIChbYWN0dWFsSW1hZ2UgYmFzZWxpbmVJbWFnZV0gfCA8c3RkaW4+KVxuIiBcCisgICAg ICAgICAgICAgICAgInVzYWdlOiBJbWFnZURpZmYgWy1oXSBbLXZdIFstZF0gWy10IFRPTEVSQU5D RV0gKFthY3R1YWxJbWFnZSBiYXNlbGluZUltYWdlXSB8IDxzdGRpbj4pXG4iIFwKICAgICAgICAg ICAgICAgICAiXG4iIFwKICAgICAgICAgICAgICAgICAiUmVhZHMgdHdvIFBORy1lbmNvZGVkIGlt YWdlcyBhbmQgY29tcGFyZXMgdGhlbS4gSWYgdHdvIGZpbGUgcGF0aCBhcmd1bWVudHMgYXJlIHN1 cHBsaWVkLCBcbiIgXAogICAgICAgICAgICAgICAgICJyZWFkcyBmcm9tIHRoZSBzcGVjaWZpZWQg ZmlsZXMsIG90aGVyd2lzZSBmcm9tIDxzdGRpbj4gd2hlcmUgZWFjaCBmaWxlIGlzIHByZWNlZGVk IGJ5IFxuIiBcCkBAIC0xMjIsNiArMTMzLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNo YXIqIGFyZ3ZbXSkKICAgICAgICAgICAgICAgICAib3B0aW9uYWwgYXJndW1lbnRzOlxuIiBcCiAg ICAgICAgICAgICAgICAgIiAgLWgsIC0taGVscCAgICAgICAgICAgIHNob3cgdGhpcyBoZWxwIG1l c3NhZ2UgYW5kIGV4aXRcbiIgXAogICAgICAgICAgICAgICAgICIgIC12LCAtLXZlcmJvc2UgICAg ICAgICBwcmludCBkaWFnbm9zdGljIGluZm9ybWF0aW9uIHRvIHN0ZGVyclxuIiBcCisgICAgICAg ICAgICAgICAgIiAgLWQsIC0tZGlmZmVyZW5jZSAgICAgIHByaW50IFdUUC1zdHlsZSBtYXhEaWZm ZXJlbmNlIGFuZCB0b3RhbFBpeGVscyBkYXRhXG4iIFwKICAgICAgICAgICAgICAgICAiICAtdCwg LS10b2xlcmFuY2UgVE9MRVJBTkNFXG4iIFwKICAgICAgICAgICAgICAgICAiICAgICAgICAgICAg ICAgICAgICAgICAgY29tcGFyZSB0aGUgaW1hZ2VzIHdpdGggdGhlIGdpdmVuIHRvbGVyYW5jZVxu IgogICAgICAgICAgICAgKTsKQEAgLTE1OCw3ICsxNzAsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywg Y29uc3QgY2hhciogYXJndltdKQogICAgICAgICAgICAgaWYgKHZlcmJvc2UpCiAgICAgICAgICAg ICAgICAgZnByaW50ZihzdGRlcnIsICJDb21wYXJpbmcgZmlsZXMgYWN0dWFsOiAlcyBhbmQgYmFz ZWxpbmU6ICVzXG4iLCBmaWxlMVBhdGgsIGZpbGUyUGF0aCk7CiAKLSAgICAgICAgICAgIGF1dG8g cmVzdWx0ID0gcHJvY2Vzc0ltYWdlcyhzdGQ6OmV4Y2hhbmdlKGFjdHVhbEltYWdlLCB7IH0pLCBz dGQ6OmV4Y2hhbmdlKGJhc2VsaW5lSW1hZ2UsIHsgfSksIHRvbGVyYW5jZSk7CisgICAgICAgICAg ICBhdXRvIHJlc3VsdCA9IHByb2Nlc3NJbWFnZXMoc3RkOjpleGNoYW5nZShhY3R1YWxJbWFnZSwg eyB9KSwgc3RkOjpleGNoYW5nZShiYXNlbGluZUltYWdlLCB7IH0pLCB0b2xlcmFuY2UsIHByaW50 RGlmZmVyYW5jZSk7CiAgICAgICAgICAgICBpZiAocmVzdWx0ID09IEVYSVRfRkFJTFVSRSkKICAg ICAgICAgICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogCkBAIC0yMTAsNyArMjIyLDcgQEAg aW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgaWYgKGFjdHVh bEltYWdlICYmIGJhc2VsaW5lSW1hZ2UpIHsKICAgICAgICAgICAgIGlmICh2ZXJib3NlKQogICAg ICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiSW1hZ2VEaWZmOiBwcm9jZXNzaW5nIGltYWdl c1xuIik7Ci0gICAgICAgICAgICBhdXRvIHJlc3VsdCA9IHByb2Nlc3NJbWFnZXMoc3RkOjpleGNo YW5nZShhY3R1YWxJbWFnZSwgeyB9KSwgc3RkOjpleGNoYW5nZShiYXNlbGluZUltYWdlLCB7IH0p LCB0b2xlcmFuY2UpOworICAgICAgICAgICAgYXV0byByZXN1bHQgPSBwcm9jZXNzSW1hZ2VzKHN0 ZDo6ZXhjaGFuZ2UoYWN0dWFsSW1hZ2UsIHsgfSksIHN0ZDo6ZXhjaGFuZ2UoYmFzZWxpbmVJbWFn ZSwgeyB9KSwgdG9sZXJhbmNlLCBwcmludERpZmZlcmFuY2UpOwogICAgICAgICAgICAgaWYgKHJl c3VsdCA9PSBFWElUX0ZBSUxVUkUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVS RTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZmL1BsYXRmb3JtSW1hZ2Uu Y3BwIGIvVG9vbHMvSW1hZ2VEaWZmL1BsYXRmb3JtSW1hZ2UuY3BwCmluZGV4IDRjOTljNzY1OTlm ODMyOGZlNDQyZGQzZGQxMDYyOGQ3OGNmN2YyMDEuLmRhMzBlMDNmZDYxMDFhMjdmZmM5MDMyMjE1 MWViZDIzMzVkYTJlNjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0ltYWdlRGlmZi9QbGF0Zm9ybUltYWdl LmNwcAorKysgYi9Ub29scy9JbWFnZURpZmYvUGxhdGZvcm1JbWFnZS5jcHAKQEAgLTEsNSArMSw1 IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA3LCAyMDE1IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNSwgMjAwNy0yMDIxIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwNSBCZW4gTGEg TW9uaWNhIDxiZW4ubGFtb25pY2FAZ21haWwuY29tPi4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg KiBDb3B5cmlnaHQgKEMpIDIwMTEgQnJlbnQgRnVsZ2hhbS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCkBAIC00MCwzNCArNDAsNDYgQEAgYm9vbCBQbGF0Zm9ybUltYWdlOjppc0NvbXBhdGlibGUo Y29uc3QgUGxhdGZvcm1JbWFnZSYgb3RoZXIpIGNvbnN0CiAgICAgICAgICYmIGhhc0FscGhhKCkg PT0gb3RoZXIuaGFzQWxwaGEoKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtSW1hZ2U+ IFBsYXRmb3JtSW1hZ2U6OmRpZmZlcmVuY2UoY29uc3QgUGxhdGZvcm1JbWFnZSYgb3RoZXIsIGZs b2F0JiBwZXJjZW50YWdlRGlmZmVyZW5jZSkKK3N0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdl PiBQbGF0Zm9ybUltYWdlOjpkaWZmZXJlbmNlKGNvbnN0IFBsYXRmb3JtSW1hZ2UmIG90aGVyLCBE aWZmZXJlbmNlJiBkaWZmZXJlbmNlKQogewogICAgIHNpemVfdCB3aWR0aCA9IHRoaXMtPndpZHRo KCk7CiAgICAgc2l6ZV90IGhlaWdodCA9IHRoaXMtPmhlaWdodCgpOwogCiAgICAgLy8gQ29tcGFy ZSB0aGUgY29udGVudCBvZiB0aGUgMiBiaXRtYXBzCiAgICAgdm9pZCogZGlmZkJ1ZmZlciA9IG1h bGxvYyh3aWR0aCAqIGhlaWdodCk7Ci0gICAgZmxvYXQgY291bnQgPSAwLjBmOwotICAgIGZsb2F0 IHN1bSA9IDAuMGY7Ci0gICAgZmxvYXQgbWF4RGlzdGFuY2UgPSAwLjBmOworICAgIHNpemVfdCBw aXhlbENvdW50V2l0aFNpZ25pZmljYW50RGlmZmVyZW5jZSA9IDA7CisgICAgZmxvYXQgbGVnYWN5 RGlzdGFuY2VTdW0gPSAwLjBmOworICAgIGZsb2F0IGxlZ2FjeURpc3RhbmNlTWF4ID0gMC4wZjsK KwogICAgIHVuc2lnbmVkIGNoYXIqIGJhc2VQaXhlbCA9IHRoaXMtPnBpeGVscygpOwogICAgIHVu c2lnbmVkIGNoYXIqIHBpeGVsID0gb3RoZXIucGl4ZWxzKCk7CiAgICAgdW5zaWduZWQgY2hhciog ZGlmZlBpeGVsID0gcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZCBjaGFyKj4oZGlmZkJ1ZmZlcik7 CisKICAgICBmb3IgKHNpemVfdCB5ID0gMDsgeSA8IGhlaWdodDsgKyt5KSB7CiAgICAgICAgIGZv ciAoc2l6ZV90IHggPSAwOyB4IDwgd2lkdGg7ICsreCkgewotICAgICAgICAgICAgZmxvYXQgcmVk ID0gKHBpeGVsWzBdIC0gYmFzZVBpeGVsWzBdKSAvIHN0ZDo6bWF4PGZsb2F0PigyNTUgLSBiYXNl UGl4ZWxbMF0sIGJhc2VQaXhlbFswXSk7CisgICAgICAgICAgICBmbG9hdCByZWQgICA9IChwaXhl bFswXSAtIGJhc2VQaXhlbFswXSkgLyBzdGQ6Om1heDxmbG9hdD4oMjU1IC0gYmFzZVBpeGVsWzBd LCBiYXNlUGl4ZWxbMF0pOwogICAgICAgICAgICAgZmxvYXQgZ3JlZW4gPSAocGl4ZWxbMV0gLSBi YXNlUGl4ZWxbMV0pIC8gc3RkOjptYXg8ZmxvYXQ+KDI1NSAtIGJhc2VQaXhlbFsxXSwgYmFzZVBp eGVsWzFdKTsKLSAgICAgICAgICAgIGZsb2F0IGJsdWUgPSAocGl4ZWxbMl0gLSBiYXNlUGl4ZWxb Ml0pIC8gc3RkOjptYXg8ZmxvYXQ+KDI1NSAtIGJhc2VQaXhlbFsyXSwgYmFzZVBpeGVsWzJdKTsK KyAgICAgICAgICAgIGZsb2F0IGJsdWUgID0gKHBpeGVsWzJdIC0gYmFzZVBpeGVsWzJdKSAvIHN0 ZDo6bWF4PGZsb2F0PigyNTUgLSBiYXNlUGl4ZWxbMl0sIGJhc2VQaXhlbFsyXSk7CiAgICAgICAg ICAgICBmbG9hdCBhbHBoYSA9IChwaXhlbFszXSAtIGJhc2VQaXhlbFszXSkgLyBzdGQ6Om1heDxm bG9hdD4oMjU1IC0gYmFzZVBpeGVsWzNdLCBiYXNlUGl4ZWxbM10pOwotICAgICAgICAgICAgZmxv YXQgZGlzdGFuY2UgPSBzcXJ0ZihyZWQgKiByZWQgKyBncmVlbiAqIGdyZWVuICsgYmx1ZSAqIGJs dWUgKyBhbHBoYSAqIGFscGhhKSAvIDIuMGY7CisgICAgICAgICAgICBmbG9hdCBsZWdhY3lEaXN0 YW5jZSA9IHNxcnRmKHJlZCAqIHJlZCArIGdyZWVuICogZ3JlZW4gKyBibHVlICogYmx1ZSArIGFs cGhhICogYWxwaGEpIC8gMi4wZjsKIAotICAgICAgICAgICAgKmRpZmZQaXhlbCsrID0gc3RhdGlj X2Nhc3Q8dW5zaWduZWQgY2hhcj4oZGlzdGFuY2UgKiAyNTUuMGYpOworICAgICAgICAgICAgKmRp ZmZQaXhlbCsrID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQgY2hhcj4obGVnYWN5RGlzdGFuY2UgKiAy NTUuMGYpOworICAgICAgICAgICAgCisgICAgICAgICAgICAvLyBXUFQtc3R5bGUgZGlmZmVyZW5j ZSBjb2RlLgorICAgICAgICAgICAgaWYgKGxlZ2FjeURpc3RhbmNlKSB7CisgICAgICAgICAgICAg ICAgKytkaWZmZXJlbmNlLnRvdGFsUGl4ZWxzOworICAgICAgICAgICAgICAgIHVuc2lnbmVkIHJl ZERpZmYgICAgPSBzdGQ6OmFicyhwaXhlbFswXSAtIGJhc2VQaXhlbFswXSk7CisgICAgICAgICAg ICAgICAgdW5zaWduZWQgZ3JlZW5EaWZmICA9IHN0ZDo6YWJzKHBpeGVsWzFdIC0gYmFzZVBpeGVs WzFdKTsKKyAgICAgICAgICAgICAgICB1bnNpZ25lZCBibHVlRGlmZiAgID0gc3RkOjphYnMocGl4 ZWxbMl0gLSBiYXNlUGl4ZWxbMl0pOworICAgICAgICAgICAgICAgIHVuc2lnbmVkIG1heERpZmYg PSBzdGQ6Om1heChyZWREaWZmLCBzdGQ6Om1heChncmVlbkRpZmYsIGJsdWVEaWZmKSk7CisgICAg ICAgICAgICAgICAgZGlmZmVyZW5jZS5tYXhEaWZmZXJlbmNlID0gc3RkOjptYXgoZGlmZmVyZW5j ZS5tYXhEaWZmZXJlbmNlLCBtYXhEaWZmKTsKKyAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg aWYgKGRpc3RhbmNlID49IDEuMGYgLyAyNTUuMGYpIHsKLSAgICAgICAgICAgICAgICBjb3VudCAr PSAxLjBmOwotICAgICAgICAgICAgICAgIHN1bSArPSBkaXN0YW5jZTsKLSAgICAgICAgICAgICAg ICBpZiAoZGlzdGFuY2UgPiBtYXhEaXN0YW5jZSkKLSAgICAgICAgICAgICAgICAgICAgbWF4RGlz dGFuY2UgPSBkaXN0YW5jZTsKKyAgICAgICAgICAgIC8vIExlZ2FjeSBkaWZmZXJlbmNlIGNvZGUu IE5vdGUgdGhlcmUgaXMgc29tZSBidWlsdC1pbiB0b2xlcmFuY2UgaGVyZS4KKyAgICAgICAgICAg IGlmIChsZWdhY3lEaXN0YW5jZSA+PSAxLjBmIC8gMjU1LjBmKSB7CisgICAgICAgICAgICAgICAg KytwaXhlbENvdW50V2l0aFNpZ25pZmljYW50RGlmZmVyZW5jZTsKKyAgICAgICAgICAgICAgICBs ZWdhY3lEaXN0YW5jZVN1bSArPSBsZWdhY3lEaXN0YW5jZTsKKyAgICAgICAgICAgICAgICBsZWdh Y3lEaXN0YW5jZU1heCA9IHN0ZDo6bWF4KGxlZ2FjeURpc3RhbmNlTWF4LCBsZWdhY3lEaXN0YW5j ZSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGJhc2VQaXhlbCArPSA0OwpAQCAtNzUs MjIgKzg3LDIyIEBAIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdlPiBQbGF0Zm9ybUltYWdl OjpkaWZmZXJlbmNlKGNvbnN0IFBsYXRmb3JtSW1hZ2UmIG90CiAgICAgICAgIH0KICAgICB9CiAK LSAgICAvLyBDb21wdXRlIHRoZSBkaWZmZXJlbmNlIGFzIGEgcGVyY2VudGFnZSBjb21iaW5pbmcg Ym90aCB0aGUgbnVtYmVyIG9mIGRpZmZlcmVudCBwaXhlbHMgYW5kIHRoZWlyIGRpZmZlcmVuY2Ug YW1vdW50IGkuZS4gdGhlIGF2ZXJhZ2UgZGlzdGFuY2Ugb3ZlciB0aGUgZW50aXJlIGltYWdlCi0g ICAgaWYgKGNvdW50ID4gMC4wZikKLSAgICAgICAgcGVyY2VudGFnZURpZmZlcmVuY2UgPSAxMDAu MGYgKiBzdW0gLyAoaGVpZ2h0ICogd2lkdGgpOworICAgIC8vIENvbXB1dGUgdGhlIGRpZmZlcmVu Y2UgYXMgYSBwZXJjZW50YWdlIGNvbWJpbmluZyBib3RoIHRoZSBudW1iZXIgb2YgZGlmZmVyZW50 IHBpeGVscyBhbmQgdGhlaXIgZGlmZmVyZW5jZSBhbW91bnQgaS5lLiB0aGUgYXZlcmFnZSBkaXN0 YW5jZSBvdmVyIHRoZSBlbnRpcmUgaW1hZ2UuCisgICAgaWYgKHBpeGVsQ291bnRXaXRoU2lnbmlm aWNhbnREaWZmZXJlbmNlKQorICAgICAgICBkaWZmZXJlbmNlLnBlcmNlbnRhZ2VEaWZmZXJlbmNl ID0gMTAwLjBmICogbGVnYWN5RGlzdGFuY2VTdW0gLyAoaGVpZ2h0ICogd2lkdGgpOwogICAgIGVs c2UKLSAgICAgICAgcGVyY2VudGFnZURpZmZlcmVuY2UgPSAwLjBmOworICAgICAgICBkaWZmZXJl bmNlLnBlcmNlbnRhZ2VEaWZmZXJlbmNlID0gMC4wZjsKIAotICAgIGlmICghcGVyY2VudGFnZURp ZmZlcmVuY2UpIHsKKyAgICBpZiAoIXBpeGVsQ291bnRXaXRoU2lnbmlmaWNhbnREaWZmZXJlbmNl KSB7CiAgICAgICAgIGZyZWUoZGlmZkJ1ZmZlcik7CiAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgIH0KIAotICAgIC8vIEdlbmVyYXRlIGEgbm9ybWFsaXplZCBkaWZmIGltYWdlIGlmIHRoZXJl IGlzIGFueSBkaWZmZXJlbmNlCi0gICAgaWYgKG1heERpc3RhbmNlIDwgMS4wZikgeworICAgIC8v IEdlbmVyYXRlIGEgbm9ybWFsaXplZCBkaWZmIGltYWdlIGlmIHRoZXJlIGlzIGFueSBkaWZmZXJl bmNlLgorICAgIGlmIChwaXhlbENvdW50V2l0aFNpZ25pZmljYW50RGlmZmVyZW5jZSkgewogICAg ICAgICBkaWZmUGl4ZWwgPSByZWludGVycHJldF9jYXN0PHVuc2lnbmVkIGNoYXIqPihkaWZmQnVm ZmVyKTsKICAgICAgICAgZm9yIChzaXplX3QgcCA9IDA7IHAgPCBoZWlnaHQgKiB3aWR0aDsgKytw KQotICAgICAgICAgICAgZGlmZlBpeGVsW3BdIC89IG1heERpc3RhbmNlOworICAgICAgICAgICAg ZGlmZlBpeGVsW3BdIC89IGxlZ2FjeURpc3RhbmNlTWF4OwogICAgIH0KIAogICAgIHJldHVybiBQ bGF0Zm9ybUltYWdlOjpjcmVhdGVGcm9tRGlmZkRhdGEoZGlmZkJ1ZmZlciwgd2lkdGgsIGhlaWdo dCk7CmRpZmYgLS1naXQgYS9Ub29scy9JbWFnZURpZmYvUGxhdGZvcm1JbWFnZS5oIGIvVG9vbHMv SW1hZ2VEaWZmL1BsYXRmb3JtSW1hZ2UuaAppbmRleCAxYzIyNGEzZDdhMmM2YzA1YzJlNGZjMjhh MGFmMTg4ZDY3ODgzMWQ2Li41NDkzMjI2OGU0YTdhZWFlODdjNmQ3ZjcxNDU0NTc5NGNjMWJkNjRi IDEwMDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYvUGxhdGZvcm1JbWFnZS5oCisrKyBiL1Rvb2xz L0ltYWdlRGlmZi9QbGF0Zm9ybUltYWdlLmgKQEAgLTUxLDkgKzUxLDE5IEBAIHB1YmxpYzoKICAg ICBzaXplX3QgaGVpZ2h0KCkgY29uc3Q7CiAgICAgc2l6ZV90IHJvd0J5dGVzKCkgY29uc3Q7CiAg ICAgYm9vbCBoYXNBbHBoYSgpIGNvbnN0OworCiAgICAgdW5zaWduZWQgY2hhciogcGl4ZWxzKCkg Y29uc3Q7CiAgICAgYm9vbCBpc0NvbXBhdGlibGUoY29uc3QgUGxhdGZvcm1JbWFnZSYpIGNvbnN0 OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdlPiBkaWZmZXJlbmNlKGNvbnN0IFBs YXRmb3JtSW1hZ2UmLCBmbG9hdCYgcGVyY2VudGFnZURpZmZlcmVuY2UpOworCisgICAgc3RydWN0 IERpZmZlcmVuY2UgeworICAgICAgICBmbG9hdCBwZXJjZW50YWdlRGlmZmVyZW5jZSB7IDAgfTsg Ly8gTGVnYWN5IGRpZmZlcmVudCBtZWFzdXJlLgorCisgICAgICAgIC8vIFdQVC1zdHlsZSBkaWZm ZXJlbmNlOiBodHRwczovL3dlYi1wbGF0Zm9ybS10ZXN0cy5vcmcvd3JpdGluZy10ZXN0cy9yZWZ0 ZXN0cy5odG1sLgorICAgICAgICB1bnNpZ25lZCBtYXhEaWZmZXJlbmNlIHsgMCB9OworICAgICAg ICBzaXplX3QgdG90YWxQaXhlbHMgeyAwIH07CisgICAgfTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 UGxhdGZvcm1JbWFnZT4gZGlmZmVyZW5jZShjb25zdCBQbGF0Zm9ybUltYWdlJiwgRGlmZmVyZW5j ZSYpOworCiAgICAgdm9pZCB3cml0ZUFzUE5HVG9TdGRvdXQoKTsKIAogcHJpdmF0ZToK