212328 2020-05-24 05:55:17 -0700 [GTK4] Make it possible to run layout tests 2020-06-02 05:52:23 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 212298 210100 1 cgarcia webkit-unassigned annulen bugs-noreply clopez ews-watchlist gyuyoung.kim jbedard ryuan.choi sergio oldest_to_newest 1655707 0 cgarcia 2020-05-24 05:55:17 -0700 . 1657769 1 400699 cgarcia 2020-05-31 04:47:02 -0700 Created attachment 400699 Patch 1658252 2 cgarcia 2020-06-02 05:52:23 -0700 Committed r262413: <https://trac.webkit.org/changeset/262413> 400699 2020-05-31 04:47:02 -0700 2020-06-02 04:39:48 -0700 Patch wktr-gtk4.diff text/plain 10752 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyODlj Zjg1MTVhZDUuLjIyNjMzNDMwNzQ2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA1LTMxICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLNF0gTWFrZSBp dCBwb3NzaWJsZSB0byBydW4gbGF5b3V0IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIzMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBCdWlsZCBXVFIgd2l0aCBHVEs0LgorCisgICAgICAgICog UGxhdGZvcm1HVEsuY21ha2U6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoYnVpbHREeWxpYlBhdGhGb3JOYW1lKTogVHJ5IHdpdGggYm90aCA0IGFuZCA1IEFQSSB2 ZXJzaW9ucy4KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNlbmRlclByb3h5 R3RrLmNwcDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9QbGF0Zm9ybVdlYlZpZXdH dGsuY3BwOgorICAgICAgICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyk6 CisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6flBsYXRmb3JtV2ViVmlldyk6CisgICAg ICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6c2V0V2luZG93SXNLZXkpOgorICAgICAgICAoV1RS OjpQbGF0Zm9ybVdlYlZpZXc6OndpbmRvd0ZyYW1lKToKKyAgICAgICAgKFdUUjo6UGxhdGZvcm1X ZWJWaWV3OjpzZXRXaW5kb3dGcmFtZSk6CisgICAgICAgIChXVFI6OlBsYXRmb3JtV2ViVmlldzo6 YWRkVG9XaW5kb3cpOgorICAgICAgICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OnJlbW92ZUZyb21X aW5kb3cpOgorICAgICAgICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OndpbmRvd1NuYXBzaG90SW1h Z2UpOgorICAgICAgICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OmRpc21pc3NBbGxQb3B1cE1lbnVz KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9VSVNjcmlwdENvbnRyb2xsZXJHdGsu Y3BwOgorICAgICAgICAoV1RSOjpVSVNjcmlwdENvbnRyb2xsZXJHdGs6OmNvcHlUZXh0KToKKwog MjAyMC0wNS0yOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0dUSzRdIE1ha2UgV2ViRHJpdmVyIHdvcmsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Bs YXRmb3JtR1RLLmNtYWtlIGIvVG9vbHMvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggYjM1NjQxZDc5 ZTFlLi5lOWFkZTdhNjk5YTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1BsYXRmb3JtR1RLLmNtYWtlCisr KyBiL1Rvb2xzL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC0xLDggKzEsNSBAQAogaWYgKERFVkVMT1BF Ul9NT0RFKQotICAgIGlmIChOT1QgVVNFX0dUSzQpCi0gICAgICAgIGFkZF9zdWJkaXJlY3Rvcnko V2ViS2l0VGVzdFJ1bm5lcikKLSAgICBlbmRpZiAoKQotCisgICAgYWRkX3N1YmRpcmVjdG9yeShX ZWJLaXRUZXN0UnVubmVyKQogICAgIGFkZF9zdWJkaXJlY3RvcnkoSW1hZ2VEaWZmKQogCiAgICAg aWYgKEVOQUJMRV9BUElfVEVTVFMpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZjBiNWUxZGJmYzVmLi5j MzM1ZTA4ZmY3OTAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTEwOTIsNyArMTA5MiwyMCBAQCBzdWIg YnVpbHREeWxpYlBhdGhGb3JOYW1lCiAKICAgICBpZiAoaXNHdGsoKSkgewogICAgICAgICBteSAk ZXh0ZW5zaW9uID0gaXNEYXJ3aW4oKSA/ICIuZHlsaWIiIDogIi5zbyI7Ci0gICAgICAgIHJldHVy biAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL2xpYi9saWJ3ZWJraXQyZ3RrLTQuMCIgLiAkZXh0 ZW5zaW9uOworICAgICAgICBteSBAYXBpVmVyc2lvbnMgPSAoIjQuMCIsICI1LjAiKTsKKyAgICAg ICAgZm9yIG15ICRhcGlWZXJzaW9uIChAYXBpVmVyc2lvbnMpIHsKKyAgICAgICAgICAgIG15ICRs aWJyYXJ5UGF0aDsKKyAgICAgICAgICAgIGlmICgkbGlicmFyeU5hbWUgZXEgIkphdmFTY3JpcHRD b3JlIikgeworICAgICAgICAgICAgICAgICRsaWJyYXJ5UGF0aCA9ICIkY29uZmlndXJhdGlvblBy b2R1Y3REaXIvbGliL2xpYmphdmFzY3JpcHRjb3JlZ3RrLSRhcGlWZXJzaW9uJGV4dGVuc2lvbiI7 CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICRsaWJyYXJ5UGF0aCA9ICIk Y29uZmlndXJhdGlvblByb2R1Y3REaXIvbGliL2xpYndlYmtpdDJndGstJGFwaVZlcnNpb24kZXh0 ZW5zaW9uIjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICgtZSAkbGlicmFyeVBhdGgp IHsKKyAgICAgICAgICAgICAgICByZXR1cm4gJGxpYnJhcnlQYXRoOworICAgICAgICAgICAgfQor ICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuICIiOwogICAgIH0KICAgICBpZiAoaXNJT1NXZWJL aXQoKSkgewogICAgICAgICByZXR1cm4gIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci8kbGlicmFy eU5hbWUuZnJhbWV3b3JrLyRsaWJyYXJ5TmFtZSI7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL2d0ay9FdmVudFNlbmRlclByb3h5R3RrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvZ3RrL0V2ZW50U2VuZGVyUHJveHlHdGsuY3BwCmluZGV4IGNmZTYzOGE2MjU1NC4uMmJj ZTZlNjZjMTE4IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNl bmRlclByb3h5R3RrLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNl bmRlclByb3h5R3RrLmNwcApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgIlRlc3RDb250cm9s bGVyLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlld0Jhc2VJbnRlcm5hbC5oIgogI2luY2x1ZGUg PFdlYkNvcmUvR3RrVXRpbGl0aWVzLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9HdGtWZXJzaW9uaW5n Lmg+CiAjaW5jbHVkZSA8Z2RrL2dkay5oPgogI2luY2x1ZGUgPGdkay9nZGtrZXlzeW1zLmg+CiAj aW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9ndGsvUGxhdGZvcm1XZWJWaWV3R3RrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvZ3RrL1BsYXRmb3JtV2ViVmlld0d0ay5jcHAKaW5kZXggNWFlYzExMWE4YTRjLi45ODExMzcy ZTAzZWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL1BsYXRmb3JtV2Vi Vmlld0d0ay5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvUGxhdGZvcm1XZWJW aWV3R3RrLmNwcApAQCAtMjgsMzYgKzI4LDUzIEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5j bHVkZSAiUGxhdGZvcm1XZWJWaWV3LmgiCiAKKyNpbmNsdWRlIDxXZWJDb3JlL0d0a1ZlcnNpb25p bmcuaD4KICNpbmNsdWRlIDxXZWJLaXQvV0tJbWFnZUNhaXJvLmg+CiAjaW5jbHVkZSA8V2ViS2l0 L1dLUGFnZUNvbmZpZ3VyYXRpb25SZWYuaD4KICNpbmNsdWRlIDxXZWJLaXQvV0tWaWV3Lmg+CiAj aW5jbHVkZSA8V2ViS2l0L1dLVmlld1ByaXZhdGUuaD4KICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAj aW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KKyNpbmNsdWRlIDx3dGYvZ2xpYi9HUmVmUHRyLmg+ CiAKIG5hbWVzcGFjZSBXVFIgewogCiBQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyhX S1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIGNvbnN0IFRlc3RPcHRpb25zJiBv cHRpb25zKQogICAgIDogbV92aWV3KFdLVmlld0NyZWF0ZShjb25maWd1cmF0aW9uKSkKKyNpZiBV U0UoR1RLNCkKKyAgICAsIG1fd2luZG93KGd0a193aW5kb3dfbmV3KCkpCisjZWxzZQogICAgICwg bV93aW5kb3coZ3RrX3dpbmRvd19uZXcoR1RLX1dJTkRPV19QT1BVUCkpCisjZW5kaWYKICAgICAs IG1fd2luZG93SXNLZXkodHJ1ZSkKICAgICAsIG1fb3B0aW9ucyhvcHRpb25zKQogeworI2lmIFVT RShHVEs0KQorICAgIGd0a193aW5kb3dfc2V0X2RlZmF1bHRfc2l6ZShHVEtfV0lORE9XKG1fd2lu ZG93KSwgODAwLCA2MDApOworICAgIGd0a193aW5kb3dfc2V0X2NoaWxkKEdUS19XSU5ET1cobV93 aW5kb3cpLCBHVEtfV0lER0VUKG1fdmlldykpOworI2Vsc2UKICAgICBndGtfY29udGFpbmVyX2Fk ZChHVEtfQ09OVEFJTkVSKG1fd2luZG93KSwgR1RLX1dJREdFVChtX3ZpZXcpKTsKKyAgICBndGtf d2lkZ2V0X3Nob3coR1RLX1dJREdFVChtX3ZpZXcpKTsKIAogICAgIEd0a0FsbG9jYXRpb24gc2l6 ZSA9IHsgMCwgMCwgODAwLCA2MDAgfTsKICAgICBndGtfd2lkZ2V0X3NpemVfYWxsb2NhdGUoR1RL X1dJREdFVChtX3ZpZXcpLCAmc2l6ZSk7CiAgICAgZ3RrX3dpbmRvd19yZXNpemUoR1RLX1dJTkRP VyhtX3dpbmRvdyksIDgwMCwgNjAwKTsKLSAgICBndGtfd2lkZ2V0X3Nob3dfYWxsKG1fd2luZG93 KTsKKyNlbmRpZgorICAgIGd0a193aWRnZXRfc2hvdyhtX3dpbmRvdyk7CiAKLSAgICB3aGlsZSAo Z3RrX2V2ZW50c19wZW5kaW5nKCkpCi0gICAgICAgIGd0a19tYWluX2l0ZXJhdGlvbigpOworICAg IHdoaWxlIChnX21haW5fY29udGV4dF9wZW5kaW5nKG51bGxwdHIpKQorICAgICAgICBnX21haW5f Y29udGV4dF9pdGVyYXRpb24obnVsbHB0ciwgVFJVRSk7CiB9CiAKIFBsYXRmb3JtV2ViVmlldzo6 flBsYXRmb3JtV2ViVmlldygpCiB7CisjaWYgVVNFKEdUSzQpCisgICAgaWYgKGd0a193aW5kb3df Z2V0X2NoaWxkKEdUS19XSU5ET1cobV93aW5kb3cpKSAhPSBHVEtfV0lER0VUKG1fdmlldykpCisg ICAgICAgIGdfb2JqZWN0X3VucmVmKEdUS19XSURHRVQobV92aWV3KSk7CisjZWxzZQogICAgIGlm IChndGtfYmluX2dldF9jaGlsZChHVEtfQklOKG1fd2luZG93KSkgIT0gR1RLX1dJREdFVChtX3Zp ZXcpKQogICAgICAgICBnX29iamVjdF91bnJlZihHVEtfV0lER0VUKG1fdmlldykpOworI2VuZGlm CiAKICAgICBndGtfd2lkZ2V0X2Rlc3Ryb3kobV93aW5kb3cpOwogICAgIGlmIChtX290aGVyV2lu ZG93KQpAQCAtNzksMTMgKzk2LDE3IEBAIHZvaWQgUGxhdGZvcm1XZWJWaWV3OjpzZXRXaW5kb3dJ c0tleShib29sIGlzS2V5KQogICAgICAgICBndGtfd2luZG93X3ByZXNlbnQoR1RLX1dJTkRPVyht X3dpbmRvdykpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVCghbV9vdGhlcldpbmRvdyk7 CisjaWYgVVNFKEdUSzQpCisgICAgICAgIG1fb3RoZXJXaW5kb3cgPSBndGtfd2luZG93X25ldygp OworI2Vsc2UKICAgICAgICAgbV9vdGhlcldpbmRvdyA9IGd0a193aW5kb3dfbmV3KEdUS19XSU5E T1dfUE9QVVApOwogICAgICAgICBndGtfd2lkZ2V0X3Nob3dfYWxsKG1fb3RoZXJXaW5kb3cpOwor I2VuZGlmCiAgICAgICAgIGd0a193aW5kb3dfcHJlc2VudChHVEtfV0lORE9XKG1fb3RoZXJXaW5k b3cpKTsKICAgICB9CiAKLSAgICB3aGlsZSAoZ3RrX2V2ZW50c19wZW5kaW5nKCkpCi0gICAgICAg IGd0a19tYWluX2l0ZXJhdGlvbigpOworICAgIHdoaWxlIChnX21haW5fY29udGV4dF9wZW5kaW5n KG51bGxwdHIpKQorICAgICAgICBnX21haW5fY29udGV4dF9pdGVyYXRpb24obnVsbHB0ciwgVFJV RSk7CiB9CiAKIHZvaWQgUGxhdGZvcm1XZWJWaWV3OjpyZXNpemVUbyh1bnNpZ25lZCB3aWR0aCwg dW5zaWduZWQgaGVpZ2h0LCBXZWJWaWV3U2l6aW5nTW9kZSBzaXppbmdNb2RlKQpAQCAtMTA5LDkg KzEzMCwxMyBAQCB2b2lkIFBsYXRmb3JtV2ViVmlldzo6Zm9jdXMoKQogCiBXS1JlY3QgUGxhdGZv cm1XZWJWaWV3Ojp3aW5kb3dGcmFtZSgpCiB7Ci0gICAgR3RrQWxsb2NhdGlvbiBnZW9tZXRyeTsK KyAgICBHdGtBbGxvY2F0aW9uIGdlb21ldHJ5ID0geyAwLCAwLCAwLCAwIH07CisjaWYgVVNFKEdU SzQpCisgICAgZ3RrX3dpbmRvd19nZXRfc2l6ZShHVEtfV0lORE9XKG1fd2luZG93KSwgJmdlb21l dHJ5LndpZHRoLCAmZ2VvbWV0cnkuaGVpZ2h0KTsKKyNlbHNlCiAgICAgZ2RrX3dpbmRvd19nZXRf Z2VvbWV0cnkoZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQobV93aW5kb3cpKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAmZ2VvbWV0cnkueCwgJmdlb21ldHJ5LnksICZnZW9t ZXRyeS53aWR0aCwgJmdlb21ldHJ5LmhlaWdodCk7CisjZW5kaWYKIAogICAgIFdLUmVjdCBmcmFt ZTsKICAgICBmcmFtZS5vcmlnaW4ueCA9IGdlb21ldHJ5Lng7CkBAIC0xMjMsMTMgKzE0OCwxNyBA QCBXS1JlY3QgUGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dGcmFtZSgpCiAKIHZvaWQgUGxhdGZvcm1X ZWJWaWV3OjpzZXRXaW5kb3dGcmFtZShXS1JlY3QgZnJhbWUsIFdlYlZpZXdTaXppbmdNb2RlKQog eworI2lmIFVTRShHVEs0KQorICAgIGd0a193aW5kb3dfcmVzaXplKEdUS19XSU5ET1cobV93aW5k b3cpLCBmcmFtZS5zaXplLndpZHRoLCBmcmFtZS5zaXplLmhlaWdodCk7CisjZWxzZQogICAgIGdk a193aW5kb3dfbW92ZV9yZXNpemUoZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQobV93 aW5kb3cpKSwKICAgICAgICAgZnJhbWUub3JpZ2luLngsIGZyYW1lLm9yaWdpbi55LCBmcmFtZS5z aXplLndpZHRoLCBmcmFtZS5zaXplLmhlaWdodCk7CiAgICAgR3RrQWxsb2NhdGlvbiBzaXplID0g eyAwLCAwLCBzdGF0aWNfY2FzdDxpbnQ+KGZyYW1lLnNpemUud2lkdGgpLCBzdGF0aWNfY2FzdDxp bnQ+KGZyYW1lLnNpemUuaGVpZ2h0KSB9OwogICAgIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZShH VEtfV0lER0VUKG1fdmlldyksICZzaXplKTsKKyNlbmRpZgogCi0gICAgd2hpbGUgKGd0a19ldmVu dHNfcGVuZGluZygpKQotICAgICAgICBndGtfbWFpbl9pdGVyYXRpb24oKTsKKyAgICB3aGlsZSAo Z19tYWluX2NvbnRleHRfcGVuZGluZyhudWxscHRyKSkKKyAgICAgICAgZ19tYWluX2NvbnRleHRf aXRlcmF0aW9uKG51bGxwdHIsIFRSVUUpOwogfQogCiB2b2lkIFBsYXRmb3JtV2ViVmlldzo6YWRk Q2hyb21lSW5wdXRGaWVsZCgpCkBAIC0xNDIsMTkgKzE3MSwzMyBAQCB2b2lkIFBsYXRmb3JtV2Vi Vmlldzo6cmVtb3ZlQ2hyb21lSW5wdXRGaWVsZCgpCiAKIHZvaWQgUGxhdGZvcm1XZWJWaWV3Ojph ZGRUb1dpbmRvdygpCiB7CisjaWYgVVNFKEdUSzQpCisgICAgaWYgKGd0a193aW5kb3dfZ2V0X2No aWxkKEdUS19XSU5ET1cobV93aW5kb3cpKSA9PSBHVEtfV0lER0VUKG1fdmlldykpCisgICAgICAg IHJldHVybjsKKworICAgIGd0a193aW5kb3dfc2V0X2NoaWxkKEdUS19XSU5ET1cobV93aW5kb3cp LCBHVEtfV0lER0VUKG1fdmlldykpOworI2Vsc2UKICAgICBpZiAoZ3RrX2Jpbl9nZXRfY2hpbGQo R1RLX0JJTihtX3dpbmRvdykpID09IEdUS19XSURHRVQobV92aWV3KSkKICAgICAgICAgcmV0dXJu OwogCiAgICAgZ3RrX2NvbnRhaW5lcl9hZGQoR1RLX0NPTlRBSU5FUihtX3dpbmRvdyksIEdUS19X SURHRVQobV92aWV3KSk7CisjZW5kaWYKICAgICBnX29iamVjdF91bnJlZihHVEtfV0lER0VUKG1f dmlldykpOwogfQogCiB2b2lkIFBsYXRmb3JtV2ViVmlldzo6cmVtb3ZlRnJvbVdpbmRvdygpCiB7 CisjaWYgVVNFKEdUSzQpCisgICAgaWYgKGd0a193aW5kb3dfZ2V0X2NoaWxkKEdUS19XSU5ET1co bV93aW5kb3cpKSA9PSBHVEtfV0lER0VUKG1fdmlldykpIHsKKyAgICAgICAgZ19vYmplY3RfcmVm KEdUS19XSURHRVQobV92aWV3KSk7CisgICAgICAgIGd0a193aW5kb3dfc2V0X2NoaWxkKEdUS19X SU5ET1cobV93aW5kb3cpLCBudWxscHRyKTsKKyAgICB9CisjZWxzZQogICAgIGlmIChndGtfYmlu X2dldF9jaGlsZChHVEtfQklOKG1fd2luZG93KSkgPT0gR1RLX1dJREdFVChtX3ZpZXcpKSB7CiAg ICAgICAgIGdfb2JqZWN0X3JlZihHVEtfV0lER0VUKG1fdmlldykpOwogICAgICAgICBndGtfY29u dGFpbmVyX3JlbW92ZShHVEtfQ09OVEFJTkVSKG1fd2luZG93KSwgR1RLX1dJREdFVChtX3ZpZXcp KTsKICAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBQbGF0Zm9ybVdlYlZpZXc6Om1ha2VXZWJWaWV3 Rmlyc3RSZXNwb25kZXIoKQpAQCAtMTY3LDE2ICsyMTAsMzIgQEAgdm9pZCBQbGF0Zm9ybVdlYlZp ZXc6OmNoYW5nZVdpbmRvd1NjYWxlSWZOZWVkZWQoZmxvYXQpCiAKIGNhaXJvX3N1cmZhY2VfdCog UGxhdGZvcm1XZWJWaWV3Ojp3aW5kb3dTbmFwc2hvdEltYWdlKCkKIHsKKyNpZiBVU0UoR1RLNCkK KyAgICBpbnQgd2lkdGggPSBndGtfd2lkZ2V0X2dldF93aWR0aChHVEtfV0lER0VUKG1fdmlldykp OworICAgIGludCBoZWlnaHQgPSBndGtfd2lkZ2V0X2dldF9oZWlnaHQoR1RLX1dJREdFVChtX3Zp ZXcpKTsKKyNlbHNlCiAgICAgaW50IHdpZHRoID0gZ3RrX3dpZGdldF9nZXRfYWxsb2NhdGVkX3dp ZHRoKEdUS19XSURHRVQobV92aWV3KSk7CiAgICAgaW50IGhlaWdodCA9IGd0a193aWRnZXRfZ2V0 X2FsbG9jYXRlZF9oZWlnaHQoR1RLX1dJREdFVChtX3ZpZXcpKTsKKyNlbmRpZgogCi0gICAgd2hp bGUgKGd0a19ldmVudHNfcGVuZGluZygpKQotICAgICAgICBndGtfbWFpbl9pdGVyYXRpb24oKTsK KyAgICB3aGlsZSAoZ19tYWluX2NvbnRleHRfcGVuZGluZyhudWxscHRyKSkKKyAgICAgICAgZ19t YWluX2NvbnRleHRfaXRlcmF0aW9uKG51bGxwdHIsIFRSVUUpOwogCiAgICAgY2Fpcm9fc3VyZmFj ZV90KiBpbWFnZVN1cmZhY2UgPSBjYWlyb19pbWFnZV9zdXJmYWNlX2NyZWF0ZShDQUlST19GT1JN QVRfUkdCMjQsIHdpZHRoLCBoZWlnaHQpOwotCiAgICAgY2Fpcm9fdCogY29udGV4dCA9IGNhaXJv X2NyZWF0ZShpbWFnZVN1cmZhY2UpOworCisjaWYgVVNFKEdUSzQpCisgICAgR1JlZlB0cjxHZGtQ YWludGFibGU+IHBhaW50YWJsZSA9IGFkb3B0R1JlZihndGtfd2lkZ2V0X3BhaW50YWJsZV9uZXco R1RLX1dJREdFVChtX3ZpZXcpKSk7CisgICAgYXV0byogc25hcHNob3QgPSBndGtfc25hcHNob3Rf bmV3KCk7CisgICAgZ2RrX3BhaW50YWJsZV9zbmFwc2hvdChwYWludGFibGUuZ2V0KCksIHNuYXBz aG90LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICBpZiAoYXV0byogbm9kZSA9IGd0a19zbmFwc2hvdF9m cmVlX3RvX25vZGUoc25hcHNob3QpKSB7CisgICAgICAgIGdza19yZW5kZXJfbm9kZV9kcmF3KG5v ZGUsIGNvbnRleHQpOworICAgICAgICBnc2tfcmVuZGVyX25vZGVfdW5yZWYobm9kZSk7CisgICAg fQorI2Vsc2UKICAgICBndGtfd2lkZ2V0X2RyYXcoR1RLX1dJREdFVChtX3ZpZXcpLCBjb250ZXh0 KTsKKyNlbmRpZgorCiAgICAgY2Fpcm9fZGVzdHJveShjb250ZXh0KTsKIAogICAgIHJldHVybiBp bWFnZVN1cmZhY2U7CkBAIC0xODgsNiArMjQ3LDcgQEAgdm9pZCBQbGF0Zm9ybVdlYlZpZXc6OmRp ZEluaXRpYWxpemVDbGllbnRzKCkKIAogdm9pZCBQbGF0Zm9ybVdlYlZpZXc6OmRpc21pc3NBbGxQ b3B1cE1lbnVzKCkKIHsKKyNpZiAhVVNFKEdUSzQpCiAgICAgLy8gZ3RrX21lbnVfcG9wZG93biBk b2Vzbid0IG1vZGlmeSB0aGUgR0xpc3Qgb2YgYXR0YWNoZWQgbWVudXMsIHNvIGl0IHNob3VsZAog ICAgIC8vIGJlIHNhZmUgdG8gd2FsayB0aGlzIGxpc3Qgd2hpbGUgY2FsbGluZyBpdC4KICAgICBH TGlzdCogYXR0YWNoZWRNZW51c0xpc3QgPSBndGtfbWVudV9nZXRfZm9yX2F0dGFjaF93aWRnZXQo R1RLX1dJREdFVChtX3ZpZXcpKTsKQEAgLTE5NSw2ICsyNTUsNyBAQCB2b2lkIFBsYXRmb3JtV2Vi Vmlldzo6ZGlzbWlzc0FsbFBvcHVwTWVudXMoKQogICAgICAgICBBU1NFUlQoZGF0YSk7CiAgICAg ICAgIGd0a19tZW51X3BvcGRvd24oR1RLX01FTlUoZGF0YSkpOwogICAgIH0sIG51bGxwdHIpOwor I2VuZGlmCiB9CiAKIHZvaWQgUGxhdGZvcm1XZWJWaWV3OjpzZXROYXZpZ2F0aW9uR2VzdHVyZXNF bmFibGVkKGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv Z3RrL1VJU2NyaXB0Q29udHJvbGxlckd0ay5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0 ay9VSVNjcmlwdENvbnRyb2xsZXJHdGsuY3BwCmluZGV4IGVlNDZmZDk3YjE4Zi4uMzAwY2FhNzM1 NmY3IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9VSVNjcmlwdENvbnRy b2xsZXJHdGsuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL1VJU2NyaXB0Q29u dHJvbGxlckd0ay5jcHAKQEAgLTgzLDcgKzgzLDExIEBAIHZvaWQgVUlTY3JpcHRDb250cm9sbGVy R3RrOjpzZXRDb250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQogdm9p ZCBVSVNjcmlwdENvbnRyb2xsZXJHdGs6OmNvcHlUZXh0KEpTU3RyaW5nUmVmIHRleHQpCiB7CiAg ICAgYXV0byBzdHJpbmcgPSB0ZXh0LT5zdHJpbmcoKS51dGY4KCk7CisjaWYgVVNFKEdUSzQpCisg ICAgZ2RrX2NsaXBib2FyZF9zZXRfdGV4dChnZGtfZGlzcGxheV9nZXRfY2xpcGJvYXJkKGdka19k aXNwbGF5X2dldF9kZWZhdWx0KCkpLCBzdHJpbmcuZGF0YSgpKTsKKyNlbHNlCiAgICAgZ3RrX2Ns aXBib2FyZF9zZXRfdGV4dChndGtfY2xpcGJvYXJkX2dldChHREtfU0VMRUNUSU9OX0NMSVBCT0FS RCksIHN0cmluZy5kYXRhKCksIHN0cmluZy5sZW5ndGgoKSk7CisjZW5kaWYKIH0KIAogdm9pZCBV SVNjcmlwdENvbnRyb2xsZXJHdGs6OmRpc21pc3NNZW51KCkK