173098 2017-06-08 06:34:38 -0700 [GTK] Use API::FormClient instead of the C API in WebKitFormClient 2017-06-08 22:26:52 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply buildbot gustavo mcatanzaro zan oldest_to_newest 1316892 0 cgarcia 2017-06-08 06:34:38 -0700 ssia 1316895 1 312301 cgarcia 2017-06-08 06:38:13 -0700 Created attachment 312301 Patch 1316898 2 buildbot 2017-06-08 06:41:18 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1316912 3 312301 zan 2017-06-08 08:27:21 -0700 Comment on attachment 312301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312301&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp:47 > + WebKitWebView* m_webView { nullptr }; Same here -- this is assigned in the constructor, so no need to null it out here. 1317212 4 cgarcia 2017-06-08 22:26:52 -0700 Committed r217963: <http://trac.webkit.org/changeset/217963> 312301 2017-06-08 06:38:13 -0700 2017-06-08 08:27:21 -0700 Patch wk2-form-client.diff text/plain 10146 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiM2ZiM2Y3OGViOC4uN2FhZDFiYzQ4MDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMiBAQAogMjAxNy0wNi0wOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIEFQSTo6Rm9ybUNsaWVudCBpbnN0ZWFkIG9m IHRoZSBDIEFQSSBpbiBXZWJLaXRGb3JtQ2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMwOTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGll bnQuY3BwOgorICAgICAgICAoYXR0YWNoRm9ybUNsaWVudFRvVmlldyk6CisgICAgICAgICh3aWxs U3VibWl0Rm9ybSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0LmNwcDoKKyAgICAgICAgKHdlYmtpdEZvcm1TdWJtaXNzaW9u UmVxdWVzdENyZWF0ZSk6CisgICAgICAgICh3ZWJraXRfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3Rf Z2V0X3RleHRfZmllbGRzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3Jt U3VibWlzc2lvblJlcXVlc3RQcml2YXRlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwOgorICAgICAgICAod2Via2l0V2ViUGFn ZUNyZWF0ZSk6CisKKzIwMTctMDYtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgorCiAgICAgICAgIFtHVEtdIFVzZSBBUEk6OkZpbmRjbGllbnQgaW5zdGVhZCBv ZiB0aGUgQyBBUEkgaW4gV2ViS2l0RmluZENvbnRyb2xsZXIKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzA5NQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwCmluZGV4IDEyZWM5 MjdhOGMwLi5lOTc2M2U0YzU5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0Rm9ybUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybUNsaWVudC5jcHAKQEAgLTIwLDcgKzIwLDcgQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJLaXRGb3JtQ2xpZW50LmgiCiAKLSNpbmNsdWRl ICJBUElEaWN0aW9uYXJ5LmgiCisjaW5jbHVkZSAiQVBJRm9ybUNsaWVudC5oIgogI2luY2x1ZGUg IldlYkZvcm1TdWJtaXNzaW9uTGlzdGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYktpdEZvcm1T dWJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgiCkBA IC0zMCwyMSArMzAsMjUgQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotc3RhdGljIHZv aWQgd2lsbFN1Ym1pdEZvcm0oV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS0ZyYW1lUmVmLCBXS0Rp Y3Rpb25hcnlSZWYgdmFsdWVzLCBXS1R5cGVSZWYgLyogdXNlckRhdGEgKi8sIFdLRm9ybVN1Ym1p c3Npb25MaXN0ZW5lclJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAg ICBHUmVmUHRyPFdlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1Jl Zih3ZWJraXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUodG9JbXBsKHZhbHVlcyksIHRvSW1w bChsaXN0ZW5lcikpKTsKLSAgICB3ZWJraXRXZWJWaWV3U3VibWl0Rm9ybVJlcXVlc3QoV0VCS0lU X1dFQl9WSUVXKGNsaWVudEluZm8pLCByZXF1ZXN0LmdldCgpKTsKLX0KK2NsYXNzIEZvcm1DbGll bnQgZmluYWwgOiBwdWJsaWMgQVBJOjpGb3JtQ2xpZW50IHsKK3B1YmxpYzoKKyAgICBleHBsaWNp dCBGb3JtQ2xpZW50KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCisgICAgICAgIDogbV93ZWJWaWV3 KHdlYlZpZXcpCisgICAgeworICAgIH0KKworcHJpdmF0ZToKKyAgICB2b2lkIHdpbGxTdWJtaXRG b3JtKFdlYlBhZ2VQcm94eSYsIFdlYkZyYW1lUHJveHkmLCBXZWJGcmFtZVByb3h5JiwgY29uc3Qg VmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmluZz4+JiB2YWx1ZXMsIEFQSTo6T2JqZWN0Kiwg UmVmPFdlYkZvcm1TdWJtaXNzaW9uTGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lcikgb3ZlcnJpZGUK KyAgICB7CisgICAgICAgIEdSZWZQdHI8V2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0PiByZXF1 ZXN0ID0gYWRvcHRHUmVmKHdlYmtpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdENyZWF0ZSh2YWx1ZXMs IFdURk1vdmUobGlzdGVuZXIpKSk7CisgICAgICAgIHdlYmtpdFdlYlZpZXdTdWJtaXRGb3JtUmVx dWVzdChtX3dlYlZpZXcsIHJlcXVlc3QuZ2V0KCkpOworICAgIH0KKworICAgIFdlYktpdFdlYlZp ZXcqIG1fd2ViVmlldyB7IG51bGxwdHIgfTsKK307CiAKIHZvaWQgYXR0YWNoRm9ybUNsaWVudFRv VmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIFdLUGFnZUZvcm1DbGllbnRWMCB3 a0Zvcm1DbGllbnQgPSB7Ci0gICAgICAgIHsKLSAgICAgICAgICAgIDAsIC8vIHZlcnNpb24KLSAg ICAgICAgICAgIHdlYlZpZXcsIC8vIGNsaWVudEluZm8KLSAgICAgICAgfSwKLSAgICAgICAgd2ls bFN1Ym1pdEZvcm0KLSAgICB9OwotICAgIFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSSh3ZWJraXRX ZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpKTsKLSAgICBX S1BhZ2VTZXRQYWdlRm9ybUNsaWVudCh3a1BhZ2UsICZ3a0Zvcm1DbGllbnQuYmFzZSk7CisgICAg YXV0byogcGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFT RSh3ZWJWaWV3KSk7CisgICAgcGFnZS0+c2V0Rm9ybUNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPEZv cm1DbGllbnQ+KHdlYlZpZXcpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3QuY3BwCmlu ZGV4IDdhZjJhZWUxMGI3Li45OGI0MmIxMGJjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVl c3QuY3BwCkBAIC00NSw3ICs0NSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAgKi8KIAog c3RydWN0IF9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlIHsKLSAgICBSZWZQdHI8 QVBJOjpEaWN0aW9uYXJ5PiB3ZWJWYWx1ZXM7CiAgICAgUmVmUHRyPFdlYkZvcm1TdWJtaXNzaW9u TGlzdGVuZXJQcm94eT4gbGlzdGVuZXI7CiAgICAgR1JlZlB0cjxHSGFzaFRhYmxlPiB2YWx1ZXM7 CiAgICAgYm9vbCBoYW5kbGVkUmVxdWVzdDsKQEAgLTcwLDExICs2OSwxNSBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfY2xhc3NfaW5pdChXZWJLaXRGb3JtU3Vi bWlzc2lvblJlcXVlcwogICAgIG9iamVjdENsYXNzLT5kaXNwb3NlID0gd2Via2l0Rm9ybVN1Ym1p c3Npb25SZXF1ZXN0RGlzcG9zZTsKIH0KIAotV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0KiB3 ZWJraXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUoQVBJOjpEaWN0aW9uYXJ5KiB2YWx1ZXMs IFdlYkZvcm1TdWJtaXNzaW9uTGlzdGVuZXJQcm94eSogbGlzdGVuZXIpCitXZWJLaXRGb3JtU3Vi bWlzc2lvblJlcXVlc3QqIHdlYmtpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdENyZWF0ZShjb25zdCBW ZWN0b3I8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPj4mIHZhbHVlcywgUmVmPFdlYkZvcm1TdWJt aXNzaW9uTGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lcikKIHsKLSAgICBXZWJLaXRGb3JtU3VibWlz c2lvblJlcXVlc3QqIHJlcXVlc3QgPSBXRUJLSVRfRk9STV9TVUJNSVNTSU9OX1JFUVVFU1QoZ19v YmplY3RfbmV3KFdFQktJVF9UWVBFX0ZPUk1fU1VCTUlTU0lPTl9SRVFVRVNULCBOVUxMKSk7Ci0g ICAgcmVxdWVzdC0+cHJpdi0+d2ViVmFsdWVzID0gdmFsdWVzOwotICAgIHJlcXVlc3QtPnByaXYt Pmxpc3RlbmVyID0gbGlzdGVuZXI7CisgICAgV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0KiBy ZXF1ZXN0ID0gV0VCS0lUX0ZPUk1fU1VCTUlTU0lPTl9SRVFVRVNUKGdfb2JqZWN0X25ldyhXRUJL SVRfVFlQRV9GT1JNX1NVQk1JU1NJT05fUkVRVUVTVCwgbnVsbHB0cikpOworICAgIGlmICh2YWx1 ZXMuc2l6ZSgpKSB7CisgICAgICAgIHJlcXVlc3QtPnByaXYtPnZhbHVlcyA9IGFkb3B0R1JlZihn X2hhc2hfdGFibGVfbmV3X2Z1bGwoZ19zdHJfaGFzaCwgZ19zdHJfZXF1YWwsIGdfZnJlZSwgZ19m cmVlKSk7CisgICAgICAgIGZvciAoY29uc3QgYXV0byYgcGFpciA6IHZhbHVlcykKKyAgICAgICAg ICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocmVxdWVzdC0+cHJpdi0+dmFsdWVzLmdldCgpLCBnX3N0 cmR1cChwYWlyLmZpcnN0LnV0ZjgoKS5kYXRhKCkpLCBnX3N0cmR1cChwYWlyLnNlY29uZC51dGY4 KCkuZGF0YSgpKSk7CisgICAgfQorICAgIHJlcXVlc3QtPnByaXYtPmxpc3RlbmVyID0gV1RGTW92 ZShsaXN0ZW5lcik7CiAgICAgcmV0dXJuIHJlcXVlc3Q7CiB9CiAKQEAgLTkwLDI0ICs5Myw3IEBA IFdlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdCogd2Via2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0 Q3JlYXRlKEFQSTo6RGljdGlvbmFyeSoKICAqLwogR0hhc2hUYWJsZSogd2Via2l0X2Zvcm1fc3Vi bWlzc2lvbl9yZXF1ZXN0X2dldF90ZXh0X2ZpZWxkcyhXZWJLaXRGb3JtU3VibWlzc2lvblJlcXVl c3QqIHJlcXVlc3QpCiB7Ci0gICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0ZPUk1f U1VCTUlTU0lPTl9SRVFVRVNUKHJlcXVlc3QpLCAwKTsKLQotICAgIGlmIChyZXF1ZXN0LT5wcml2 LT52YWx1ZXMpCi0gICAgICAgIHJldHVybiByZXF1ZXN0LT5wcml2LT52YWx1ZXMuZ2V0KCk7Ci0K LSAgICBpZiAoIXJlcXVlc3QtPnByaXYtPndlYlZhbHVlcy0+c2l6ZSgpKQotICAgICAgICByZXR1 cm4gbnVsbHB0cjsKLQotICAgIHJlcXVlc3QtPnByaXYtPnZhbHVlcyA9IGFkb3B0R1JlZihnX2hh c2hfdGFibGVfbmV3X2Z1bGwoZ19zdHJfaGFzaCwgZ19zdHJfZXF1YWwsIGdfZnJlZSwgZ19mcmVl KSk7Ci0KLSAgICBjb25zdCBBUEk6OkRpY3Rpb25hcnk6Ok1hcFR5cGUmIG1hcCA9IHJlcXVlc3Qt PnByaXYtPndlYlZhbHVlcy0+bWFwKCk7Ci0gICAgQVBJOjpEaWN0aW9uYXJ5OjpNYXBUeXBlOjpj b25zdF9pdGVyYXRvciBlbmQgPSBtYXAuZW5kKCk7Ci0gICAgZm9yIChBUEk6OkRpY3Rpb25hcnk6 Ok1hcFR5cGU6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbWFwLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytp dCkgewotICAgICAgICBBUEk6OlN0cmluZyogdmFsdWUgPSBzdGF0aWNfY2FzdDxBUEk6OlN0cmlu Zyo+KGl0LT52YWx1ZS5nZXQoKSk7Ci0gICAgICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocmVxdWVz dC0+cHJpdi0+dmFsdWVzLmdldCgpLCBnX3N0cmR1cChpdC0+a2V5LnV0ZjgoKS5kYXRhKCkpLCBn X3N0cmR1cCh2YWx1ZS0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSkpOwotICAgIH0KLQotICAgIHJl cXVlc3QtPnByaXYtPndlYlZhbHVlcyA9IG51bGxwdHI7CisgICAgZ19yZXR1cm5fdmFsX2lmX2Zh aWwoV0VCS0lUX0lTX0ZPUk1fU1VCTUlTU0lPTl9SRVFVRVNUKHJlcXVlc3QpLCBudWxscHRyKTsK IAogICAgIHJldHVybiByZXF1ZXN0LT5wcml2LT52YWx1ZXMuZ2V0KCk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJl cXVlc3RQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRG b3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlLmgKaW5kZXggMWQyYjQ5OWY2OGIuLjJmMGQyNjc0 OGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRG b3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0UHJpdmF0ZS5oCkBAIC0xNywx MiArMTcsOSBAQAogICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCiAgKi8KIAotI2lmbmRl ZiBXZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlX2gKLSNkZWZpbmUgV2ViS2l0Rm9y bVN1Ym1pc3Npb25SZXF1ZXN0UHJpdmF0ZV9oCisjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIldl YktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdC5oIgogI2luY2x1ZGUgIldlYktpdFByaXZhdGUuaCIK IAotV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0KiB3ZWJraXRGb3JtU3VibWlzc2lvblJlcXVl c3RDcmVhdGUoQVBJOjpEaWN0aW9uYXJ5KiB2YWx1ZXMsIFdlYktpdDo6V2ViRm9ybVN1Ym1pc3Np b25MaXN0ZW5lclByb3h5Kik7Ci0KLSNlbmRpZiAvLyBXZWJLaXRGb3JtU3VibWlzc2lvblJlcXVl c3RQcml2YXRlX2gKK1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdCogd2Via2l0Rm9ybVN1Ym1p c3Npb25SZXF1ZXN0Q3JlYXRlKGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBTdHJpbmc+ PiYsIFJlZjxXZWJLaXQ6OldlYkZvcm1TdWJtaXNzaW9uTGlzdGVuZXJQcm94eT4mJik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsv V2ViS2l0V2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAKaW5kZXggZTRkODJlNjRmN2MuLmVkNDhhZjAx MjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwCkBAIC0zNDEsOSArMzQx LDkgQEAgcHJpdmF0ZToKICAgICBXZWJLaXRXZWJQYWdlKiBtX3dlYlBhZ2U7CiB9OwogCi1jbGFz cyBGb3JtQ2xpZW50IGZpbmFsIDogcHVibGljIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OkZvcm1DbGll bnQgeworY2xhc3MgUGFnZUZvcm1DbGllbnQgZmluYWwgOiBwdWJsaWMgQVBJOjpJbmplY3RlZEJ1 bmRsZTo6Rm9ybUNsaWVudCB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgRm9ybUNsaWVudChXZWJL aXRXZWJQYWdlKiB3ZWJQYWdlKQorICAgIGV4cGxpY2l0IFBhZ2VGb3JtQ2xpZW50KFdlYktpdFdl YlBhZ2UqIHdlYlBhZ2UpCiAgICAgICAgIDogbV93ZWJQYWdlKHdlYlBhZ2UpCiAgICAgewogICAg IH0KQEAgLTU5NSw3ICs1OTUsNyBAQCBXZWJLaXRXZWJQYWdlKiB3ZWJraXRXZWJQYWdlQ3JlYXRl KFdlYlBhZ2UqIHdlYlBhZ2UpCiAKICAgICB3ZWJQYWdlLT5zZXRJbmplY3RlZEJ1bmRsZUNvbnRl eHRNZW51Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8UGFnZUNvbnRleHRNZW51Q2xpZW50PihwYWdl KSk7CiAgICAgd2ViUGFnZS0+c2V0SW5qZWN0ZWRCdW5kbGVVSUNsaWVudChzdGQ6Om1ha2VfdW5p cXVlPFBhZ2VVSUNsaWVudD4ocGFnZSkpOwotICAgIHdlYlBhZ2UtPnNldEluamVjdGVkQnVuZGxl Rm9ybUNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPEZvcm1DbGllbnQ+KHBhZ2UpKTsKKyAgICB3ZWJQ YWdlLT5zZXRJbmplY3RlZEJ1bmRsZUZvcm1DbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxQYWdlRm9y bUNsaWVudD4ocGFnZSkpOwogCiAgICAgcmV0dXJuIHBhZ2U7CiB9CmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTJhOGViM2RkNTcuLjY5MmY2Yzg4 NzMzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTctMDYtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFVzZSBBUEk6OkZvcm1DbGllbnQgaW5zdGVh ZCBvZiB0aGUgQyBBUEkgaW4gV2ViS2l0Rm9ybUNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczMDk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IG1lbW9yeSBsZWFrIGFuZCBydW50aW1lIHdh cm5pbmcgd2hlbiBydW5uaW5nIC93ZWJraXQyL1dlYktpdFdlYlZpZXcvc3VibWl0LWZvcm0uIFRo ZSB3ZWIgZXh0ZW5zaW9uIGlzCisgICAgICAgIGFzc3VtaW5nIHRoYXQgYWxsIHRlc3RzIGNvbnRh aW5pbmcgZm9ybXMgZGVmaW5lIGlkcyBmb3IgdGhlIGZvcm0gZWxlbWVudHMgbGlrZQorICAgICAg ICAvd2Via2l0Mi9XZWJLaXRXZWJFeHRlbnNpb24vZm9ybS1jb250cm9scy1hc3NvY2lhdGVkLXNp Z25hbCBkb2VzLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1dl YkV4dGVuc2lvblRlc3QuY3BwOgorICAgICAgICAoZm9ybUNvbnRyb2xzQXNzb2NpYXRlZENhbGxi YWNrKToKKwogMjAxNy0wNi0wNyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAg ICAgICAgIFtDb2NvYV0gYWRkaXRpb25hbFJlYWRBY2Nlc3NBbGxvd2VkVVJMcyBkb2VzbuKAmXQg cHJlc2VydmUgbm9uLUxhdGluMSBwYXRocwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQyR3RrL1dlYkV4dGVuc2lvblRlc3QuY3BwIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyR3RrL1dlYkV4dGVuc2lvblRlc3QuY3BwCmluZGV4IGY2MzJiYzM3 MWViLi5jODRmY2FjOTUxNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyR3RrL1dlYkV4dGVuc2lvblRlc3QuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcApAQCAtMjYyLDcgKzI2MiwxMyBA QCBzdGF0aWMgdm9pZCBmb3JtQ29udHJvbHNBc3NvY2lhdGVkQ2FsbGJhY2soV2ViS2l0V2ViUGFn ZSogd2ViUGFnZSwgR1B0ckFycmF5KiBmbwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgZm9ybUVs ZW1lbnRzLT5sZW47ICsraSkgewogICAgICAgICBnX2Fzc2VydChXRUJLSVRfRE9NX0lTX0VMRU1F TlQoZ19wdHJfYXJyYXlfaW5kZXgoZm9ybUVsZW1lbnRzLCBpKSkpOwogICAgICAgICBhdXRvIGRv bUVsZW1lbnQgPSBXRUJLSVRfRE9NX0VMRU1FTlQoZ19wdHJfYXJyYXlfaW5kZXgoZm9ybUVsZW1l bnRzLCBpKSk7Ci0gICAgICAgIGdfc3RyaW5nX2FwcGVuZChmb3JtSWRzQnVpbGRlciwgd2Via2l0 X2RvbV9lbGVtZW50X2dldF9pZChkb21FbGVtZW50KSk7CisgICAgICAgIEdVbmlxdWVQdHI8Y2hh cj4gZWxlbWVudElEKHdlYmtpdF9kb21fZWxlbWVudF9nZXRfaWQoZG9tRWxlbWVudCkpOworICAg ICAgICBpZiAoZWxlbWVudElEKQorICAgICAgICAgICAgZ19zdHJpbmdfYXBwZW5kKGZvcm1JZHNC dWlsZGVyLCBlbGVtZW50SUQuZ2V0KCkpOworICAgIH0KKyAgICBpZiAoIWZvcm1JZHNCdWlsZGVy LT5sZW4pIHsKKyAgICAgICAgZ19zdHJpbmdfZnJlZShmb3JtSWRzQnVpbGRlciwgVFJVRSk7Cisg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiBmb3JtSWRzKGdfc3Ry aW5nX2ZyZWUoZm9ybUlkc0J1aWxkZXIsIEZBTFNFKSk7CiAgICAgZ3BvaW50ZXIgZGF0YSA9IGdf b2JqZWN0X2dldF9kYXRhKEdfT0JKRUNUKGV4dGVuc2lvbiksICJkYnVzLWNvbm5lY3Rpb24iKTsK