99542 2012-10-16 22:35:54 -0700 [EFL][WK2] Use WTF RefCounted and RefPtr for Ewk_Resource and Ewk_Form_Submission_Request 2012-10-17 00:10:50 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99321 1 cdumez cdumez bw80.lee gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi mikhail.pozdnyakov rakuco tonikitoo webkit.review.bot oldest_to_newest 743862 0 cdumez 2012-10-16 22:35:54 -0700 As part of Bug 99321, we should use WTF RefCounted and RefPtr for Ewk_Resource and Ewk_Form_Submission_Request. 743874 1 169093 cdumez 2012-10-16 22:53:09 -0700 Created attachment 169093 Patch 743928 2 bw80.lee 2012-10-17 00:07:32 -0700 *** Bug 99550 has been marked as a duplicate of this bug. *** 743930 3 169093 webkit.review.bot 2012-10-17 00:10:45 -0700 Comment on attachment 169093 Patch Clearing flags on attachment: 169093 Committed r131556: <http://trac.webkit.org/changeset/131556> 743931 4 webkit.review.bot 2012-10-17 00:10:50 -0700 All reviewed patches have been landed. Closing bug. 169093 2012-10-16 22:53:09 -0700 2012-10-17 00:10:45 -0700 Patch 99542_more_refcounted.patch text/plain 16803 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiZDhmOGNkLi5kZGIwNTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDQg QEAKIDIwMTItMTAtMTYgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIFVzZSBXVEYgUmVmQ291bnRlZCBhbmQgUmVmUHRy IGZvciBFd2tfUmVzb3VyY2UgYW5kIEV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk1NDIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgV1RGIFJlZkNvdW50 ZWQgYW5kIFJlZlB0ciBmb3IgRXdrX1Jlc291cmNlIGFuZCBFd2tfRm9ybV9TdWJtaXNzaW9uX1Jl cXVlc3QKKyAgICAgICAgdG8gYXZvaWQgaGFuZGxpbmcgcmF3IHBvaW50ZXJzIGludGVybmFsbHku CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVl c3QuY3BwOgorICAgICAgICAoZXdrX2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0X3JlZik6CisgICAg ICAgIChld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfdW5yZWYpOgorICAgICAgICAoZXdrX2Zv cm1fc3VibWlzc2lvbl9yZXF1ZXN0X3N1Ym1pdCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0X3ByaXZhdGUuaDoKKyAgICAgICAgKF9Fd2tf Rm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QpOgorICAgICAgICAoX0V3a19Gb3JtX1N1Ym1pc3Npb25f UmVxdWVzdDo6fl9Fd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QpOgorICAgICAgICAoX0V3a19G b3JtX1N1Ym1pc3Npb25fUmVxdWVzdDo6Y3JlYXRlKToKKyAgICAgICAgKF9Fd2tfRm9ybV9TdWJt aXNzaW9uX1JlcXVlc3Q6Ol9Fd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19yZXNvdXJjZS5jcHA6CisgICAgICAgIChld2tfcmVzb3Vy Y2VfcmVmKToKKyAgICAgICAgKGV3a19yZXNvdXJjZV91bnJlZik6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3Jlc291cmNlX3ByaXZhdGUuaDoKKyAgICAgICAgKF9Fd2tfUmVzb3Vy Y2UpOgorICAgICAgICAoX0V3a19SZXNvdXJjZTo6Y3JlYXRlKToKKyAgICAgICAgKF9Fd2tfUmVz b3VyY2U6Ol9Fd2tfUmVzb3VyY2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcDoKKyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGE6On5fRXdrX1ZpZXdfUHJp dmF0ZV9EYXRhKToKKyAgICAgICAgKGV3a192aWV3X3Jlc291cmNlX2xvYWRfaW5pdGlhdGVkKToK KyAgICAgICAgKGV3a192aWV3X3Jlc291cmNlX2xvYWRfcmVzcG9uc2UpOgorICAgICAgICAoZXdr X3ZpZXdfcmVzb3VyY2VfbG9hZF9mYWlsZWQpOgorICAgICAgICAoZXdrX3ZpZXdfcmVzb3VyY2Vf bG9hZF9maW5pc2hlZCk6CisgICAgICAgIChld2tfdmlld19yZXNvdXJjZV9yZXF1ZXN0X3NlbnQp OgorICAgICAgICAoZXdrX3ZpZXdfbG9hZF9wcm92aXNpb25hbF9zdGFydGVkKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19mb3JtX2NsaWVudC5jcHA6CisgICAgICAgICh3 aWxsU3VibWl0Rm9ybSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcmVz b3VyY2VfbG9hZF9jbGllbnQuY3BwOgorICAgICAgICAoZGlkSW5pdGlhdGVMb2FkRm9yUmVzb3Vy Y2UpOgorCisyMDEyLTEwLTE2ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBp bnRlbC5jb20+CisKICAgICAgICAgW0VGTF1bV0syXSBBZGQgZmFjdG9yeSBtZXRob2RzIGZvciBy ZWZjb3VudGVkIEV3ayB0eXBlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTk0NzkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mb3JtX3N1Ym1pc3Npb25fcmVxdWVzdC5jcHAKaW5kZXgg ODBhNWZkOS4uZWUxNDBmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3QuY3BwCkBAIC0y OSw0NiArMjksMTYgQEAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJXS0FycmF5 LmgiCiAjaW5jbHVkZSAiV0tCYXNlLmgiCi0jaW5jbHVkZSAiV0tEaWN0aW9uYXJ5LmgiCi0jaW5j bHVkZSAiV0tGb3JtU3VibWlzc2lvbkxpc3RlbmVyLmgiCi0jaW5jbHVkZSAiV0tSZXRhaW5QdHIu aCIKICNpbmNsdWRlICJXS1N0cmluZy5oIgogI2luY2x1ZGUgImV3a19mb3JtX3N1Ym1pc3Npb25f cmVxdWVzdF9wcml2YXRlLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViS2l0OwogCi0vKioKLSAqIFxzdHJ1Y3QgX0V3a19Gb3JtX1N1Ym1pc3Np b25fUmVxdWVzdAotICogQGJyaWVmIENvbnRhaW5zIHRoZSBmb3JtIHN1Ym1pc3Npb24gcmVxdWVz dCBkYXRhLgotICovCi1zdHJ1Y3QgX0V3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdCB7Ci0gICAg dW5zaWduZWQgaW50IF9fcmVmOyAvKio8IHRoZSByZWZlcmVuY2UgY291bnQgb2YgdGhlIG9iamVj dCAqLwotICAgIFdLUmV0YWluUHRyPFdLRGljdGlvbmFyeVJlZj4gd2tWYWx1ZXM7Ci0gICAgV0tS ZXRhaW5QdHI8V0tGb3JtU3VibWlzc2lvbkxpc3RlbmVyUmVmPiB3a0xpc3RlbmVyOwotICAgIGJv b2wgaGFuZGxlZFJlcXVlc3Q7Ci0KLSAgICBfRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KFdL RGljdGlvbmFyeVJlZiB2YWx1ZXMsIFdLRm9ybVN1Ym1pc3Npb25MaXN0ZW5lclJlZiBsaXN0ZW5l cikKLSAgICAgICAgOiBfX3JlZigxKQotICAgICAgICAsIHdrVmFsdWVzKHZhbHVlcykKLSAgICAg ICAgLCB3a0xpc3RlbmVyKGxpc3RlbmVyKQotICAgICAgICAsIGhhbmRsZWRSZXF1ZXN0KGZhbHNl KQotICAgIHsgfQotCi0gICAgfl9Fd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QoKQotICAgIHsK LSAgICAgICAgQVNTRVJUKCFfX3JlZik7Ci0KLSAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSByZXF1 ZXN0IGlzIGFsd2F5cyBoYW5kbGVkIGJlZm9yZSBkZXN0cm95aW5nLgotICAgICAgICBpZiAoIWhh bmRsZWRSZXF1ZXN0KQotICAgICAgICAgICAgV0tGb3JtU3VibWlzc2lvbkxpc3RlbmVyQ29udGlu dWUod2tMaXN0ZW5lci5nZXQoKSk7Ci0gICAgfQotfTsKLQogRXdrX0Zvcm1fU3VibWlzc2lvbl9S ZXF1ZXN0KiBld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfcmVmKEV3a19Gb3JtX1N1Ym1pc3Np b25fUmVxdWVzdCogcmVxdWVzdCkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9W QUwocmVxdWVzdCwgMCk7Ci0gICAgKytyZXF1ZXN0LT5fX3JlZjsKKyAgICByZXF1ZXN0LT5yZWYo KTsKIAogICAgIHJldHVybiByZXF1ZXN0OwogfQpAQCAtNzcsMTAgKzQ3LDcgQEAgdm9pZCBld2tf Zm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfdW5yZWYoRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0 KiByZXF1ZXN0KQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKHJlcXVlc3QpOwog Ci0gICAgaWYgKC0tcmVxdWVzdC0+X19yZWYpCi0gICAgICAgIHJldHVybjsKLQotICAgIGRlbGV0 ZSByZXF1ZXN0OworICAgIHJlcXVlc3QtPmRlcmVmKCk7CiB9CiAKIEVpbmFfTGlzdCogZXdrX2Zv cm1fc3VibWlzc2lvbl9yZXF1ZXN0X2ZpZWxkX25hbWVzX2dldChFd2tfRm9ybV9TdWJtaXNzaW9u X1JlcXVlc3QqIHJlcXVlc3QpCkBAIC0xMTksMTUgKzg2LDMgQEAgRWluYV9Cb29sIGV3a19mb3Jt X3N1Ym1pc3Npb25fcmVxdWVzdF9zdWJtaXQoRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KiBy ZXF1ZXMKIAogICAgIHJldHVybiB0cnVlOwogfQotCi0vKioKLSAqIEBpbnRlcm5hbCBld2tfZm9y bV9zdWJtaXNzaW9uX3JlcXVlc3RfbmV3Ci0gKiBDcmVhdGVzIGEgRXdrX0Zvcm1fU3VibWlzc2lv bl9SZXF1ZXN0IGZyb20gYSBkaWN0aW9uYXJ5IGFuZCBhIFdLRm9ybVN1Ym1pc3Npb25MaXN0ZW5l clJlZi4KLSAqLwotRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KiBld2tfZm9ybV9zdWJtaXNz aW9uX3JlcXVlc3RfbmV3KFdLRGljdGlvbmFyeVJlZiB2YWx1ZXMsIFdLRm9ybVN1Ym1pc3Npb25M aXN0ZW5lclJlZiBsaXN0ZW5lcikKLXsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9W QUwodmFsdWVzLCAwKTsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwobGlzdGVu ZXIsIDApOwotCi0gICAgcmV0dXJuIG5ldyBFd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QodmFs dWVzLCBsaXN0ZW5lcik7Ci19CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfcHJpdmF0ZS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0X3ByaXZh dGUuaAppbmRleCBmZWIzZDYwLi5iOWJmNTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfcHJpdmF0ZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mb3JtX3N1Ym1pc3Npb25f cmVxdWVzdF9wcml2YXRlLmgKQEAgLTI2LDggKzI2LDM4IEBACiAjaWZuZGVmIGV3a19mb3JtX3N1 Ym1pc3Npb25fcmVxdWVzdF9wcml2YXRlX2gKICNkZWZpbmUgZXdrX2Zvcm1fc3VibWlzc2lvbl9y ZXF1ZXN0X3ByaXZhdGVfaAogCisjaW5jbHVkZSAiV0tEaWN0aW9uYXJ5LmgiCisjaW5jbHVkZSAi V0tGb3JtU3VibWlzc2lvbkxpc3RlbmVyLmgiCisjaW5jbHVkZSAiV0tSZXRhaW5QdHIuaCIKKyNp bmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CisK IHR5cGVkZWYgc3RydWN0IF9Fd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QgRXdrX0Zvcm1fU3Vi bWlzc2lvbl9SZXF1ZXN0OwogCi1Fd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QqIGV3a19mb3Jt X3N1Ym1pc3Npb25fcmVxdWVzdF9uZXcoV0tEaWN0aW9uYXJ5UmVmIHZhbHVlcywgV0tGb3JtU3Vi bWlzc2lvbkxpc3RlbmVyUmVmKTsKK2NsYXNzIF9Fd2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3Qg OiBwdWJsaWMgUmVmQ291bnRlZDxfRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0PiB7CitwdWJs aWM6CisgICAgV0tSZXRhaW5QdHI8V0tEaWN0aW9uYXJ5UmVmPiB3a1ZhbHVlczsKKyAgICBXS1Jl dGFpblB0cjxXS0Zvcm1TdWJtaXNzaW9uTGlzdGVuZXJSZWY+IHdrTGlzdGVuZXI7CisgICAgYm9v bCBoYW5kbGVkUmVxdWVzdDsKKworICAgIH5fRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KCkK KyAgICB7CisgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGUgcmVxdWVzdCBpcyBhbHdheXMgaGFuZGxl ZCBiZWZvcmUgZGVzdHJveWluZy4KKyAgICAgICAgaWYgKCFoYW5kbGVkUmVxdWVzdCkKKyAgICAg ICAgICAgIFdLRm9ybVN1Ym1pc3Npb25MaXN0ZW5lckNvbnRpbnVlKHdrTGlzdGVuZXIuZ2V0KCkp OworICAgIH0KKworICAgIHN0YXRpYyBQYXNzUmVmUHRyPF9Fd2tfRm9ybV9TdWJtaXNzaW9uX1Jl cXVlc3Q+IGNyZWF0ZShXS0RpY3Rpb25hcnlSZWYgdmFsdWVzLCBXS0Zvcm1TdWJtaXNzaW9uTGlz dGVuZXJSZWYgbGlzdGVuZXIpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IF9F d2tfRm9ybV9TdWJtaXNzaW9uX1JlcXVlc3QodmFsdWVzLCBsaXN0ZW5lcikpOworICAgIH0KKwor cHJpdmF0ZToKKyAgICBfRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0KFdLRGljdGlvbmFyeVJl ZiB2YWx1ZXMsIFdLRm9ybVN1Ym1pc3Npb25MaXN0ZW5lclJlZiBsaXN0ZW5lcikKKyAgICAgICAg OiB3a1ZhbHVlcyh2YWx1ZXMpCisgICAgICAgICwgd2tMaXN0ZW5lcihsaXN0ZW5lcikKKyAgICAg ICAgLCBoYW5kbGVkUmVxdWVzdChmYWxzZSkKKyAgICB7IH0KK307CiAKICNlbmRpZiAvLyBld2tf Zm9ybV9zdWJtaXNzaW9uX3JlcXVlc3RfcHJpdmF0ZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Jlc291cmNlLmNwcAppbmRleCBhYWE3ZTk4Li43MTRhNDg5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcmVzb3Vy Y2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19yZXNvdXJj ZS5jcHAKQEAgLTI2LDMyICsyNiwxNCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg ImV3a19yZXNvdXJjZS5oIgogCi0jaW5jbHVkZSAiV0tFaW5hU2hhcmVkU3RyaW5nLmgiCiAjaW5j bHVkZSAiZXdrX3Jlc291cmNlX3ByaXZhdGUuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAKLXN0cnVjdCBfRXdrX1Jlc291cmNlIHsKLSAgICB1bnNpZ25lZCBfX3JlZjsgLyoqPCB0 aGUgcmVmZXJlbmNlIGNvdW50IG9mIHRoZSBvYmplY3QgKi8KLSAgICBXS0VpbmFTaGFyZWRTdHJp bmcgdXJsOwotICAgIGJvb2wgaXNNYWluUmVzb3VyY2U7Ci0KLSAgICBfRXdrX1Jlc291cmNlKGNv bnN0IGNoYXIqIHVybCwgYm9vbCBpc01haW5SZXNvdXJjZSkKLSAgICAgICAgOiBfX3JlZigxKQot ICAgICAgICAsIHVybCh1cmwpCi0gICAgICAgICwgaXNNYWluUmVzb3VyY2UoaXNNYWluUmVzb3Vy Y2UpCi0gICAgeyB9Ci0KLSAgICB+X0V3a19SZXNvdXJjZSgpCi0gICAgewotICAgICAgICBBU1NF UlQoIV9fcmVmKTsKLSAgICB9Ci19OwotCiBFd2tfUmVzb3VyY2UqIGV3a19yZXNvdXJjZV9yZWYo RXdrX1Jlc291cmNlKiByZXNvdXJjZSkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVS Tl9WQUwocmVzb3VyY2UsIDApOwogCi0gICAgKytyZXNvdXJjZS0+X19yZWY7CisgICAgcmVzb3Vy Y2UtPnJlZigpOwogCiAgICAgcmV0dXJuIHJlc291cmNlOwogfQpAQCAtNjAsMTAgKzQyLDcgQEAg dm9pZCBld2tfcmVzb3VyY2VfdW5yZWYoRXdrX1Jlc291cmNlKiByZXNvdXJjZSkKIHsKICAgICBF SU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihyZXNvdXJjZSk7CiAKLSAgICBpZiAoLS1yZXNvdXJj ZS0+X19yZWYpCi0gICAgICAgIHJldHVybjsKLQotICAgIGRlbGV0ZSByZXNvdXJjZTsKKyAgICBy ZXNvdXJjZS0+ZGVyZWYoKTsKIH0KIAogY29uc3QgY2hhciogZXdrX3Jlc291cmNlX3VybF9nZXQo Y29uc3QgRXdrX1Jlc291cmNlKiByZXNvdXJjZSkKQEAgLTczLDE3ICs1Miw2IEBAIGNvbnN0IGNo YXIqIGV3a19yZXNvdXJjZV91cmxfZ2V0KGNvbnN0IEV3a19SZXNvdXJjZSogcmVzb3VyY2UpCiAg ICAgcmV0dXJuIHJlc291cmNlLT51cmw7CiB9CiAKLS8qKgotICogQGludGVybmFsCi0gKiBDb25z dHJ1Y3RzIGEgRXdrX1Jlc291cmNlLgotICovCi1Fd2tfUmVzb3VyY2UqIGV3a19yZXNvdXJjZV9u ZXcoY29uc3QgY2hhciogdXJsLCBib29sIGlzTWFpblJlc291cmNlKQotewotICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOX1ZBTCh1cmwsIDApOwotCi0gICAgcmV0dXJuIG5ldyBFd2tfUmVz b3VyY2UodXJsLCBpc01haW5SZXNvdXJjZSk7Ci19Ci0KIEVpbmFfQm9vbCBld2tfcmVzb3VyY2Vf bWFpbl9yZXNvdXJjZV9nZXQoY29uc3QgRXdrX1Jlc291cmNlKiByZXNvdXJjZSkKIHsKICAgICBF SU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwocmVzb3VyY2UsIGZhbHNlKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19yZXNvdXJjZV9wcml2YXRl LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcmVzb3VyY2VfcHJpdmF0 ZS5oCmluZGV4IDRmZDRjZmQuLmQ4NmQ2N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19yZXNvdXJjZV9wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Jlc291cmNlX3ByaXZhdGUuaApAQCAtMjYsOCArMjYs MzAgQEAKICNpZm5kZWYgZXdrX3Jlc291cmNlX3ByaXZhdGVfaAogI2RlZmluZSBld2tfcmVzb3Vy Y2VfcHJpdmF0ZV9oCiAKKyNpbmNsdWRlICJXS0VpbmFTaGFyZWRTdHJpbmcuaCIKKyNpbmNsdWRl ICJXS1VSTC5oIgorI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Jl ZkNvdW50ZWQuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CisjaW5jbHVkZSA8d3Rm L3RleHQvV1RGU3RyaW5nLmg+CisKIHR5cGVkZWYgc3RydWN0IF9Fd2tfUmVzb3VyY2UgRXdrX1Jl c291cmNlOwogCi1Fd2tfUmVzb3VyY2UqIGV3a19yZXNvdXJjZV9uZXcoY29uc3QgY2hhciogdXJs LCBib29sIGlzTWFpblJlc291cmNlKTsKK2NsYXNzIF9Fd2tfUmVzb3VyY2UgOiBwdWJsaWMgUmVm Q291bnRlZDxfRXdrX1Jlc291cmNlPiB7CitwdWJsaWM6CisgICAgV0tFaW5hU2hhcmVkU3RyaW5n IHVybDsKKyAgICBib29sIGlzTWFpblJlc291cmNlOworCisgICAgc3RhdGljIFBhc3NSZWZQdHI8 X0V3a19SZXNvdXJjZT4gY3JlYXRlKFdLVVJMUmVmIHVybCwgYm9vbCBpc01haW5SZXNvdXJjZSkK KyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgX0V3a19SZXNvdXJjZSh1cmwsIGlz TWFpblJlc291cmNlKSk7CisgICAgfQorCitwcml2YXRlOgorICAgIF9Fd2tfUmVzb3VyY2UoV0tV UkxSZWYgdXJsLCBib29sIGlzTWFpblJlc291cmNlKQorICAgICAgICA6IHVybCh1cmwpCisgICAg ICAgICwgaXNNYWluUmVzb3VyY2UoaXNNYWluUmVzb3VyY2UpCisgICAgeyB9Cit9OwogCiAjZW5k aWYgLy8gZXdrX3Jlc291cmNlX3ByaXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDRlNzFkODguLjY5NGEwZGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTQ1LDYgKzQ1LDcg QEAKICNpbmNsdWRlICJld2tfcG9wdXBfbWVudV9pdGVtX3ByaXZhdGUuaCIKICNpbmNsdWRlICJl d2tfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19yZXNvdXJjZS5oIgorI2luY2x1ZGUgImV3a19y ZXNvdXJjZV9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX3NldHRpbmdzX3ByaXZhdGUuaCIKICNp bmNsdWRlICJld2tfdmlld19maW5kX2NsaWVudF9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX3Zp ZXdfZm9ybV9jbGllbnRfcHJpdmF0ZS5oIgpAQCAtODMsOCArODQsNyBAQCBzdGF0aWMgY29uc3Qg Y2hhciBFV0tfVklFV19UWVBFX1NUUltdID0gIkVXSzJfVmlldyI7CiAKIHN0YXRpYyBjb25zdCBp bnQgZGVmYXVsdEN1cnNvclNpemUgPSAxNjsKIAotdHlwZWRlZiBIYXNoTWFwPHVpbnQ2NF90LCBF d2tfUmVzb3VyY2UqPiBMb2FkaW5nUmVzb3VyY2VzTWFwOwotc3RhdGljIHZvaWQgX2V3a192aWV3 X3ByaXZfbG9hZGluZ19yZXNvdXJjZXNfY2xlYXIoTG9hZGluZ1Jlc291cmNlc01hcCYgbG9hZGlu Z1Jlc291cmNlc01hcCk7Cit0eXBlZGVmIEhhc2hNYXA8IHVpbnQ2NF90LCBSZWZQdHI8RXdrX1Jl c291cmNlPiA+IExvYWRpbmdSZXNvdXJjZXNNYXA7CiBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfb25f ZmF2aWNvbl9jaGFuZ2VkKGNvbnN0IGNoYXIqIHBhZ2VVUkwsIHZvaWQqIGV2ZW50SW5mbyk7CiAK IHR5cGVkZWYgSGFzaE1hcDxjb25zdCBXZWJQYWdlUHJveHkqLCBjb25zdCBFdmFzX09iamVjdCo+ IFBhZ2VWaWV3TWFwOwpAQCAtMTcxLDggKzE3MSw2IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJpdmF0 ZV9EYXRhIHsKIAogICAgIH5fRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKCkKICAgICB7Ci0gICAgICAg IF9ld2tfdmlld19wcml2X2xvYWRpbmdfcmVzb3VyY2VzX2NsZWFyKGxvYWRpbmdSZXNvdXJjZXNN YXApOwotCiAgICAgICAgIC8qIFVucmVnaXN0ZXIgaWNvbiBjaGFuZ2UgY2FsbGJhY2sgKi8KICAg ICAgICAgRXdrX0Zhdmljb25fRGF0YWJhc2UqIGljb25EYXRhYmFzZSA9IGV3a19jb250ZXh0X2Zh dmljb25fZGF0YWJhc2VfZ2V0KGNvbnRleHQpOwogICAgICAgICBld2tfZmF2aWNvbl9kYXRhYmFz ZV9pY29uX2NoYW5nZV9jYWxsYmFja19kZWwoaWNvbkRhdGFiYXNlLCBfZXdrX3ZpZXdfb25fZmF2 aWNvbl9jaGFuZ2VkKTsKQEAgLTQ4MywxNyArNDgxLDYgQEAgc3RhdGljIEV3a19WaWV3X1ByaXZh dGVfRGF0YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0 YSkKICAgICByZXR1cm4gcHJpdjsKIH0KIAotc3RhdGljIHZvaWQgX2V3a192aWV3X3ByaXZfbG9h ZGluZ19yZXNvdXJjZXNfY2xlYXIoTG9hZGluZ1Jlc291cmNlc01hcCYgbG9hZGluZ1Jlc291cmNl c01hcCkKLXsKLSAgICAvLyBDbGVhciB0aGUgbG9hZGluZ1Jlc291cmNlcyBIYXNoTWFwLgotICAg IExvYWRpbmdSZXNvdXJjZXNNYXA6Oml0ZXJhdG9yIGl0ID0gbG9hZGluZ1Jlc291cmNlc01hcC5i ZWdpbigpOwotICAgIExvYWRpbmdSZXNvdXJjZXNNYXA6Oml0ZXJhdG9yIGVuZCA9IGxvYWRpbmdS ZXNvdXJjZXNNYXAuZW5kKCk7Ci0gICAgZm9yICggOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAg IGV3a19yZXNvdXJjZV91bnJlZihpdC0+dmFsdWUpOwotCi0gICAgbG9hZGluZ1Jlc291cmNlc01h cC5jbGVhcigpOwotfQotCiBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfcHJpdl9kZWwoRXdrX1ZpZXdf UHJpdmF0ZV9EYXRhKiBwcml2KQogewogICAgIGV3a19jb250ZXh0X3VucmVmKHByaXYtPmNvbnRl eHQpOwpAQCAtMTA0Myw3ICsxMDMwLDcgQEAgdm9pZCBld2tfdmlld19yZXNvdXJjZV9sb2FkX2lu aXRpYXRlZChFdmFzX09iamVjdCogZXdrVmlldywgdWludDY0X3QgcmVzb3VyY2VJZGUKICAgICBF d2tfUmVzb3VyY2VfUmVxdWVzdCByZXNvdXJjZVJlcXVlc3QgPSB7cmVzb3VyY2UsIHJlcXVlc3Qs IDB9OwogCiAgICAgLy8gS2VlcCB0aGUgcmVzb3VyY2UgaW50ZXJuYWxseSB0byByZXVzZSBpdCBs YXRlci4KLSAgICBwcml2LT5sb2FkaW5nUmVzb3VyY2VzTWFwLmFkZChyZXNvdXJjZUlkZW50aWZp ZXIsIGV3a19yZXNvdXJjZV9yZWYocmVzb3VyY2UpKTsKKyAgICBwcml2LT5sb2FkaW5nUmVzb3Vy Y2VzTWFwLmFkZChyZXNvdXJjZUlkZW50aWZpZXIsIHJlc291cmNlKTsKIAogICAgIGV2YXNfb2Jq ZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInJlc291cmNlLHJlcXVlc3QsbmV3Iiwg JnJlc291cmNlUmVxdWVzdCk7CiB9CkBAIC0xMDYyLDggKzEwNDksOCBAQCB2b2lkIGV3a192aWV3 X3Jlc291cmNlX2xvYWRfcmVzcG9uc2UoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHVpbnQ2NF90IHJl c291cmNlSWRlbgogICAgIGlmICghcHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5jb250YWlucyhy ZXNvdXJjZUlkZW50aWZpZXIpKQogICAgICAgICByZXR1cm47CiAKLSAgICBFd2tfUmVzb3VyY2Uq IHJlc291cmNlID0gcHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5nZXQocmVzb3VyY2VJZGVudGlm aWVyKTsKLSAgICBFd2tfUmVzb3VyY2VfTG9hZF9SZXNwb25zZSByZXNvdXJjZUxvYWRSZXNwb25z ZSA9IHtyZXNvdXJjZSwgcmVzcG9uc2V9OworICAgIFJlZlB0cjxFd2tfUmVzb3VyY2U+IHJlc291 cmNlID0gcHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5nZXQocmVzb3VyY2VJZGVudGlmaWVyKTsK KyAgICBFd2tfUmVzb3VyY2VfTG9hZF9SZXNwb25zZSByZXNvdXJjZUxvYWRSZXNwb25zZSA9IHty ZXNvdXJjZS5nZXQoKSwgcmVzcG9uc2V9OwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2NhbGwoZXdrVmlldywgInJlc291cmNlLHJlcXVlc3QscmVzcG9uc2UiLCAmcmVzb3VyY2VMb2Fk UmVzcG9uc2UpOwogfQogCkBAIC0xMDgxLDggKzEwNjgsOCBAQCB2b2lkIGV3a192aWV3X3Jlc291 cmNlX2xvYWRfZmFpbGVkKEV2YXNfT2JqZWN0KiBld2tWaWV3LCB1aW50NjRfdCByZXNvdXJjZUlk ZW50aQogICAgIGlmICghcHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5jb250YWlucyhyZXNvdXJj ZUlkZW50aWZpZXIpKQogICAgICAgICByZXR1cm47CiAKLSAgICBFd2tfUmVzb3VyY2UqIHJlc291 cmNlID0gcHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcC5nZXQocmVzb3VyY2VJZGVudGlmaWVyKTsK LSAgICBFd2tfUmVzb3VyY2VfTG9hZF9FcnJvciByZXNvdXJjZUxvYWRFcnJvciA9IHtyZXNvdXJj ZSwgZXJyb3J9OworICAgIFJlZlB0cjxFd2tfUmVzb3VyY2U+IHJlc291cmNlID0gcHJpdi0+bG9h ZGluZ1Jlc291cmNlc01hcC5nZXQocmVzb3VyY2VJZGVudGlmaWVyKTsKKyAgICBFd2tfUmVzb3Vy Y2VfTG9hZF9FcnJvciByZXNvdXJjZUxvYWRFcnJvciA9IHtyZXNvdXJjZS5nZXQoKSwgZXJyb3J9 OwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmlldywgInJlc291cmNl LHJlcXVlc3QsZmFpbGVkIiwgJnJlc291cmNlTG9hZEVycm9yKTsKIH0KIApAQCAtMTEwMCwxMCAr MTA4Nyw4IEBAIHZvaWQgZXdrX3ZpZXdfcmVzb3VyY2VfbG9hZF9maW5pc2hlZChFdmFzX09iamVj dCogZXdrVmlldywgdWludDY0X3QgcmVzb3VyY2VJZGVuCiAgICAgaWYgKCFwcml2LT5sb2FkaW5n UmVzb3VyY2VzTWFwLmNvbnRhaW5zKHJlc291cmNlSWRlbnRpZmllcikpCiAgICAgICAgIHJldHVy bjsKIAotICAgIEV3a19SZXNvdXJjZSogcmVzb3VyY2UgPSBwcml2LT5sb2FkaW5nUmVzb3VyY2Vz TWFwLnRha2UocmVzb3VyY2VJZGVudGlmaWVyKTsKLSAgICBldmFzX29iamVjdF9zbWFydF9jYWxs YmFja19jYWxsKGV3a1ZpZXcsICJyZXNvdXJjZSxyZXF1ZXN0LGZpbmlzaGVkIiwgcmVzb3VyY2Up OwotCi0gICAgZXdrX3Jlc291cmNlX3VucmVmKHJlc291cmNlKTsKKyAgICBSZWZQdHI8RXdrX1Jl c291cmNlPiByZXNvdXJjZSA9IHByaXYtPmxvYWRpbmdSZXNvdXJjZXNNYXAudGFrZShyZXNvdXJj ZUlkZW50aWZpZXIpOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwoZXdrVmll dywgInJlc291cmNlLHJlcXVlc3QsZmluaXNoZWQiLCByZXNvdXJjZS5nZXQoKSk7CiB9CiAKIC8q KgpAQCAtMTEyMCw4ICsxMTA1LDggQEAgdm9pZCBld2tfdmlld19yZXNvdXJjZV9yZXF1ZXN0X3Nl bnQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHVpbnQ2NF90IHJlc291cmNlSWRlbnQKICAgICBpZiAo IXByaXYtPmxvYWRpbmdSZXNvdXJjZXNNYXAuY29udGFpbnMocmVzb3VyY2VJZGVudGlmaWVyKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgRXdrX1Jlc291cmNlKiByZXNvdXJjZSA9IHByaXYtPmxv YWRpbmdSZXNvdXJjZXNNYXAuZ2V0KHJlc291cmNlSWRlbnRpZmllcik7Ci0gICAgRXdrX1Jlc291 cmNlX1JlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0ID0ge3Jlc291cmNlLCByZXF1ZXN0LCByZWRpcmVj dFJlc3BvbnNlfTsKKyAgICBSZWZQdHI8RXdrX1Jlc291cmNlPiByZXNvdXJjZSA9IHByaXYtPmxv YWRpbmdSZXNvdXJjZXNNYXAuZ2V0KHJlc291cmNlSWRlbnRpZmllcik7CisgICAgRXdrX1Jlc291 cmNlX1JlcXVlc3QgcmVzb3VyY2VSZXF1ZXN0ID0ge3Jlc291cmNlLmdldCgpLCByZXF1ZXN0LCBy ZWRpcmVjdFJlc3BvbnNlfTsKIAogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwo ZXdrVmlldywgInJlc291cmNlLHJlcXVlc3Qsc2VudCIsICZyZXNvdXJjZVJlcXVlc3QpOwogfQpA QCAtMTU2NSw3ICsxNTUwLDcgQEAgdm9pZCBld2tfdmlld19sb2FkX3Byb3Zpc2lvbmFsX3N0YXJ0 ZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAKICAgICAvLyBUaGUgbWFpbiBmcmFtZSBzdGFydGVk IHByb3Zpc2lvbmFsIGxvYWQsIHdlIHNob3VsZCBjbGVhcgogICAgIC8vIHRoZSBsb2FkaW5nUmVz b3VyY2VzIEhhc2hNYXAgdG8gc3RhcnQgY2xlYW4uCi0gICAgX2V3a192aWV3X3ByaXZfbG9hZGlu Z19yZXNvdXJjZXNfY2xlYXIocHJpdi0+bG9hZGluZ1Jlc291cmNlc01hcCk7CisgICAgcHJpdi0+ bG9hZGluZ1Jlc291cmNlc01hcC5jbGVhcigpOwogCiAgICAgZXdrX3ZpZXdfdXJsX3VwZGF0ZShl d2tWaWV3KTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGV3a1ZpZXcsICJs b2FkLHByb3Zpc2lvbmFsLHN0YXJ0ZWQiLCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2Zvcm1fY2xpZW50LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2Zvcm1fY2xpZW50LmNwcAppbmRleCAzN2Nj OWJmLi43NTA5ZWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlld19mb3JtX2NsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXdfZm9ybV9jbGllbnQuY3BwCkBAIC0zNSw5ICszNSw4IEBAIHN0YXRp YyB2b2lkIHdpbGxTdWJtaXRGb3JtKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiAvKmZyYW1lKi8sIFdL RnJhbWVSZWYgLypzb3VyY2VGCiB7CiAgICAgRXZhc19PYmplY3QqIGV3a1ZpZXcgPSBzdGF0aWNf Y2FzdDxFdmFzX09iamVjdCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKIAotICAg IEV3a19Gb3JtX1N1Ym1pc3Npb25fUmVxdWVzdCogcmVxdWVzdCA9IGV3a19mb3JtX3N1Ym1pc3Np b25fcmVxdWVzdF9uZXcodmFsdWVzLCBsaXN0ZW5lcik7Ci0gICAgZXdrX3ZpZXdfZm9ybV9zdWJt aXNzaW9uX3JlcXVlc3RfbmV3KGV3a1ZpZXcsIHJlcXVlc3QpOwotICAgIGV3a19mb3JtX3N1Ym1p c3Npb25fcmVxdWVzdF91bnJlZihyZXF1ZXN0KTsKKyAgICBSZWZQdHI8RXdrX0Zvcm1fU3VibWlz c2lvbl9SZXF1ZXN0PiByZXF1ZXN0ID0gRXdrX0Zvcm1fU3VibWlzc2lvbl9SZXF1ZXN0OjpjcmVh dGUodmFsdWVzLCBsaXN0ZW5lcik7CisgICAgZXdrX3ZpZXdfZm9ybV9zdWJtaXNzaW9uX3JlcXVl c3RfbmV3KGV3a1ZpZXcsIHJlcXVlc3QuZ2V0KCkpOwogfQogCiB2b2lkIGV3a192aWV3X2Zvcm1f Y2xpZW50X2F0dGFjaChXS1BhZ2VSZWYgcGFnZVJlZiwgRXZhc19PYmplY3QqIGV3a1ZpZXcpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19yZXNv dXJjZV9sb2FkX2NsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlld19yZXNvdXJjZV9sb2FkX2NsaWVudC5jcHAKaW5kZXggZWE5NmQyNS4uZmU0MjFlZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcmVz b3VyY2VfbG9hZF9jbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3X3Jlc291cmNlX2xvYWRfY2xpZW50LmNwcApAQCAtNTYsMTAgKzU2LDkgQEAg c3RhdGljIHZvaWQgZGlkSW5pdGlhdGVMb2FkRm9yUmVzb3VyY2UoV0tQYWdlUmVmLCBXS0ZyYW1l UmVmIHdrRnJhbWUsIHVpbnQ2NF90IHIKICAgICBib29sIGlzTWFpblJlc291cmNlID0gKFdLRnJh bWVJc01haW5GcmFtZSh3a0ZyYW1lKSAmJiBwYWdlSXNQcm92aXNpb25hbGx5TG9hZGluZyk7CiAg ICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHdrVXJsKEFkb3B0V0ssIFdLVVJMUmVxdWVzdENvcHlV Ukwod2tSZXF1ZXN0KSk7CiAKLSAgICBFd2tfUmVzb3VyY2UqIHJlc291cmNlID0gZXdrX3Jlc291 cmNlX25ldyh0b0ltcGwod2tVcmwuZ2V0KCkpLT5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBpc01h aW5SZXNvdXJjZSk7CisgICAgUmVmUHRyPEV3a19SZXNvdXJjZT4gcmVzb3VyY2UgPSBFd2tfUmVz b3VyY2U6OmNyZWF0ZSh3a1VybC5nZXQoKSwgaXNNYWluUmVzb3VyY2UpOwogICAgIFJlZlB0cjxF d2tfVXJsX1JlcXVlc3Q+IHJlcXVlc3QgPSBFd2tfVXJsX1JlcXVlc3Q6OmNyZWF0ZSh3a1JlcXVl c3QpOwotICAgIGV3a192aWV3X3Jlc291cmNlX2xvYWRfaW5pdGlhdGVkKHRvRXdrVmlldyhjbGll bnRJbmZvKSwgcmVzb3VyY2VJZGVudGlmaWVyLCByZXNvdXJjZSwgcmVxdWVzdC5nZXQoKSk7Ci0g ICAgZXdrX3Jlc291cmNlX3VucmVmKHJlc291cmNlKTsKKyAgICBld2tfdmlld19yZXNvdXJjZV9s b2FkX2luaXRpYXRlZCh0b0V3a1ZpZXcoY2xpZW50SW5mbyksIHJlc291cmNlSWRlbnRpZmllciwg cmVzb3VyY2UuZ2V0KCksIHJlcXVlc3QuZ2V0KCkpOwogfQogCiBzdGF0aWMgdm9pZCBkaWRTZW5k UmVxdWVzdEZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgdWludDY0X3QgcmVzb3Vy Y2VJZGVudGlmaWVyLCBXS1VSTFJlcXVlc3RSZWYgd2tSZXF1ZXN0LCBXS1VSTFJlc3BvbnNlUmVm IHdrUmVkaXJlY3RSZXNwb25zZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykK