173254 2017-06-12 03:28:10 -0700 [GTK] Prefer to use private WebKitWebView API over WebKitWebViewBase 2017-06-12 05:59:01 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 173251 1 cgarcia webkit-unassigned berto bugs-noreply buildbot gustavo mcatanzaro zan oldest_to_newest 1318161 0 cgarcia 2017-06-12 03:28:10 -0700 WebKitWebViewBase is specific to the GTK+ API, but WebKitWebView should be present in any glib-based API. 1318162 1 312649 cgarcia 2017-06-12 03:31:14 -0700 Created attachment 312649 Patch 1318163 2 buildbot 2017-06-12 03:32:03 -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 1318196 3 cgarcia 2017-06-12 05:59:01 -0700 Committed r218098: <http://trac.webkit.org/changeset/218098> 312649 2017-06-12 03:31:14 -0700 2017-06-12 04:50:48 -0700 Patch wk2-no-webview-base.diff text/plain 20460 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlMTVkMDk4ODUyMi4uMDhhYzNjNzhlOGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NiBAQAogMjAxNy0wNi0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gUHJlZmVyIHRvIHVzZSBwcml2YXRlIFdlYktpdFdl YlZpZXcgQVBJIG92ZXIgV2ViS2l0V2ViVmlld0Jhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzI1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdFdlYlZpZXdCYXNlIGlzIHNwZWNpZmljIHRv IHRoZSBHVEsrIEFQSSwgYnV0IFdlYktpdFdlYlZpZXcgc2hvdWxkIGJlIHByZXNlbnQgaW4gYW55 IGdsaWItYmFzZWQgQVBJLiBBZGQKKyAgICAgICAgd2Via2l0V2ViVmlld0NyZWF0ZVBhZ2UoKSBh bmQgd2Via2l0V2ViVmlld0dldFBhZ2UoKSBhbmQgdXNlIHRoZW0gd2hlbiBwb3NzaWJsZSBpbnN0 ZWFkIG9mIHRoZSBXZWJLaXRXZWJWaWV3QmFzZQorICAgICAgICBvbmVzLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0QXV0b21hdGlvblNlc3Npb24uY3BwOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAg KGF0dGFjaENvbnRleHRNZW51Q2xpZW50VG9WaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChnZXRQYWdlKToKKyAgICAg ICAgKHdlYmtpdEZpbmRDb250cm9sbGVyRGlzcG9zZSk6CisgICAgICAgICh3ZWJraXRGaW5kQ29u dHJvbGxlckNvbnN0cnVjdGVkKToKKyAgICAgICAgKHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9y bSk6CisgICAgICAgICh3ZWJraXRfZmluZF9jb250cm9sbGVyX3NlYXJjaF9maW5pc2gpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwOgorICAgICAgICAo YXR0YWNoRm9ybUNsaWVudFRvVmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0TG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKGF0dGFjaExvYWRlckNsaWVudFRvVmlldyk6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UG9saWN5Q2xpZW50LmNwcDoKKyAg ICAgICAgKGF0dGFjaFBvbGljeUNsaWVudFRvVmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0UHJpbnRPcGVyYXRpb24uY3BwOgorICAgICAgICAoZHJhd1BhZ2VzRm9yUHJp bnRpbmdDb21wbGV0ZWQpOgorICAgICAgICAod2Via2l0UHJpbnRPcGVyYXRpb25QcmludFBhZ2Vz Rm9yRnJhbWUpOgorICAgICAgICAod2Via2l0X3ByaW50X29wZXJhdGlvbl9ydW5fZGlhbG9nKToK KyAgICAgICAgKHdlYmtpdF9wcmludF9vcGVyYXRpb25fcHJpbnQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcDoKKyAgICAgICAgKGF0dGFjaFVJQ2xpZW50 VG9WaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNw cDoKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRleHRDcmVhdGVQYWdlRm9yV2ViVmlldyk6CisgICAg ICAgICh3ZWJraXRXZWJDb250ZXh0V2ViVmlld0Rlc3Ryb3llZCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3Q3Jl YXRlUGFnZSk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3R2V0UGFnZSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld1ByaXZhdGUuaDoKKworMjAxNy0wNi0xMiAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10g Z2V0UGFnZSgpIGluIFdlYktpdFdlYlZpZXcgc2hvdWxkIHJldHVybiBhIHJlZmVyZW5jZSBpbnN0 ZWFkIG9mIGEgcG9pbnRlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTczMjUxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdEF1dG9tYXRpb25TZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEF1dG9tYXRpb25TZXNzaW9uLmNwcAppbmRleCA0YWJkYjNjZTZj ZC4uNjIyOTUyMWVjN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKQEAgLTIzLDggKzIzLDcg QEAKICNpbmNsdWRlICJBUElBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudC5oIgogI2luY2x1ZGUgIldl YktpdEF1dG9tYXRpb25TZXNzaW9uUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdFByaXZhdGUu aCIKLSNpbmNsdWRlICJXZWJLaXRXZWJWaWV3LmgiCi0jaW5jbHVkZSAiV2ViS2l0V2ViVmlld0Jh c2VQcml2YXRlLmgiCisjaW5jbHVkZSAiV2ViS2l0V2ViVmlld1ByaXZhdGUuaCIKICNpbmNsdWRl IDxnbGliL2dpMThuLWxpYi5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApAQCAt ODYsNyArODUsNyBAQCBwcml2YXRlOgogICAgICAgICBpZiAoIXdlYlZpZXcgfHwgIXdlYmtpdF93 ZWJfdmlld19pc19jb250cm9sbGVkX2J5X2F1dG9tYXRpb24od2ViVmlldykpCiAgICAgICAgICAg ICByZXR1cm4gbnVsbHB0cjsKIAotICAgICAgICByZXR1cm4gd2Via2l0V2ViVmlld0Jhc2VHZXRQ YWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKTsKKyAgICAgICAgcmV0dXJuICZ3ZWJr aXRXZWJWaWV3R2V0UGFnZSh3ZWJWaWV3KTsKICAgICB9CiAKICAgICBXZWJLaXRBdXRvbWF0aW9u U2Vzc2lvbiogbV9zZXNzaW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwCmluZGV4IDY2NzFkYzkz YTNiLi44MTA5MmEzYmM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtMjIsNyArMjIs NiBAQAogCiAjaW5jbHVkZSAiQVBJQ29udGV4dE1lbnVDbGllbnQuaCIKICNpbmNsdWRlICJXZWJD b250ZXh0TWVudUl0ZW0uaCIKLSNpbmNsdWRlICJXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaCIK ICNpbmNsdWRlICJXZWJLaXRXZWJWaWV3UHJpdmF0ZS5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2Vi S2l0OwpAQCAtNTcsNyArNTYsNiBAQCBwcml2YXRlOgogCiB2b2lkIGF0dGFjaENvbnRleHRNZW51 Q2xpZW50VG9WaWV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7Ci0gICAgV2ViUGFnZVByb3h5 KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdl YlZpZXcpKTsKLSAgICBwYWdlLT5zZXRDb250ZXh0TWVudUNsaWVudChzdGQ6Om1ha2VfdW5pcXVl PENvbnRleHRNZW51Q2xpZW50Pih3ZWJWaWV3KSk7CisgICAgd2Via2l0V2ViVmlld0dldFBhZ2Uo d2ViVmlldykuc2V0Q29udGV4dE1lbnVDbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxDb250ZXh0TWVu dUNsaWVudD4od2ViVmlldykpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHAKaW5kZXggZGQ4N2YyMzcw OTkuLjM2NDQ2MmY5NDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuY3BwCkBAIC0yMyw4ICsyMyw3IEBACiAj aW5jbHVkZSAiQVBJRmluZENsaWVudC5oIgogI2luY2x1ZGUgIldlYktpdEVudW1UeXBlcy5oIgog I2luY2x1ZGUgIldlYktpdFByaXZhdGUuaCIKLSNpbmNsdWRlICJXZWJLaXRXZWJWaWV3LmgiCi0j aW5jbHVkZSAiV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmgiCisjaW5jbHVkZSAiV2ViS2l0V2Vi Vmlld1ByaXZhdGUuaCIKICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5oPgogI2luY2x1ZGUgPHd0 Zi9nbGliL0dSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC0xMDIs OSArMTAxLDkgQEAgc3RhdGljIGlubGluZSBXZWJLaXRGaW5kT3B0aW9ucyB0b1dlYktpdEZpbmRP cHRpb25zKHVpbnQzMl90IGZpbmRPcHRpb25zKQogICAgICAgICB8IChmaW5kT3B0aW9ucyAmIEZp bmRPcHRpb25zV3JhcEFyb3VuZCA/IFdFQktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgOiAw KSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgV2ViUGFnZVByb3h5KiBnZXRQYWdlKFdlYktpdEZpbmRD b250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKK3N0YXRpYyBpbmxpbmUgV2ViUGFnZVByb3h5JiBn ZXRQYWdlKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKIHsKLSAgICByZXR1 cm4gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKHJlaW50ZXJwcmV0X2Nhc3Q8V2ViS2l0V2ViVmll d0Jhc2UqPihmaW5kQ29udHJvbGxlci0+cHJpdi0+d2ViVmlldykpOworICAgIHJldHVybiB3ZWJr aXRXZWJWaWV3R2V0UGFnZShmaW5kQ29udHJvbGxlci0+cHJpdi0+d2ViVmlldyk7CiB9CiAKIGNs YXNzIEZpbmRDbGllbnQgZmluYWwgOiBwdWJsaWMgQVBJOjpGaW5kQ2xpZW50IHsKQEAgLTEzNiw3 ICsxMzUsNyBAQCBwcml2YXRlOgogc3RhdGljIHZvaWQgd2Via2l0RmluZENvbnRyb2xsZXJEaXNw b3NlKEdPYmplY3QqIG9iamVjdCkKIHsKICAgICBXZWJLaXRGaW5kQ29udHJvbGxlciogZmluZENv bnRyb2xsZXIgPSBXRUJLSVRfRklORF9DT05UUk9MTEVSKG9iamVjdCk7Ci0gICAgZ2V0UGFnZShm aW5kQ29udHJvbGxlciktPnNldEZpbmRDbGllbnQobnVsbHB0cik7CisgICAgZ2V0UGFnZShmaW5k Q29udHJvbGxlcikuc2V0RmluZENsaWVudChudWxscHRyKTsKIAogICAgIEdfT0JKRUNUX0NMQVNT KHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfcGFyZW50X2NsYXNzKS0+ZGlzcG9zZShvYmplY3QpOwog fQpAQCAtMTQ2LDcgKzE0NSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdEZpbmRDb250cm9sbGVyQ29u c3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF9maW5k X2NvbnRyb2xsZXJfcGFyZW50X2NsYXNzKS0+Y29uc3RydWN0ZWQob2JqZWN0KTsKIAogICAgIFdl YktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlciA9IFdFQktJVF9GSU5EX0NPTlRST0xM RVIob2JqZWN0KTsKLSAgICBnZXRQYWdlKGZpbmRDb250cm9sbGVyKS0+c2V0RmluZENsaWVudChz dGQ6Om1ha2VfdW5pcXVlPEZpbmRDbGllbnQ+KGZpbmRDb250cm9sbGVyKSk7CisgICAgZ2V0UGFn ZShmaW5kQ29udHJvbGxlcikuc2V0RmluZENsaWVudChzdGQ6Om1ha2VfdW5pcXVlPEZpbmRDbGll bnQ+KGZpbmRDb250cm9sbGVyKSk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdEZpbmRDb250cm9s bGVyR2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIEdWYWx1ZSogdmFs dWUsIEdQYXJhbVNwZWMqIHBhcmFtU3BlYykKQEAgLTM3NCw3ICszNzMsNyBAQCBzdGF0aWMgdm9p ZCB3ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0oV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRD b250cm9sbGVyLCBXZQogewogICAgIFdlYktpdEZpbmRDb250cm9sbGVyUHJpdmF0ZSogcHJpdiA9 IGZpbmRDb250cm9sbGVyLT5wcml2OwogICAgIGlmIChvcGVyYXRpb24gPT0gQ291bnRPcGVyYXRp b24pIHsKLSAgICAgICAgZ2V0UGFnZShmaW5kQ29udHJvbGxlciktPmNvdW50U3RyaW5nTWF0Y2hl cyhTdHJpbmc6OmZyb21VVEY4KHByaXYtPnNlYXJjaFRleHQuZGF0YSgpKSwKKyAgICAgICAgZ2V0 UGFnZShmaW5kQ29udHJvbGxlcikuY291bnRTdHJpbmdNYXRjaGVzKFN0cmluZzo6ZnJvbVVURjgo cHJpdi0+c2VhcmNoVGV4dC5kYXRhKCkpLAogICAgICAgICAgICAgc3RhdGljX2Nhc3Q8V2ViS2l0 OjpGaW5kT3B0aW9ucz4ocHJpdi0+ZmluZE9wdGlvbnMpLCBwcml2LT5tYXhNYXRjaENvdW50KTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTM5MCw4ICszODksNyBAQCBzdGF0aWMgdm9pZCB3 ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0oV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250 cm9sbGVyLCBXZQogICAgICAgICAvLyBleHRyYSB1bm1hcmtBbGxUZXh0TWF0Y2hlcygpICsgbWFy a0FsbFRleHRNYXRjaGVzKCkKICAgICAgICAgZmluZE9wdGlvbnMgfD0gRmluZE9wdGlvbnNTaG93 SGlnaGxpZ2h0OwogCi0gICAgZ2V0UGFnZShmaW5kQ29udHJvbGxlciktPmZpbmRTdHJpbmcoU3Ry aW5nOjpmcm9tVVRGOChwcml2LT5zZWFyY2hUZXh0LmRhdGEoKSksIHN0YXRpY19jYXN0PFdlYktp dDo6RmluZE9wdGlvbnM+KGZpbmRPcHRpb25zKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwcml2LT5tYXhNYXRjaENvdW50KTsKKyAgICBnZXRQYWdlKGZpbmRDb250 cm9sbGVyKS5maW5kU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgocHJpdi0+c2VhcmNoVGV4dC5kYXRh KCkpLCBzdGF0aWNfY2FzdDxXZWJLaXQ6OkZpbmRPcHRpb25zPihmaW5kT3B0aW9ucyksIHByaXYt Pm1heE1hdGNoQ291bnQpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgd2ViS2l0RmluZENvbnRy b2xsZXJTZXRTZWFyY2hEYXRhKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlciwg Y29uc3QgZ2NoYXIqIHNlYXJjaFRleHQsIGd1aW50MzIgZmluZE9wdGlvbnMsIGd1aW50IG1heE1h dGNoQ291bnQpCkBAIC01MDgsNSArNTA2LDUgQEAgdm9pZCB3ZWJraXRfZmluZF9jb250cm9sbGVy X3NlYXJjaF9maW5pc2goV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyKQogewog ICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX0ZJTkRfQ09OVFJPTExFUihmaW5kQ29udHJv bGxlcikpOwogCi0gICAgZ2V0UGFnZShmaW5kQ29udHJvbGxlciktPmhpZGVGaW5kVUkoKTsKKyAg ICBnZXRQYWdlKGZpbmRDb250cm9sbGVyKS5oaWRlRmluZFVJKCk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwCmluZGV4 IDI1MTFkYTI0OGYwLi4zNTMzNmY0ZjYzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybUNsaWVudC5jcHAKQEAgLTI0LDcgKzI0LDYgQEAK ICNpbmNsdWRlICJXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJX ZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0UHJp dmF0ZS5oIgotI2luY2x1ZGUgIldlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oIgogI2luY2x1ZGUg IldlYktpdFdlYlZpZXdQcml2YXRlLmgiCiAjaW5jbHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgog CkBAIC00OSw2ICs0OCw1IEBAIHByaXZhdGU6CiAKIHZvaWQgYXR0YWNoRm9ybUNsaWVudFRvVmll dyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIGF1dG8qIHBhZ2UgPSB3ZWJraXRXZWJW aWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpOwotICAgIHBhZ2Ut PnNldEZvcm1DbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxGb3JtQ2xpZW50Pih3ZWJWaWV3KSk7Cisg ICAgd2Via2l0V2ViVmlld0dldFBhZ2Uod2ViVmlldykuc2V0Rm9ybUNsaWVudChzdGQ6Om1ha2Vf dW5pcXVlPEZvcm1DbGllbnQ+KHdlYlZpZXcpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdExvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRMb2FkZXJDbGllbnQuY3BwCmluZGV4IGY1MmM4 Yzc4ZWNkLi43NTczZjNiYWU1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0TG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRMb2FkZXJDbGllbnQuY3BwCkBAIC0yNSw3ICsyNSw2IEBACiAj aW5jbHVkZSAiV2ViS2l0QmFja0ZvcndhcmRMaXN0UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktp dFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRVUklSZXNwb25zZVByaXZhdGUuaCIKLSNpbmNs dWRlICJXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRXZWJWaWV3 UHJpdmF0ZS5oIgogI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC0xMjEsNyArMTIwLDYgQEAgcHJpdmF0ZToKIAogdm9pZCBh dHRhY2hMb2FkZXJDbGllbnRUb1ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKLSAgICBX ZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9W SUVXX0JBU0Uod2ViVmlldykpOwotICAgIHBhZ2UtPnNldExvYWRlckNsaWVudChzdGQ6Om1ha2Vf dW5pcXVlPExvYWRlckNsaWVudD4od2ViVmlldykpOworICAgIHdlYmtpdFdlYlZpZXdHZXRQYWdl KHdlYlZpZXcpLnNldExvYWRlckNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPExvYWRlckNsaWVudD4o d2ViVmlldykpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRQb2xpY3lDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0UG9saWN5Q2xpZW50LmNwcAppbmRleCAyNDNmNDA5OTBjNS4uNzhjMGQ1ZWRm NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFBv bGljeUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0UG9saWN5Q2xpZW50LmNwcApAQCAtMjMsNyArMjMsNiBAQAogI2luY2x1ZGUgIkFQSVBvbGlj eUNsaWVudC5oIgogI2luY2x1ZGUgIldlYktpdE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvblByaXZh dGUuaCIKICNpbmNsdWRlICJXZWJLaXRSZXNwb25zZVBvbGljeURlY2lzaW9uUHJpdmF0ZS5oIgot I2luY2x1ZGUgIldlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdFdl YlZpZXdQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2Vic2l0ZVBvbGljaWVzLmgiCiAjaW5jbHVkZSA8 d3RmL2dsaWIvR1JlZlB0ci5oPgpAQCAtNjIsNiArNjEsNSBAQCBwcml2YXRlOgogCiB2b2lkIGF0 dGFjaFBvbGljeUNsaWVudFRvVmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIFdl YlBhZ2VQcm94eSogcGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJ RVdfQkFTRSh3ZWJWaWV3KSk7Ci0gICAgcGFnZS0+c2V0UG9saWN5Q2xpZW50KHN0ZDo6bWFrZV91 bmlxdWU8UG9saWN5Q2xpZW50Pih3ZWJWaWV3KSk7CisgICAgd2Via2l0V2ViVmlld0dldFBhZ2Uo d2ViVmlldykuc2V0UG9saWN5Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8UG9saWN5Q2xpZW50Pih3 ZWJWaWV3KSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRQcmludE9wZXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRQcmludE9wZXJhdGlvbi5jcHAKaW5kZXggZGFiOGM5ZDg5YmEuLjc1MDNlMWQx NDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQ cmludE9wZXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0UHJpbnRPcGVyYXRpb24uY3BwCkBAIC0yMyw3ICsyMyw3IEBACiAjaW5jbHVkZSAiV2Vi S2l0UHJpbnRDdXN0b21XaWRnZXRQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0UHJpbnRPcGVy YXRpb25Qcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0UHJpdmF0ZS5oIgotI2luY2x1ZGUgIldl YktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oIgorI2luY2x1ZGUgIldlYktpdFdlYlZpZXdQcml2YXRl LmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9HdGtVdGls aXRpZXMuaD4KICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CkBAIC0zMDcsMTAg KzMwNyw4IEBAIHN0YXRpYyBXZWJLaXRQcmludE9wZXJhdGlvblJlc3BvbnNlIHdlYmtpdFByaW50 T3BlcmF0aW9uUnVuRGlhbG9nKFdlYktpdFByaW50T3BlCiBzdGF0aWMgdm9pZCBkcmF3UGFnZXNG b3JQcmludGluZ0NvbXBsZXRlZChBUEk6OkVycm9yKiB3a1ByaW50RXJyb3IsIFdlYktpdFByaW50 T3BlcmF0aW9uKiBwcmludE9wZXJhdGlvbikKIHsKICAgICAvLyBXaGVuIHJ1bm5pbmcgc3luY2hy b25vdXNseSBXZWJQYWdlUHJveHk6OnByaW50RnJhbWUoKSBjYWxscyBlbmRQcmludGluZygpLgot ICAgIGlmIChwcmludE9wZXJhdGlvbi0+cHJpdi0+cHJpbnRNb2RlID09IFByaW50SW5mbzo6UHJp bnRNb2RlQXN5bmMgJiYgcHJpbnRPcGVyYXRpb24tPnByaXYtPndlYlZpZXcpIHsKLSAgICAgICAg V2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJf VklFV19CQVNFKHByaW50T3BlcmF0aW9uLT5wcml2LT53ZWJWaWV3KSk7Ci0gICAgICAgIHBhZ2Ut PmVuZFByaW50aW5nKCk7Ci0gICAgfQorICAgIGlmIChwcmludE9wZXJhdGlvbi0+cHJpdi0+cHJp bnRNb2RlID09IFByaW50SW5mbzo6UHJpbnRNb2RlQXN5bmMgJiYgcHJpbnRPcGVyYXRpb24tPnBy aXYtPndlYlZpZXcpCisgICAgICAgIHdlYmtpdFdlYlZpZXdHZXRQYWdlKHByaW50T3BlcmF0aW9u LT5wcml2LT53ZWJWaWV3KS5lbmRQcmludGluZygpOwogCiAgICAgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvciA9IHdrUHJpbnRFcnJvciA/IHdrUHJpbnRFcnJvci0+ cGxhdGZvcm1FcnJvcigpIDogV2ViQ29yZTo6UmVzb3VyY2VFcnJvcigpOwogICAgIGlmICghcmVz b3VyY2VFcnJvci5pc051bGwoKSkgewpAQCAtMzI0LDkgKzMyMiw5IEBAIHN0YXRpYyB2b2lkIGRy YXdQYWdlc0ZvclByaW50aW5nQ29tcGxldGVkKEFQSTo6RXJyb3IqIHdrUHJpbnRFcnJvciwgV2Vi S2l0UHJpbnRPCiBzdGF0aWMgdm9pZCB3ZWJraXRQcmludE9wZXJhdGlvblByaW50UGFnZXNGb3JG cmFtZShXZWJLaXRQcmludE9wZXJhdGlvbiogcHJpbnRPcGVyYXRpb24sIFdlYkZyYW1lUHJveHkq IHdlYkZyYW1lLCBHdGtQcmludFNldHRpbmdzKiBwcmludFNldHRpbmdzLCBHdGtQYWdlU2V0dXAq IHBhZ2VTZXR1cCkKIHsKICAgICBQcmludEluZm8gcHJpbnRJbmZvKHByaW50U2V0dGluZ3MsIHBh Z2VTZXR1cCwgcHJpbnRPcGVyYXRpb24tPnByaXYtPnByaW50TW9kZSk7Ci0gICAgV2ViUGFnZVBy b3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNF KHByaW50T3BlcmF0aW9uLT5wcml2LT53ZWJWaWV3KSk7CisgICAgYXV0byYgcGFnZSA9IHdlYmtp dFdlYlZpZXdHZXRQYWdlKHByaW50T3BlcmF0aW9uLT5wcml2LT53ZWJWaWV3KTsKICAgICBnX29i amVjdF9yZWYocHJpbnRPcGVyYXRpb24pOwotICAgIHBhZ2UtPmRyYXdQYWdlc0ZvclByaW50aW5n KHdlYkZyYW1lLCBwcmludEluZm8sIFByaW50RmluaXNoZWRDYWxsYmFjazo6Y3JlYXRlKFtwcmlu dE9wZXJhdGlvbl0oQVBJOjpFcnJvciogcHJpbnRFcnJvciwgQ2FsbGJhY2tCYXNlOjpFcnJvcikg eworICAgIHBhZ2UuZHJhd1BhZ2VzRm9yUHJpbnRpbmcod2ViRnJhbWUsIHByaW50SW5mbywgUHJp bnRGaW5pc2hlZENhbGxiYWNrOjpjcmVhdGUoW3ByaW50T3BlcmF0aW9uXShBUEk6OkVycm9yKiBw cmludEVycm9yLCBDYWxsYmFja0Jhc2U6OkVycm9yKSB7CiAgICAgICAgIGRyYXdQYWdlc0ZvclBy aW50aW5nQ29tcGxldGVkKHByaW50RXJyb3IsIGFkb3B0R1JlZihwcmludE9wZXJhdGlvbikuZ2V0 KCkpOwogICAgIH0pKTsKIH0KQEAgLTQ2Niw4ICs0NjQsOCBAQCBXZWJLaXRQcmludE9wZXJhdGlv blJlc3BvbnNlIHdlYmtpdF9wcmludF9vcGVyYXRpb25fcnVuX2RpYWxvZyhXZWJLaXRQcmludE9w ZXJhdAogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19QUklOVF9PUEVSQVRJ T04ocHJpbnRPcGVyYXRpb24pLCBXRUJLSVRfUFJJTlRfT1BFUkFUSU9OX1JFU1BPTlNFX0NBTkNF TCk7CiAKLSAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2Uo V0VCS0lUX1dFQl9WSUVXX0JBU0UocHJpbnRPcGVyYXRpb24tPnByaXYtPndlYlZpZXcpKTsKLSAg ICByZXR1cm4gd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dGb3JGcmFtZShwcmludE9wZXJh dGlvbiwgcGFyZW50LCBwYWdlLT5tYWluRnJhbWUoKSk7CisgICAgYXV0byYgcGFnZSA9IHdlYmtp dFdlYlZpZXdHZXRQYWdlKHByaW50T3BlcmF0aW9uLT5wcml2LT53ZWJWaWV3KTsKKyAgICByZXR1 cm4gd2Via2l0UHJpbnRPcGVyYXRpb25SdW5EaWFsb2dGb3JGcmFtZShwcmludE9wZXJhdGlvbiwg cGFyZW50LCBwYWdlLm1haW5GcmFtZSgpKTsKIH0KIAogLyoqCkBAIC00OTEsNiArNDg5LDYgQEAg dm9pZCB3ZWJraXRfcHJpbnRfb3BlcmF0aW9uX3ByaW50KFdlYktpdFByaW50T3BlcmF0aW9uKiBw cmludE9wZXJhdGlvbikKICAgICBHUmVmUHRyPEd0a1ByaW50U2V0dGluZ3M+IHByaW50U2V0dGlu Z3MgPSBwcml2LT5wcmludFNldHRpbmdzID8gcHJpdi0+cHJpbnRTZXR0aW5ncyA6IGFkb3B0R1Jl ZihndGtfcHJpbnRfc2V0dGluZ3NfbmV3KCkpOwogICAgIEdSZWZQdHI8R3RrUGFnZVNldHVwPiBw YWdlU2V0dXAgPSBwcml2LT5wYWdlU2V0dXAgPyBwcml2LT5wYWdlU2V0dXAgOiBhZG9wdEdSZWYo Z3RrX3BhZ2Vfc2V0dXBfbmV3KCkpOwogCi0gICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0 V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHByaW50T3BlcmF0aW9uLT5w cml2LT53ZWJWaWV3KSk7Ci0gICAgd2Via2l0UHJpbnRPcGVyYXRpb25QcmludFBhZ2VzRm9yRnJh bWUocHJpbnRPcGVyYXRpb24sIHBhZ2UtPm1haW5GcmFtZSgpLCBwcmludFNldHRpbmdzLmdldCgp LCBwYWdlU2V0dXAuZ2V0KCkpOworICAgIGF1dG8mIHBhZ2UgPSB3ZWJraXRXZWJWaWV3R2V0UGFn ZShwcmludE9wZXJhdGlvbi0+cHJpdi0+d2ViVmlldyk7CisgICAgd2Via2l0UHJpbnRPcGVyYXRp b25QcmludFBhZ2VzRm9yRnJhbWUocHJpbnRPcGVyYXRpb24sIHBhZ2UubWFpbkZyYW1lKCksIHBy aW50U2V0dGluZ3MuZ2V0KCksIHBhZ2VTZXR1cC5nZXQoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAKaW5kZXggNWY0MmM1 Y2M4MWUuLmRlOTQ1OWJjNjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0VUlDbGllbnQuY3BwCkBAIC0yOCw3ICsyOCw2IEBACiAjaW5jbHVkZSAi V2ViS2l0UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdFVSSVJlcXVlc3RQcml2YXRlLmgiCiAj aW5jbHVkZSAiV2ViS2l0VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcml2YXRlLmgiCi0jaW5j bHVkZSAiV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmll d1ByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRXaW5kb3dQcm9wZXJ0aWVzUHJpdmF0ZS5oIgog I2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgpAQCAtMjE3LDcgKzIxNiw2IEBAIHByaXZhdGU6CiAK IHZvaWQgYXR0YWNoVUlDbGllbnRUb1ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKLSAg ICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dF Ql9WSUVXX0JBU0Uod2ViVmlldykpOwotICAgIHBhZ2UtPnNldFVJQ2xpZW50KHN0ZDo6bWFrZV91 bmlxdWU8VUlDbGllbnQ+KHdlYlZpZXcpKTsKKyAgICB3ZWJraXRXZWJWaWV3R2V0UGFnZSh3ZWJW aWV3KS5zZXRVSUNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPFVJQ2xpZW50Pih3ZWJWaWV3KSk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Q29udGV4dC5jcHAKaW5kZXggZDE3ZDI3Njc2MjcuLjJkN2JiZjcyNzM0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcApA QCAtNDksNyArNDksNiBAQAogI2luY2x1ZGUgIldlYktpdFVSSVNjaGVtZVJlcXVlc3RQcml2YXRl LmgiCiAjaW5jbHVkZSAiV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyUHJpdmF0ZS5oIgogI2luY2x1 ZGUgIldlYktpdFdlYkNvbnRleHRQcml2YXRlLmgiCi0jaW5jbHVkZSAiV2ViS2l0V2ViVmlld0Jh c2VQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlld1ByaXZhdGUuaCIKICNpbmNsdWRl ICJXZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXJQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViTm90aWZp Y2F0aW9uTWFuYWdlclByb3h5LmgiCkBAIC0xNjAxLDggKzE2MDAsNiBAQCBib29sIHdlYmtpdFdl YkNvbnRleHRJc0xvYWRpbmdDdXN0b21Qcm90b2NvbChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0 LCB1aW50NjRfdAogCiB2b2lkIHdlYmtpdFdlYkNvbnRleHRDcmVhdGVQYWdlRm9yV2ViVmlldyhX ZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRV c2VyQ29udGVudE1hbmFnZXIqIHVzZXJDb250ZW50TWFuYWdlciwgV2ViS2l0V2ViVmlldyogcmVs YXRlZFZpZXcpCiB7Ci0gICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lU X1dFQl9WSUVXX0JBU0Uod2ViVmlldyk7Ci0KICAgICAvLyBGSVhNRTogaWNvbiBkYXRhYmFzZSBw cml2YXRlIG1vZGUgaXMgZ2xvYmFsLCBub3QgcGVyIHBhZ2UsIHNvIHdoaWxlIHRoZXJlIGFyZQog ICAgIC8vIHBhZ2VzIGluIHByaXZhdGUgbW9kZSB3ZSBuZWVkIHRvIGVuYWJsZSB0aGUgcHJpdmF0 ZSBtb2RlIGluIHRoZSBpY29uIGRhdGFiYXNlLgogICAgIHdlYmtpdFdlYkNvbnRleHRFbmFibGVJ Y29uRGF0YWJhc2VQcml2YXRlQnJvd3NpbmdJZk5lZWRlZChjb250ZXh0LCB3ZWJWaWV3KTsKQEAg LTE2MTAsNyArMTYwNyw3IEBAIHZvaWQgd2Via2l0V2ViQ29udGV4dENyZWF0ZVBhZ2VGb3JXZWJW aWV3KFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIFdlYktpdFdlYlZpCiAgICAgYXV0byBwYWdl Q29uZmlndXJhdGlvbiA9IEFQSTo6UGFnZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpOwogICAgIHBh Z2VDb25maWd1cmF0aW9uLT5zZXRQcm9jZXNzUG9vbChjb250ZXh0LT5wcml2LT5wcm9jZXNzUG9v bC5nZXQoKSk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFByZWZlcmVuY2VzKHdlYmtpdFNl dHRpbmdzR2V0UHJlZmVyZW5jZXMod2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyh3ZWJWaWV3 KSkpOwotICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRSZWxhdGVkUGFnZShyZWxhdGVkVmlldyA/ IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRShyZWxhdGVkVmll dykpIDogbnVsbHB0cik7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFJlbGF0ZWRQYWdlKHJl bGF0ZWRWaWV3ID8gJndlYmtpdFdlYlZpZXdHZXRQYWdlKHJlbGF0ZWRWaWV3KSA6IG51bGxwdHIp OwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRVc2VyQ29udGVudENvbnRyb2xsZXIodXNlckNv bnRlbnRNYW5hZ2VyID8gd2Via2l0VXNlckNvbnRlbnRNYW5hZ2VyR2V0VXNlckNvbnRlbnRDb250 cm9sbGVyUHJveHkodXNlckNvbnRlbnRNYW5hZ2VyKSA6IG51bGxwdHIpOwogICAgIHBhZ2VDb25m aWd1cmF0aW9uLT5zZXRDb250cm9sbGVkQnlBdXRvbWF0aW9uKHdlYmtpdF93ZWJfdmlld19pc19j b250cm9sbGVkX2J5X2F1dG9tYXRpb24od2ViVmlldykpOwogCkBAIC0xNjE5LDE3ICsxNjE2LDE1 IEBAIHZvaWQgd2Via2l0V2ViQ29udGV4dENyZWF0ZVBhZ2VGb3JXZWJWaWV3KFdlYktpdFdlYkNv bnRleHQqIGNvbnRleHQsIFdlYktpdFdlYlZpCiAgICAgICAgIG1hbmFnZXIgPSBjb250ZXh0LT5w cml2LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNl dFdlYnNpdGVEYXRhU3RvcmUoJndlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckdldERhdGFTdG9yZSht YW5hZ2VyKSk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFNlc3Npb25JRChwYWdlQ29uZmln dXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2Vzc2lvbklE KCkpOwotICAgIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlV2ViUGFnZSh3ZWJWaWV3QmFzZSwgV1RG TW92ZShwYWdlQ29uZmlndXJhdGlvbikpOworICAgIHdlYmtpdFdlYlZpZXdDcmVhdGVQYWdlKHdl YlZpZXcsIFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKIAotICAgIFdlYlBhZ2VQcm94eSog cGFnZSA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZSh3ZWJWaWV3QmFzZSk7Ci0gICAgY29udGV4 dC0+cHJpdi0+d2ViVmlld3Muc2V0KHBhZ2UtPnBhZ2VJRCgpLCB3ZWJWaWV3KTsKKyAgICBjb250 ZXh0LT5wcml2LT53ZWJWaWV3cy5zZXQod2Via2l0X3dlYl92aWV3X2dldF9wYWdlX2lkKHdlYlZp ZXcpLCB3ZWJWaWV3KTsKIH0KIAogdm9pZCB3ZWJraXRXZWJDb250ZXh0V2ViVmlld0Rlc3Ryb3ll ZChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewog ICAgIHdlYmtpdFdlYkNvbnRleHREaXNhYmxlSWNvbkRhdGFiYXNlUHJpdmF0ZUJyb3dzaW5nSWZO ZWVkZWQoY29udGV4dCwgd2ViVmlldyk7Ci0gICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0 V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKTsKLSAgICBj b250ZXh0LT5wcml2LT53ZWJWaWV3cy5yZW1vdmUocGFnZS0+cGFnZUlEKCkpOworICAgIGNvbnRl eHQtPnByaXYtPndlYlZpZXdzLnJlbW92ZSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3BhZ2VfaWQod2Vi VmlldykpOwogfQogCiBXZWJLaXRXZWJWaWV3KiB3ZWJraXRXZWJDb250ZXh0R2V0V2ViVmlld0Zv clBhZ2UoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgV2ViUGFnZVByb3h5KiBwYWdlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApp bmRleCAxMmY1ODEyMjBiOC4uZjk1MGVkNjJhNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC0xODk0LDYgKzE4OTQsMTYg QEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0NhbmNlbEF1dGhlbnRpY2F0aW9uUmVxdWVzdChX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgIHdlYlZpZXctPnByaXYtPmF1dGhlbnRpY2F0aW9u UmVxdWVzdC5jbGVhcigpOwogfQogCit2b2lkIHdlYmtpdFdlYlZpZXdDcmVhdGVQYWdlKFdlYktp dFdlYlZpZXcqIHdlYlZpZXcsIFJlZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmIGNvbmZpZ3Vy YXRpb24pCit7CisgICAgd2Via2l0V2ViVmlld0Jhc2VDcmVhdGVXZWJQYWdlKFdFQktJVF9XRUJf VklFV19CQVNFKHdlYlZpZXcpLCBXVEZNb3ZlKGNvbmZpZ3VyYXRpb24pKTsKK30KKworV2ViUGFn ZVByb3h5JiB3ZWJraXRXZWJWaWV3R2V0UGFnZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQorewor ICAgIHJldHVybiBnZXRQYWdlKHdlYlZpZXcpOworfQorCiB2b2lkIHdlYmtpdFdlYlZpZXdMb2Fk Q2hhbmdlZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2ZW50 KQogewogICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdQ cml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 UHJpdmF0ZS5oCmluZGV4IDRhNmIxYjM1MzBhLi4zYjUwMDZkM2FkZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld1ByaXZhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3UHJpdmF0ZS5o CkBAIC0yNCwxNiArMjQsMjAgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K ICAqLwogCi0jaWZuZGVmIFdlYktpdFdlYlZpZXdQcml2YXRlX2gKLSNkZWZpbmUgV2ViS2l0V2Vi Vmlld1ByaXZhdGVfaAorI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlICJBUElQYWdlQ29uZmlndXJh dGlvbi5oIgogI2luY2x1ZGUgIkluc3RhbGxNaXNzaW5nTWVkaWFQbHVnaW5zUGVybWlzc2lvblJl cXVlc3QuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW1EYXRhLmgiCiAjaW5jbHVkZSAi V2ViSGl0VGVzdFJlc3VsdERhdGEuaCIKICNpbmNsdWRlICJXZWJJbWFnZS5oIgorI2luY2x1ZGUg IldlYktpdFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRXZWJWaWV3LmgiCisjaW5jbHVkZSAi V2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCit2b2lkIHdl YmtpdFdlYlZpZXdDcmVhdGVQYWdlKFdlYktpdFdlYlZpZXcqLCBSZWY8QVBJOjpQYWdlQ29uZmln dXJhdGlvbj4mJik7CitXZWJLaXQ6OldlYlBhZ2VQcm94eSYgd2Via2l0V2ViVmlld0dldFBhZ2Uo V2ViS2l0V2ViVmlldyopOwogdm9pZCB3ZWJraXRXZWJWaWV3TG9hZENoYW5nZWQoV2ViS2l0V2Vi VmlldyosIFdlYktpdExvYWRFdmVudCk7CiB2b2lkIHdlYmtpdFdlYlZpZXdMb2FkRmFpbGVkKFdl YktpdFdlYlZpZXcqLCBXZWJLaXRMb2FkRXZlbnQsIGNvbnN0IGNoYXIqIGZhaWxpbmdVUkksIEdF cnJvciopOwogdm9pZCB3ZWJraXRXZWJWaWV3TG9hZEZhaWxlZFdpdGhUTFNFcnJvcnMoV2ViS2l0 V2ViVmlldyosIGNvbnN0IGNoYXIqIGZhaWxpbmdVUkksIEdFcnJvciosIEdUbHNDZXJ0aWZpY2F0 ZUZsYWdzLCBHVGxzQ2VydGlmaWNhdGUqKTsKQEAgLTY4LDUgKzcyLDMgQEAgdm9pZCB3ZWJraXRX ZWJWaWV3SXNQbGF5aW5nQXVkaW9DaGFuZ2VkKFdlYktpdFdlYlZpZXcqKTsKIHZvaWQgd2Via2l0 V2ViVmlld1NlbGVjdGlvbkRpZENoYW5nZShXZWJLaXRXZWJWaWV3Kik7CiB2b2lkIHdlYmtpdFdl YlZpZXdSZXF1ZXN0SW5zdGFsbE1pc3NpbmdNZWRpYVBsdWdpbnMoV2ViS2l0V2ViVmlldyosIFdl YktpdDo6SW5zdGFsbE1pc3NpbmdNZWRpYVBsdWdpbnNQZXJtaXNzaW9uUmVxdWVzdCYpOwogV2Vi S2l0V2Vic2l0ZURhdGFNYW5hZ2VyKiB3ZWJraXRXZWJWaWV3R2V0V2Vic2l0ZURhdGFNYW5hZ2Vy KFdlYktpdFdlYlZpZXcqKTsKLQotI2VuZGlmIC8vIFdlYktpdFdlYlZpZXdQcml2YXRlX2gK