110190 2013-02-19 01:15:42 -0800 [GTK] Move the API to get TLS certificate from WebKitURIResponse to WebKitWebView 2013-02-19 08:52:32 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 109287 1 cgarcia webkit-unassigned andersca danw gustavo gyuyoung.kim mrobinson rakuco sam webkit.review.bot xan.lopez oldest_to_newest 836107 0 cgarcia 2013-02-19 01:15:42 -0800 Current API is problematic, and having the method directly in the web view makes the API more convenient to use. 836110 1 189019 cgarcia 2013-02-19 01:19:31 -0800 Created attachment 189019 Patch 836112 2 webkit.review.bot 2013-02-19 01:22:03 -0800 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 836246 3 189019 gustavo 2013-02-19 04:48:22 -0800 Comment on attachment 189019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189019&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:2907 > + * from the server, or %FALSE otherwise. I believe you can drop this 'or', it's made redundant by 'otherwise'. 836263 4 cgarcia 2013-02-19 05:12:54 -0800 (In reply to comment #3) > (From update of attachment 189019 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189019&action=review Thanks for the review, but remember this has to be r+'ed by an owner. > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:2907 > > + * from the server, or %FALSE otherwise. > > I believe you can drop this 'or', it's made redundant by 'otherwise'. I think martin insisted in adding that 'or', but I'm not sure, I'm not English expert :-P 836411 5 189019 gustavo 2013-02-19 08:20:52 -0800 Comment on attachment 189019 Patch I just remembered/realized this needs to be looked at by an OWNER, but it looks good to me from a purely GTK+ perspective. 836413 6 189019 mrobinson 2013-02-19 08:23:06 -0800 Comment on attachment 189019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189019&action=review Looks good to me as well. This will need an owner's review. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:2896 > + * @certificate: (out) (transfer none): return location for a #GTlsCertificate > + * @errors: (out): return location for a #GTlsCertificateFlags the verification status of @certificate Is there an equivalent to "allow none" for out parameters or is it just assumed? >>> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:2907 >>> + * from the server, or %FALSE otherwise. >> >> I believe you can drop this 'or', it's made redundant by 'otherwise'. > > I think martin insisted in adding that 'or', but I'm not sure, I'm not English expert :-P I think the 'or' is fine. > Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp:51 > GTlsCertificate* certificate = 0; > - webkit_uri_response_get_https_status(response, &certificate, &m_tlsErrors); > + webkit_web_view_get_tls_info(m_webView, &certificate, &m_tlsErrors); > m_certificate = certificate; Why not just use &m_certificate here? 836418 7 cgarcia 2013-02-19 08:27:17 -0800 (In reply to comment #6) > (From update of attachment 189019 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189019&action=review > > Looks good to me as well. This will need an owner's review. > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:2896 > > + * @certificate: (out) (transfer none): return location for a #GTlsCertificate > > + * @errors: (out): return location for a #GTlsCertificateFlags the verification status of @certificate > > Is there an equivalent to "allow none" for out parameters or is it just assumed? It's assumed. > >>> Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:2907 > >>> + * from the server, or %FALSE otherwise. > >> > >> I believe you can drop this 'or', it's made redundant by 'otherwise'. > > > > I think martin insisted in adding that 'or', but I'm not sure, I'm not English expert :-P > > I think the 'or' is fine. > > > Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp:51 > > GTlsCertificate* certificate = 0; > > - webkit_uri_response_get_https_status(response, &certificate, &m_tlsErrors); > > + webkit_web_view_get_tls_info(m_webView, &certificate, &m_tlsErrors); > > m_certificate = certificate; > > Why not just use &m_certificate here? Is that possible with a GRefPtr? 836422 8 189019 mrobinson 2013-02-19 08:31:15 -0800 Comment on attachment 189019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189019&action=review >> Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp:51 >> m_certificate = certificate; > > Why not just use &m_certificate here? Ah! Nope. Only with GOwnPtr currently. 836445 9 cgarcia 2013-02-19 08:52:32 -0800 Committed r143341: <http://trac.webkit.org/changeset/143341> 189019 2013-02-19 01:19:31 -0800 2013-02-19 08:45:26 -0800 Patch wk2-tls-info.diff text/plain 11401 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2ZDFiYmYxLi5hZDBlNTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTMtMDItMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIE1vdmUgdGhlIEFQSSB0byBnZXQgVExTIGNlcnRpZmljYXRlIGZy b20gV2ViS2l0VVJJUmVzcG9uc2UgdG8gV2ViS2l0V2ViVmlldworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMTkwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHdlYmtpdF93ZWJfdmlld19nZXRfdGxz X2luZm8oKSBhbmQgcmVtb3ZlCisgICAgICAgIHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X2h0dHBz X3N0YXR1cygpLiBUaGlzIHdheSBJIGNhbiBiZSBzdXJlCisgICAgICAgIHRoYXQgd2hlbiBjYWxs ZWQgYWZ0ZXIgbG9hZCBoYXMgYmVlbiBjb21taXR0ZWQgdGhlIGNlcnRpZmljYXRlCisgICAgICAg IHdpbGwgYmUgYXZhaWxhYmxlLiBJdCBhbHNvIG1ha2VzIHRoZSBBUEkgZWFzaWVyIHRvIHVzZS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlc3BvbnNlLmNwcDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXNwb25zZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlc3BvbnNlUHJpdmF0ZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwOgorICAgICAgICAod2Via2l0V2Vi Vmlld0xvYWRDaGFuZ2VkKToKKyAgICAgICAgKG1haW5SZXNvdXJjZVJlc3BvbnNlQ2hhbmdlZENh bGxiYWNrKToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfdGxzX2luZm8pOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0OgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RTU0wuY3BwOgorCiAyMDEzLTAyLTE4ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUg d2Via2l0X3dlYl92aWV3X2dldF9zdWJyZXNvdXJjZXMgZnJvbSBXZWJLaXQyIEdUSysgQVBJCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXNw b25zZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXNw b25zZS5jcHAKaW5kZXggNGEzNTZmMi4uMjBhYjI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJUmVzcG9uc2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVJlc3BvbnNlLmNwcApAQCAtMjAsOCAr MjAsNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdFVSSVJlc3BvbnNl LmgiCiAKLSNpbmNsdWRlICJQbGF0Zm9ybUNlcnRpZmljYXRlSW5mby5oIgotI2luY2x1ZGUgIldl YkNlcnRpZmljYXRlSW5mby5oIgogI2luY2x1ZGUgIldlYktpdFByaXZhdGUuaCIKICNpbmNsdWRl ICJXZWJLaXRVUklSZXNwb25zZVByaXZhdGUuaCIKICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5o PgpAQCAtMjE4LDMxICsyMTYsNiBAQCBjb25zdCBnY2hhciogd2Via2l0X3VyaV9yZXNwb25zZV9n ZXRfbWltZV90eXBlKFdlYktpdFVSSVJlc3BvbnNlKiByZXNwb25zZSkKIH0KIAogLyoqCi0gKiB3 ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9odHRwc19zdGF0dXM6Ci0gKiBAcmVzcG9uc2U6IGEgI1dl YktpdFVSSVJlc3BvbnNlCi0gKiBAY2VydGlmaWNhdGU6IChvdXQpICh0cmFuc2ZlciBub25lKTog cmV0dXJuIGxvY2F0aW9uIGZvciBhICNHVGxzQ2VydGlmaWNhdGUKLSAqIEBlcnJvcnM6IChvdXQp OiByZXR1cm4gbG9jYXRpb24gZm9yIGEgI0dUbHNDZXJ0aWZpY2F0ZUZsYWdzIHRoZSB2ZXJpZmlj YXRpb24gc3RhdHVzIG9mIEBjZXJ0aWZpY2F0ZQotICoKLSAqIFJldHJpZXZlcyB0aGUgI0dUbHND ZXJ0aWZpY2F0ZSBhc3NvY2lhdGVkIHdpdGggdGhlIEByZXNwb25zZSBjb25uZWN0aW9uLAotICog YW5kIHRoZSAjR1Rsc0NlcnRpZmljYXRlRmxhZ3Mgc2hvd2luZyB3aGF0IHByb2JsZW1zLCBpZiBh bnksIGhhdmUgYmVlbiBmb3VuZAotICogd2l0aCB0aGF0IGNlcnRpZmljYXRlLgotICogSWYgdGhl IHJlc3BvbnNlIGNvbm5lY3Rpb24gaXMgbm90IEhUVFBTLCB0aGlzIGZ1bmN0aW9uIHJldHVybnMg JUZBTFNFLgotICoKLSAqIFJldHVybnM6ICVUUlVFIGlmIEByZXNwb25zZSBjb25uZWN0aW9uIHVz ZXMgSFRUUFMgb3IgJUZBTFNFIG90aGVyd2lzZS4KLSAqLwotZ2Jvb2xlYW4gd2Via2l0X3VyaV9y ZXNwb25zZV9nZXRfaHR0cHNfc3RhdHVzKFdlYktpdFVSSVJlc3BvbnNlKiByZXNwb25zZSwgR1Rs c0NlcnRpZmljYXRlKiogY2VydGlmaWNhdGUsIEdUbHNDZXJ0aWZpY2F0ZUZsYWdzKiBlcnJvcnMp Ci17Ci0gICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1VSSV9SRVNQT05TRShyZXNw b25zZSksIEZBTFNFKTsKLQotICAgIGlmIChjZXJ0aWZpY2F0ZSkKLSAgICAgICAgKmNlcnRpZmlj YXRlID0gcmVzcG9uc2UtPnByaXYtPnJlc291cmNlUmVzcG9uc2Uuc291cE1lc3NhZ2VDZXJ0aWZp Y2F0ZSgpOwotICAgIGlmIChlcnJvcnMpCi0gICAgICAgICplcnJvcnMgPSByZXNwb25zZS0+cHJp di0+cmVzb3VyY2VSZXNwb25zZS5zb3VwTWVzc2FnZVRMU0Vycm9ycygpOwotCi0gICAgcmV0dXJu ICEhcmVzcG9uc2UtPnByaXYtPnJlc291cmNlUmVzcG9uc2Uuc291cE1lc3NhZ2VDZXJ0aWZpY2F0 ZSgpOwotfQotCi0vKioKICAqIHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X3N1Z2dlc3RlZF9maWxl bmFtZToKICAqIEByZXNwb25zZTogYSAjV2ViS2l0VVJJUmVzcG9uc2UKICAqCkBAIC0yNzYsOSAr MjQ5LDMgQEAgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgd2Via2l0VVJJUmVzcG9u c2VHZXRSZXNvdXJjZVJlc3BvbnNlKFdlYktpdFVSSVIKICAgICByZXR1cm4gdXJpUmVzcG9uc2Ut PnByaXYtPnJlc291cmNlUmVzcG9uc2U7CiB9CiAKLXZvaWQgd2Via2l0VVJJUmVzcG9uc2VTZXRD ZXJ0aWZpY2F0ZUluZm8oV2ViS2l0VVJJUmVzcG9uc2UqIHJlc3BvbnNlLCBXZWJDZXJ0aWZpY2F0 ZUluZm8qIGNlcnRpZmljYXRlKQotewotICAgIGNvbnN0IFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZv JiBjZXJ0aWZpY2F0ZUluZm8gPSBjZXJ0aWZpY2F0ZS0+cGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8o KTsKLSAgICByZXNwb25zZS0+cHJpdi0+cmVzb3VyY2VSZXNwb25zZS5zZXRTb3VwTWVzc2FnZUNl cnRpZmljYXRlKGNlcnRpZmljYXRlSW5mby5jZXJ0aWZpY2F0ZSgpKTsKLSAgICByZXNwb25zZS0+ cHJpdi0+cmVzb3VyY2VSZXNwb25zZS5zZXRTb3VwTWVzc2FnZVRMU0Vycm9ycyhjZXJ0aWZpY2F0 ZUluZm8udGxzRXJyb3JzKCkpOwotfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0VVJJUmVzcG9uc2UuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFVSSVJlc3BvbnNlLmgKaW5kZXggZDkwY2Y0MS4uZjkyYmE0ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJUmVzcG9u c2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXNw b25zZS5oCkBAIC02NywxMCArNjcsNiBAQCB3ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9jb250ZW50 X2xlbmd0aCAgICAgKFdlYktpdFVSSVJlc3BvbnNlICAgICpyZXNwb25zZSk7CiBXRUJLSVRfQVBJ IGNvbnN0IGdjaGFyICoKIHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X21pbWVfdHlwZSAgICAgICAg ICAoV2ViS2l0VVJJUmVzcG9uc2UgICAgKnJlc3BvbnNlKTsKIAotV0VCS0lUX0FQSSBnYm9vbGVh bgotd2Via2l0X3VyaV9yZXNwb25zZV9nZXRfaHR0cHNfc3RhdHVzICAgICAgIChXZWJLaXRVUklS ZXNwb25zZSAgICAqcmVzcG9uc2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEdUbHNDZXJ0aWZpY2F0ZSAgICAgKipjZXJ0aWZpY2F0ZSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1Rsc0NlcnRpZmljYXRlRmxhZ3MgKmVy cm9ycyk7CiBXRUJLSVRfQVBJIGNvbnN0IGdjaGFyICoKIHdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0 X3N1Z2dlc3RlZF9maWxlbmFtZSAoV2ViS2l0VVJJUmVzcG9uc2UgICAgKnJlc3BvbnNlKTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJUmVz cG9uc2VQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRV UklSZXNwb25zZVByaXZhdGUuaAppbmRleCAxMGIwNDNkLi5jMmRjNDljIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXNwb25zZVByaXZhdGUu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklSZXNwb25z ZVByaXZhdGUuaApAQCAtMjYsMTIgKzI2LDEwIEBACiAjaWZuZGVmIFdlYktpdFVSSVJlc3BvbnNl UHJpdmF0ZV9oCiAjZGVmaW5lIFdlYktpdFVSSVJlc3BvbnNlUHJpdmF0ZV9oCiAKLSNpbmNsdWRl ICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRlICJXZWJLaXRVUklSZXNwb25zZS5oIgog I2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXNwb25zZS5oPgogCiBXZWJLaXRVUklSZXNwb25z ZSogd2Via2l0VVJJUmVzcG9uc2VDcmVhdGVGb3JSZXNvdXJjZVJlc3BvbnNlKGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2UmKTsKIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2Um IHdlYmtpdFVSSVJlc3BvbnNlR2V0UmVzb3VyY2VSZXNwb25zZShXZWJLaXRVUklSZXNwb25zZSop Owotdm9pZCB3ZWJraXRVUklSZXNwb25zZVNldENlcnRpZmljYXRlSW5mbyhXZWJLaXRVUklSZXNw b25zZSosIFdlYktpdDo6V2ViQ2VydGlmaWNhdGVJbmZvKik7CiAKICNlbmRpZiAvLyBXZWJLaXRV UklSZXNwb25zZVByaXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCA5MDUyM2QxLi4yMzIwZTFjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAt MjEsNiArMjEsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdFdlYlZp ZXcuaCIKIAorI2luY2x1ZGUgIlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmgiCisjaW5jbHVkZSAi V2ViQ2VydGlmaWNhdGVJbmZvLmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtLmgiCiAj aW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtRGF0YS5oIgogI2luY2x1ZGUgIldlYkRhdGEuaCIK QEAgLTEzMDgsMTUgKzEzMTAsNiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3U2V0SXNMb2Fk aW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGJvb2wgaXNMb2FkaW5nKQogICAgIGdfb2JqZWN0 X3RoYXdfbm90aWZ5KEdfT0JKRUNUKHdlYlZpZXcpKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0Q2Vy dGlmaWNhdGVUb01haW5SZXNvdXJjZShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQotewotICAgIFdl YktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKLSAgICBBU1NFUlQocHJp di0+bWFpblJlc291cmNlLmdldCgpKTsKLQotICAgIHdlYmtpdFVSSVJlc3BvbnNlU2V0Q2VydGlm aWNhdGVJbmZvKHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3Jlc3BvbnNlKHByaXYtPm1haW5SZXNv dXJjZS5nZXQoKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2Vi a2l0V2ViUmVzb3VyY2VHZXRGcmFtZShwcml2LT5tYWluUmVzb3VyY2UuZ2V0KCkpLT5jZXJ0aWZp Y2F0ZUluZm8oKSk7Ci19Ci0KIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdFbWl0TG9hZENoYW5n ZWQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0TG9hZEV2ZW50IGxvYWRFdmVudCkKIHsK ICAgICBpZiAobG9hZEV2ZW50ID09IFdFQktJVF9MT0FEX1NUQVJURUQpIHsKQEAgLTEzNjcsOCAr MTM2MCw3IEBAIHZvaWQgd2Via2l0V2ViVmlld0xvYWRDaGFuZ2VkKFdlYktpdFdlYlZpZXcqIHdl YlZpZXcsIFdlYktpdExvYWRFdmVudCBsb2FkRXZlbnQpCiAgICAgICAgICAgICAvLyBtYWluIHJl c291cmNlIGF2YWlsYWJsZSB3aGVuIGxvYWQgaGFzIGJlZW4gY29tbWl0dGVkLCBzbyB3ZSBkZWxh eSB0aGUgZW1pc3Npb24gb2YKICAgICAgICAgICAgIC8vIGxvYWQtY2hhbmdlZCBzaWduYWwgdW50 aWwgbWFpbiByZXNvdXJjZSBvYmplY3QgaGFzIGJlZW4gY3JlYXRlZC4KICAgICAgICAgICAgIHBy aXYtPndhaXRpbmdGb3JNYWluUmVzb3VyY2UgPSB0cnVlOwotICAgICAgICB9IGVsc2UKLSAgICAg ICAgICAgIHNldENlcnRpZmljYXRlVG9NYWluUmVzb3VyY2Uod2ViVmlldyk7CisgICAgICAgIH0K ICAgICB9CiAKICAgICBpZiAocHJpdi0+d2FpdGluZ0Zvck1haW5SZXNvdXJjZSkKQEAgLTE1Mjcs NyArMTUxOSw2IEBAIHZvaWQgd2Via2l0V2ViVmlld1ByaW50RnJhbWUoV2ViS2l0V2ViVmlldyog d2ViVmlldywgV2ViRnJhbWVQcm94eSogZnJhbWUpCiBzdGF0aWMgdm9pZCBtYWluUmVzb3VyY2VS ZXNwb25zZUNoYW5nZWRDYWxsYmFjayhXZWJLaXRXZWJSZXNvdXJjZSosIEdQYXJhbVNwZWMqLCBX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewogICAgIHdlYmtpdFdlYlZpZXdEaXNjb25uZWN0TWFp blJlc291cmNlUmVzcG9uc2VDaGFuZ2VkU2lnbmFsSGFuZGxlcih3ZWJWaWV3KTsKLSAgICBzZXRD ZXJ0aWZpY2F0ZVRvTWFpblJlc291cmNlKHdlYlZpZXcpOwogICAgIHdlYmtpdFdlYlZpZXdFbWl0 RGVsYXllZExvYWRFdmVudHMod2ViVmlldyk7CiB9CiAKQEAgLTI4OTcsMyArMjg4OCwzNyBAQCBX ZWJLaXRWaWV3TW9kZSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3ZpZXdfbW9kZShXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3KQogCiAgICAgcmV0dXJuIHdlYlZpZXctPnByaXYtPnZpZXdNb2RlOwogfQorCisv KioKKyAqIHdlYmtpdF93ZWJfdmlld19nZXRfdGxzX2luZm86CisgKiBAd2ViX3ZpZXc6IGEgI1dl YktpdFdlYlZpZXcKKyAqIEBjZXJ0aWZpY2F0ZTogKG91dCkgKHRyYW5zZmVyIG5vbmUpOiByZXR1 cm4gbG9jYXRpb24gZm9yIGEgI0dUbHNDZXJ0aWZpY2F0ZQorICogQGVycm9yczogKG91dCk6IHJl dHVybiBsb2NhdGlvbiBmb3IgYSAjR1Rsc0NlcnRpZmljYXRlRmxhZ3MgdGhlIHZlcmlmaWNhdGlv biBzdGF0dXMgb2YgQGNlcnRpZmljYXRlCisgKgorICogUmV0cmlldmVzIHRoZSAjR1Rsc0NlcnRp ZmljYXRlIGFzc29jaWF0ZWQgd2l0aCB0aGUgQHdlYl92aWV3IGNvbm5lY3Rpb24sCisgKiBhbmQg dGhlICNHVGxzQ2VydGlmaWNhdGVGbGFncyBzaG93aW5nIHdoYXQgcHJvYmxlbXMsIGlmIGFueSwg aGF2ZSBiZWVuIGZvdW5kCisgKiB3aXRoIHRoYXQgY2VydGlmaWNhdGUuCisgKiBJZiB0aGUgY29u bmVjdGlvbiBpcyBub3QgSFRUUFMsIHRoaXMgZnVuY3Rpb24gcmV0dXJucyAlRkFMU0UuCisgKiBU aGlzIGZ1bmN0aW9uIHNob3VsZCBiZSBjYWxsZWQgYWZ0ZXIgYSByZXNwb25zZSBoYXMgYmVlbiBy ZWNlaXZlZCBmcm9tIHRoZQorICogc2VydmVyLCBzbyB5b3UgY2FuIGNvbm5lY3QgdG8gI1dlYktp dFdlYlZpZXc6OmxvYWQtY2hhbmdlZCBhbmQgY2FsbCB0aGlzIGZ1bmN0aW9uCisgKiB3aGVuIGl0 J3MgZW1pdHRlZCB3aXRoICVXRUJLSVRfTE9BRF9DT01NSVRURUQgZXZlbnQuCisgKgorICogUmV0 dXJuczogJVRSVUUgaWYgdGhlIEB3ZWJfdmlldyBjb25uZWN0aW9uIHVzZXMgSFRUUFMgYW5kIGEg cmVzcG9uc2UgaGFzIGJlZW4gcmVjZWl2ZWQKKyAqICAgIGZyb20gdGhlIHNlcnZlciwgb3IgJUZB TFNFIG90aGVyd2lzZS4KKyAqLworZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2dldF90bHNfaW5m byhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHVGxzQ2VydGlmaWNhdGUqKiBjZXJ0aWZpY2F0ZSwg R1Rsc0NlcnRpZmljYXRlRmxhZ3MqIGVycm9ycykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFp bChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldyksIEZBTFNFKTsKKworICAgIFdlYkZyYW1lUHJv eHkqIG1haW5GcmFtZSA9IGdldFBhZ2Uod2ViVmlldyktPm1haW5GcmFtZSgpOworICAgIGlmICgh bWFpbkZyYW1lKQorICAgICAgICByZXR1cm4gRkFMU0U7CisKKyAgICBjb25zdCBQbGF0Zm9ybUNl cnRpZmljYXRlSW5mbyYgY2VydGlmaWNhdGVJbmZvID0gbWFpbkZyYW1lLT5jZXJ0aWZpY2F0ZUlu Zm8oKS0+cGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8oKTsKKyAgICBpZiAoY2VydGlmaWNhdGUpCisg ICAgICAgICpjZXJ0aWZpY2F0ZSA9IGNlcnRpZmljYXRlSW5mby5jZXJ0aWZpY2F0ZSgpOworICAg IGlmIChlcnJvcnMpCisgICAgICAgICplcnJvcnMgPSBjZXJ0aWZpY2F0ZUluZm8udGxzRXJyb3Jz KCk7CisKKyAgICByZXR1cm4gISFjZXJ0aWZpY2F0ZUluZm8uY2VydGlmaWNhdGUoKTsKK30KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAppbmRl eCBhMjk5MmQxLi5hYWU4NDliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlldy5oCkBAIC00MTQsNiArNDE0LDExIEBAIHdlYmtpdF93ZWJfdmll d19zZXRfdmlld19tb2RlICAgICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcKIFdF QktJVF9BUEkgV2ViS2l0Vmlld01vZGUKIHdlYmtpdF93ZWJfdmlld19nZXRfdmlld19tb2RlICAg ICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAgKndlYl92aWV3 KTsKIAorV0VCS0lUX0FQSSBnYm9vbGVhbgord2Via2l0X3dlYl92aWV3X2dldF90bHNfaW5mbyAg ICAgICAgICAgICAgICAgICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICAgICAqd2ViX3Zp ZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHVGxzQ2VydGlmaWNhdGUgICAgICAgICAgKipjZXJ0aWZpY2F0ZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUbHNDZXJ0aWZpY2F0ZUZs YWdzICAgICAgKmVycm9ycyk7CisKIEdfRU5EX0RFQ0xTCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25z LnR4dCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1z ZWN0aW9ucy50eHQKaW5kZXggODdhOGJiNy4uZjZlOGE4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rpb25zLnR4dAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlv bnMudHh0CkBAIC0xMzMsNiArMTMzLDcgQEAgd2Via2l0X3dlYl92aWV3X3NhdmVfdG9fZmlsZV9m aW5pc2gKIHdlYmtpdF93ZWJfdmlld19kb3dubG9hZF91cmkKIHdlYmtpdF93ZWJfdmlld19zZXRf dmlld19tb2RlCiB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3ZpZXdfbW9kZQord2Via2l0X3dlYl92aWV3 X2dldF90bHNfaW5mbwogCiA8U1VCU0VDVElPTiBXZWJLaXRKYXZhc2NyaXB0UmVzdWx0PgogV2Vi S2l0SmF2YXNjcmlwdFJlc3VsdApAQCAtMzUxLDcgKzM1Miw2IEBAIHdlYmtpdF91cmlfcmVzcG9u c2VfZ2V0X3VyaQogd2Via2l0X3VyaV9yZXNwb25zZV9nZXRfc3RhdHVzX2NvZGUKIHdlYmtpdF91 cmlfcmVzcG9uc2VfZ2V0X2NvbnRlbnRfbGVuZ3RoCiB3ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9t aW1lX3R5cGUKLXdlYmtpdF91cmlfcmVzcG9uc2VfZ2V0X2h0dHBzX3N0YXR1cwogd2Via2l0X3Vy aV9yZXNwb25zZV9nZXRfc3VnZ2VzdGVkX2ZpbGVuYW1lCiAKIDxTVUJTRUNUSU9OIFN0YW5kYXJk PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dFNTTC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0U1NM LmNwcAppbmRleCBkODI2YTAxLi5kYjZjY2M4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0U1NMLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0U1NMLmNwcApAQCAtNDYsMTMgKzQ2LDggQEAgcHVi bGljOgogCiAgICAgdmlydHVhbCB2b2lkIGxvYWRDb21taXR0ZWQoKQogICAgIHsKLSAgICAgICAg V2ViS2l0V2ViUmVzb3VyY2UqIHJlc291cmNlID0gd2Via2l0X3dlYl92aWV3X2dldF9tYWluX3Jl c291cmNlKG1fd2ViVmlldyk7Ci0gICAgICAgIGdfYXNzZXJ0KHJlc291cmNlKTsKLSAgICAgICAg V2ViS2l0VVJJUmVzcG9uc2UqIHJlc3BvbnNlID0gd2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfcmVz cG9uc2UocmVzb3VyY2UpOwotICAgICAgICBnX2Fzc2VydChyZXNwb25zZSk7Ci0KICAgICAgICAg R1Rsc0NlcnRpZmljYXRlKiBjZXJ0aWZpY2F0ZSA9IDA7Ci0gICAgICAgIHdlYmtpdF91cmlfcmVz cG9uc2VfZ2V0X2h0dHBzX3N0YXR1cyhyZXNwb25zZSwgJmNlcnRpZmljYXRlLCAmbV90bHNFcnJv cnMpOworICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3Rsc19pbmZvKG1fd2ViVmlldywgJmNl cnRpZmljYXRlLCAmbV90bHNFcnJvcnMpOwogICAgICAgICBtX2NlcnRpZmljYXRlID0gY2VydGlm aWNhdGU7CiAgICAgICAgIExvYWRUcmFja2luZ1Rlc3Q6OmxvYWRDb21taXR0ZWQoKTsKICAgICB9 Cg==