96774 2012-09-14 06:58:55 -0700 [GTK] Don't use the C API internally in WebKitFileChooserRequest 2012-10-18 08:55:37 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96773 96766 96775 99705 99724 1 cgarcia webkit-unassigned gustavo mario mrobinson webkit.review.bot oldest_to_newest 720704 0 cgarcia 2012-09-14 06:58:55 -0700 Use the C++ classes instead. 720705 1 164134 cgarcia 2012-09-14 07:00:13 -0700 Created attachment 164134 Patch 720709 2 webkit.review.bot 2012-09-14 07:03:06 -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 733441 3 164134 mario 2012-10-03 01:38:17 -0700 Comment on attachment 164134 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164134&action=review Looks good to me. I just have a really minor comment > Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp:255 > + if (!mimeTypes->size()) Why not using the numOfMimeTypes variable here? I know it's not crucial stuff, but you will need to call mimeTypes->size() again below, so it might be handy 745287 4 164134 xan.lopez 2012-10-18 08:41:11 -0700 Comment on attachment 164134 Patch As Mario says there's a couple of places where keeping the num variable makes sense, but not really a big deal. Looks good otherwise. 745295 5 cgarcia 2012-10-18 08:53:07 -0700 (In reply to comment #4) > (From update of attachment 164134 [details]) > As Mario says there's a couple of places where keeping the num variable makes sense, but not really a big deal. Looks good otherwise. Sure, I'll change that before landing. 745298 6 cgarcia 2012-10-18 08:55:37 -0700 Committed r131757: <http://trac.webkit.org/changeset/131757> 164134 2012-09-14 07:00:13 -0700 2012-10-18 08:41:11 -0700 Patch wk2-no-c-api-file-chooser.diff text/plain 10556 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi40MjA0YTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRGaWxlQ2hvb3NlclJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk2Nzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXNpbmcgdGhlIEMrKyBjbGFzc2VzIGRpcmVjdGx5IGluc3RlYWQgb2YgdGhl IEMgQVBJIHdyYXBwZXJzIHdlCisgICAgICAgIGF2b2lkIGEgbG90IG9mIHRvSW1wbC90b0FQSSBj YXN0cywgc3RyaW5nIGNvbnZlcnNpb25zIGFuZAorICAgICAgICBhbGxvY2F0aW9ucy4gVGhlIGNv ZGUgaXMgYWxzbyBhIGxvdCBzaW1wbGVyIGFuZCBlYXNpZXIgdG8gcmVhZC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbGVDaG9vc2VyUmVxdWVzdC5jcHA6CisgICAgICAg IChfV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0UHJpdmF0ZSk6CisgICAgICAgICh3ZWJraXRGaWxl Q2hvb3NlclJlcXVlc3RDcmVhdGUpOgorICAgICAgICAod2Via2l0X2ZpbGVfY2hvb3Nlcl9yZXF1 ZXN0X2dldF9taW1lX3R5cGVzKToKKyAgICAgICAgKHdlYmtpdF9maWxlX2Nob29zZXJfcmVxdWVz dF9nZXRfbWltZV90eXBlc19maWx0ZXIpOgorICAgICAgICAod2Via2l0X2ZpbGVfY2hvb3Nlcl9y ZXF1ZXN0X2dldF9zZWxlY3RfbXVsdGlwbGUpOgorICAgICAgICAod2Via2l0X2ZpbGVfY2hvb3Nl cl9yZXF1ZXN0X3NlbGVjdF9maWxlcyk6CisgICAgICAgICh3ZWJraXRfZmlsZV9jaG9vc2VyX3Jl cXVlc3RfZ2V0X3NlbGVjdGVkX2ZpbGVzKToKKyAgICAgICAgKHdlYmtpdF9maWxlX2Nob29zZXJf cmVxdWVzdF9jYW5jZWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbGVD aG9vc2VyUmVxdWVzdFByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRVSUNsaWVudC5jcHA6CisgICAgICAgIChydW5PcGVuUGFuZWwpOgorCiAyMDEyLTA5LTEyICBT aGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByMTI3ODc2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbGVDaG9vc2VyUmVxdWVzdC5jcHAKaW5k ZXggOTZiODdhMy4uYTJkZTQyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3QuY3BwCkBAIC0yMCw4 ICsyMCwxMCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdEZpbGVDaG9v c2VyUmVxdWVzdC5oIgogCisjaW5jbHVkZSAiSW1tdXRhYmxlQXJyYXkuaCIKICNpbmNsdWRlICJX ZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3RQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViT3BlblBhbmVs UGFyYW1ldGVycy5oIgorI2luY2x1ZGUgIldlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJveHku aCIKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxnbGliL2dpMThu LWxpYi5oPgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dPd25QdHIuaD4KQEAgLTI5LDcgKzMxLDYg QEAKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwotdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogLyoqCiAgKiBTRUNUSU9OOiBXZWJLaXRG aWxlQ2hvb3NlclJlcXVlc3QKQEAgLTU3LDggKzU4LDggQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktp dDsKIEdfREVGSU5FX1RZUEUoV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0LCB3ZWJraXRfZmlsZV9j aG9vc2VyX3JlcXVlc3QsIEdfVFlQRV9PQkpFQ1QpCiAKIHN0cnVjdCBfV2ViS2l0RmlsZUNob29z ZXJSZXF1ZXN0UHJpdmF0ZSB7Ci0gICAgV0tSZXRhaW5QdHI8V0tPcGVuUGFuZWxQYXJhbWV0ZXJz UmVmPiB3a1BhcmFtZXRlcnM7Ci0gICAgV0tSZXRhaW5QdHI8V0tPcGVuUGFuZWxSZXN1bHRMaXN0 ZW5lclJlZj4gd2tMaXN0ZW5lcjsKKyAgICBSZWZQdHI8V2ViT3BlblBhbmVsUGFyYW1ldGVycz4g cGFyYW1ldGVyczsKKyAgICBSZWZQdHI8V2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94eT4g bGlzdGVuZXI7CiAgICAgR1JlZlB0cjxHdGtGaWxlRmlsdGVyPiBmaWx0ZXI7CiAgICAgR1JlZlB0 cjxHUHRyQXJyYXk+IG1pbWVUeXBlczsKICAgICBHUmVmUHRyPEdQdHJBcnJheT4gc2VsZWN0ZWRG aWxlczsKQEAgLTE3OSwxMSArMTgwLDExIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9maWxlX2Nob29z ZXJfcmVxdWVzdF9jbGFzc19pbml0KFdlYktpdEZpbGVDaG9vc2VyUmVxdWVzdENsYXNzCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXRUJLSVRf UEFSQU1fUkVBREFCTEUpKTsKIH0KIAotV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0KiB3ZWJraXRG aWxlQ2hvb3NlclJlcXVlc3RDcmVhdGUoV0tPcGVuUGFuZWxQYXJhbWV0ZXJzUmVmIHdrUGFyYW1l dGVycywgV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclJlZiB3a0xpc3RlbmVyKQorV2ViS2l0Rmls ZUNob29zZXJSZXF1ZXN0KiB3ZWJraXRGaWxlQ2hvb3NlclJlcXVlc3RDcmVhdGUoV2ViT3BlblBh bmVsUGFyYW1ldGVycyogcGFyYW1ldGVycywgV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94 eSogbGlzdGVuZXIpCiB7CiAgICAgV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0KiByZXF1ZXN0ID0g V0VCS0lUX0ZJTEVfQ0hPT1NFUl9SRVFVRVNUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9GSUxF X0NIT09TRVJfUkVRVUVTVCwgTlVMTCkpOwotICAgIHJlcXVlc3QtPnByaXYtPndrUGFyYW1ldGVy cyA9IHdrUGFyYW1ldGVyczsKLSAgICByZXF1ZXN0LT5wcml2LT53a0xpc3RlbmVyID0gd2tMaXN0 ZW5lcjsKKyAgICByZXF1ZXN0LT5wcml2LT5wYXJhbWV0ZXJzID0gcGFyYW1ldGVyczsKKyAgICBy ZXF1ZXN0LT5wcml2LT5saXN0ZW5lciA9IGxpc3RlbmVyOwogICAgIHJldHVybiByZXF1ZXN0Owog fQogCkBAIC0yMTAsMTUgKzIxMSwxNCBAQCBjb25zdCBnY2hhciogY29uc3QqIHdlYmtpdF9maWxl X2Nob29zZXJfcmVxdWVzdF9nZXRfbWltZV90eXBlcyhXZWJLaXRGaWxlQ2hvb3NlcgogICAgIGlm IChyZXF1ZXN0LT5wcml2LT5taW1lVHlwZXMpCiAgICAgICAgIHJldHVybiByZWludGVycHJldF9j YXN0PGdjaGFyKio+KHJlcXVlc3QtPnByaXYtPm1pbWVUeXBlcy0+cGRhdGEpOwogCi0gICAgV0tS ZXRhaW5QdHI8V0tBcnJheVJlZj4gd2tNaW1lVHlwZXMoQWRvcHRXSywgV0tPcGVuUGFuZWxQYXJh bWV0ZXJzQ29weUFjY2VwdGVkTUlNRVR5cGVzKHJlcXVlc3QtPnByaXYtPndrUGFyYW1ldGVycy5n ZXQoKSkpOwotICAgIHNpemVfdCBudW1PZk1pbWVUeXBlcyA9IFdLQXJyYXlHZXRTaXplKHdrTWlt ZVR5cGVzLmdldCgpKTsKLSAgICBpZiAoIW51bU9mTWltZVR5cGVzKQorICAgIFJlZlB0cjxJbW11 dGFibGVBcnJheT4gbWltZVR5cGVzID0gcmVxdWVzdC0+cHJpdi0+cGFyYW1ldGVycy0+YWNjZXB0 TUlNRVR5cGVzKCk7CisgICAgaWYgKCFtaW1lVHlwZXMtPnNpemUoKSkKICAgICAgICAgcmV0dXJu IDA7CiAKICAgICByZXF1ZXN0LT5wcml2LT5taW1lVHlwZXMgPSBhZG9wdEdSZWYoZ19wdHJfYXJy YXlfbmV3X3dpdGhfZnJlZV9mdW5jKGdfZnJlZSkpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgbnVtT2ZNaW1lVHlwZXM7ICsraSkgewotICAgICAgICBXS1N0cmluZ1JlZiB3a01pbWVUeXBl ID0gc3RhdGljX2Nhc3Q8V0tTdHJpbmdSZWY+KFdLQXJyYXlHZXRJdGVtQXRJbmRleCh3a01pbWVU eXBlcy5nZXQoKSwgaSkpOwotICAgICAgICBTdHJpbmcgbWltZVR5cGVTdHJpbmcgPSB0b0ltcGwo d2tNaW1lVHlwZSktPnN0cmluZygpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbWltZVR5 cGVzLT5zaXplKCk7ICsraSkgeworICAgICAgICBXZWJTdHJpbmcqIHdlYk1pbWVUeXBlID0gc3Rh dGljX2Nhc3Q8V2ViU3RyaW5nKj4obWltZVR5cGVzLT5hdChpKSk7CisgICAgICAgIFN0cmluZyBt aW1lVHlwZVN0cmluZyA9IHdlYk1pbWVUeXBlLT5zdHJpbmcoKTsKICAgICAgICAgaWYgKG1pbWVU eXBlU3RyaW5nLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBnX3B0 cl9hcnJheV9hZGQocmVxdWVzdC0+cHJpdi0+bWltZVR5cGVzLmdldCgpLCBnX3N0cmR1cChtaW1l VHlwZVN0cmluZy51dGY4KCkuZGF0YSgpKSk7CkBAIC0yNTEsMTggKzI1MSwxNyBAQCBHdGtGaWxl RmlsdGVyKiB3ZWJraXRfZmlsZV9jaG9vc2VyX3JlcXVlc3RfZ2V0X21pbWVfdHlwZXNfZmlsdGVy KFdlYktpdEZpbGVDaG9vcwogICAgIGlmIChyZXF1ZXN0LT5wcml2LT5maWx0ZXIpCiAgICAgICAg IHJldHVybiByZXF1ZXN0LT5wcml2LT5maWx0ZXIuZ2V0KCk7CiAKLSAgICBXS1JldGFpblB0cjxX S0FycmF5UmVmPiB3a01pbWVUeXBlcyhBZG9wdFdLLCBXS09wZW5QYW5lbFBhcmFtZXRlcnNDb3B5 QWNjZXB0ZWRNSU1FVHlwZXMocmVxdWVzdC0+cHJpdi0+d2tQYXJhbWV0ZXJzLmdldCgpKSk7Ci0g ICAgc2l6ZV90IG51bU9mTWltZVR5cGVzID0gV0tBcnJheUdldFNpemUod2tNaW1lVHlwZXMuZ2V0 KCkpOwotICAgIGlmICghbnVtT2ZNaW1lVHlwZXMpCisgICAgUmVmUHRyPEltbXV0YWJsZUFycmF5 PiBtaW1lVHlwZXMgPSByZXF1ZXN0LT5wcml2LT5wYXJhbWV0ZXJzLT5hY2NlcHRNSU1FVHlwZXMo KTsKKyAgICBpZiAoIW1pbWVUeXBlcy0+c2l6ZSgpKQogICAgICAgICByZXR1cm4gMDsKIAogICAg IC8vIERvIG5vdCB1c2UgYWRvcHRHUmVmIGhlcmUsIHNpbmNlIHdlIHdhbnQgdG8gc2luayB0aGUg ZmxvYXRpbmcKICAgICAvLyByZWZlcmVuY2UgZm9yIHRoZSBuZXcgaW5zdGFuY2Ugb2YgR3RrRmls ZUZpbHRlciwgc28gd2UgbWFrZQogICAgIC8vIHN1cmUgd2Uga2VlcCB0aGUgb3duZXJzaGlwIGR1 cmluZyB0aGUgbGlmZXRpbWUgb2YgdGhlIHJlcXVlc3QuCiAgICAgcmVxdWVzdC0+cHJpdi0+Zmls dGVyID0gZ3RrX2ZpbGVfZmlsdGVyX25ldygpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg bnVtT2ZNaW1lVHlwZXM7ICsraSkgewotICAgICAgICBXS1N0cmluZ1JlZiB3a01pbWVUeXBlID0g c3RhdGljX2Nhc3Q8V0tTdHJpbmdSZWY+KFdLQXJyYXlHZXRJdGVtQXRJbmRleCh3a01pbWVUeXBl cy5nZXQoKSwgaSkpOwotICAgICAgICBTdHJpbmcgbWltZVR5cGVTdHJpbmcgPSB0b0ltcGwod2tN aW1lVHlwZSktPnN0cmluZygpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbWltZVR5cGVz LT5zaXplKCk7ICsraSkgeworICAgICAgICBXZWJTdHJpbmcqIHdlYk1pbWVUeXBlID0gc3RhdGlj X2Nhc3Q8V2ViU3RyaW5nKj4obWltZVR5cGVzLT5hdChpKSk7CisgICAgICAgIFN0cmluZyBtaW1l VHlwZVN0cmluZyA9IHdlYk1pbWVUeXBlLT5zdHJpbmcoKTsKICAgICAgICAgaWYgKG1pbWVUeXBl U3RyaW5nLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBndGtfZmls ZV9maWx0ZXJfYWRkX21pbWVfdHlwZShyZXF1ZXN0LT5wcml2LT5maWx0ZXIuZ2V0KCksIG1pbWVU eXBlU3RyaW5nLnV0ZjgoKS5kYXRhKCkpOwpAQCAtMjg1LDcgKzI4NCw3IEBAIEd0a0ZpbGVGaWx0 ZXIqIHdlYmtpdF9maWxlX2Nob29zZXJfcmVxdWVzdF9nZXRfbWltZV90eXBlc19maWx0ZXIoV2Vi S2l0RmlsZUNob29zCiBnYm9vbGVhbiB3ZWJraXRfZmlsZV9jaG9vc2VyX3JlcXVlc3RfZ2V0X3Nl bGVjdF9tdWx0aXBsZShXZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3QqIHJlcXVlc3QpCiB7CiAgICAg Z19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0ZJTEVfQ0hPT1NFUl9SRVFVRVNUKHJlcXVl c3QpLCBGQUxTRSk7Ci0gICAgcmV0dXJuIFdLT3BlblBhbmVsUGFyYW1ldGVyc0dldEFsbG93c011 bHRpcGxlRmlsZXMocmVxdWVzdC0+cHJpdi0+d2tQYXJhbWV0ZXJzLmdldCgpKTsKKyAgICByZXR1 cm4gcmVxdWVzdC0+cHJpdi0+cGFyYW1ldGVycy0+YWxsb3dNdWx0aXBsZUZpbGVzKCk7CiB9CiAK IC8qKgpAQCAtMzAzLDcgKzMwMiw3IEBAIHZvaWQgd2Via2l0X2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0 X3NlbGVjdF9maWxlcyhXZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3QqIHJlcXVlc3QsCiAgICAgZ19y ZXR1cm5faWZfZmFpbChmaWxlcyk7CiAKICAgICBHUmVmUHRyPEdQdHJBcnJheT4gc2VsZWN0ZWRG aWxlcyA9IGFkb3B0R1JlZihnX3B0cl9hcnJheV9uZXdfd2l0aF9mcmVlX2Z1bmMoZ19mcmVlKSk7 Ci0gICAgV0tSZXRhaW5QdHI8V0tNdXRhYmxlQXJyYXlSZWY+IHdrQ2hvc2VuRmlsZXMoQWRvcHRX SywgV0tNdXRhYmxlQXJyYXlDcmVhdGUoKSk7CisgICAgVmVjdG9yPFJlZlB0cjxBUElPYmplY3Q+ ID4gY2hvb3NlbkZpbGVzOwogICAgIGZvciAoaW50IGkgPSAwOyBmaWxlc1tpXTsgaSsrKSB7CiAg ICAgICAgIEdSZWZQdHI8R0ZpbGU+IGZpbGVuYW1lID0gYWRvcHRHUmVmKGdfZmlsZV9uZXdfZm9y X3BhdGgoZmlsZXNbaV0pKTsKIApAQCAtMzExLDggKzMxMCw3IEBAIHZvaWQgd2Via2l0X2ZpbGVf Y2hvb3Nlcl9yZXF1ZXN0X3NlbGVjdF9maWxlcyhXZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3QqIHJl cXVlc3QsCiAgICAgICAgIC8vIHN0cmluZywgd2l0aCB0aGUgJ2ZpbGU6Ly8nIHByZWZpeCkgdG8g V2ViQ29yZSBvdGhlcndpc2UgdGhlCiAgICAgICAgIC8vIEZpbGVDaG9vc2VyIHdvbid0IGFjdHVh bGx5IGNob29zZSBpdC4KICAgICAgICAgR093blB0cjxjaGFyPiB1cmkoZ19maWxlX2dldF91cmko ZmlsZW5hbWUuZ2V0KCkpKTsKLSAgICAgICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHdrVVJMKEFk b3B0V0ssIFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHVyaS5nZXQoKSkpOwotICAgICAgICBX S0FycmF5QXBwZW5kSXRlbSh3a0Nob3NlbkZpbGVzLmdldCgpLCB3a1VSTC5nZXQoKSk7CisgICAg ICAgIGNob29zZW5GaWxlcy5hcHBlbmQoV2ViVVJMOjpjcmVhdGUoU3RyaW5nOjpmcm9tVVRGOCh1 cmkuZ2V0KCkpKSk7CiAKICAgICAgICAgLy8gRG8gbm90IHVzZSB0aGUgVVJJIGhlcmUgYmVjYXVz ZSB0aGlzIHdvbid0IHJlYWNoIFdlYkNvcmUuCiAgICAgICAgIGdfcHRyX2FycmF5X2FkZChzZWxl Y3RlZEZpbGVzLmdldCgpLCBnX3N0cmR1cChmaWxlc1tpXSkpOwpAQCAtMzIwLDcgKzMxOCw3IEBA IHZvaWQgd2Via2l0X2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0X3NlbGVjdF9maWxlcyhXZWJLaXRGaWxl Q2hvb3NlclJlcXVlc3QqIHJlcXVlc3QsCiAgICAgZ19wdHJfYXJyYXlfYWRkKHNlbGVjdGVkRmls ZXMuZ2V0KCksIDApOwogCiAgICAgLy8gU2VsZWN0IHRoZSBmaWxlcyBpbiBXZWJDb3JlIGFuZCB1 cGRhdGUgbG9jYWwgcHJpdmF0ZSBhdHRyaWJ1dGVzLgotICAgIFdLT3BlblBhbmVsUmVzdWx0TGlz dGVuZXJDaG9vc2VGaWxlcyhyZXF1ZXN0LT5wcml2LT53a0xpc3RlbmVyLmdldCgpLCB3a0Nob3Nl bkZpbGVzLmdldCgpKTsKKyAgICByZXF1ZXN0LT5wcml2LT5saXN0ZW5lci0+Y2hvb3NlRmlsZXMo SW1tdXRhYmxlQXJyYXk6OmFkb3B0KGNob29zZW5GaWxlcykuZ2V0KCkpOwogICAgIHJlcXVlc3Qt PnByaXYtPnNlbGVjdGVkRmlsZXMgPSBzZWxlY3RlZEZpbGVzOwogICAgIHJlcXVlc3QtPnByaXYt PmhhbmRsZWRSZXF1ZXN0ID0gdHJ1ZTsKIH0KQEAgLTM1MSw3ICszNDksNyBAQCBjb25zdCBnY2hh ciogY29uc3QqIHdlYmtpdF9maWxlX2Nob29zZXJfcmVxdWVzdF9nZXRfc2VsZWN0ZWRfZmlsZXMo V2ViS2l0RmlsZUNobwogICAgIGlmIChyZXF1ZXN0LT5wcml2LT5zZWxlY3RlZEZpbGVzKQogICAg ICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxnY2hhcioqPihyZXF1ZXN0LT5wcml2LT5zZWxl Y3RlZEZpbGVzLT5wZGF0YSk7CiAKLSAgICBjb25zdCBWZWN0b3I8U3RyaW5nPiBzZWxlY3RlZEZp bGVOYW1lcyA9IHRvSW1wbChyZXF1ZXN0LT5wcml2LT53a1BhcmFtZXRlcnMuZ2V0KCkpLT5zZWxl Y3RlZEZpbGVOYW1lcygpOworICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+IHNlbGVjdGVkRmlsZU5h bWVzID0gcmVxdWVzdC0+cHJpdi0+cGFyYW1ldGVycy0+c2VsZWN0ZWRGaWxlTmFtZXMoKTsKICAg ICBzaXplX3QgbnVtT2ZGaWxlcyA9IHNlbGVjdGVkRmlsZU5hbWVzLnNpemUoKTsKICAgICBpZiAo IW51bU9mRmlsZXMpCiAgICAgICAgIHJldHVybiAwOwpAQCAtMzgwLDYgKzM3OCw2IEBAIGNvbnN0 IGdjaGFyKiBjb25zdCogd2Via2l0X2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0X2dldF9zZWxlY3RlZF9m aWxlcyhXZWJLaXRGaWxlQ2hvCiB2b2lkIHdlYmtpdF9maWxlX2Nob29zZXJfcmVxdWVzdF9jYW5j ZWwoV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0KiByZXF1ZXN0KQogewogICAgIGdfcmV0dXJuX2lm X2ZhaWwoV0VCS0lUX0lTX0ZJTEVfQ0hPT1NFUl9SRVFVRVNUKHJlcXVlc3QpKTsKLSAgICBXS09w ZW5QYW5lbFJlc3VsdExpc3RlbmVyQ2FuY2VsKHJlcXVlc3QtPnByaXYtPndrTGlzdGVuZXIuZ2V0 KCkpOworICAgIHJlcXVlc3QtPnByaXYtPmxpc3RlbmVyLT5jYW5jZWwoKTsKICAgICByZXF1ZXN0 LT5wcml2LT5oYW5kbGVkUmVxdWVzdCA9IHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3RQcml2YXRlLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaWxlQ2hvb3NlclJlcXVl c3RQcml2YXRlLmgKaW5kZXggYWY3MjI0YS4uYjY3NzUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0UHJpdmF0ZS5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbGVDaG9vc2Vy UmVxdWVzdFByaXZhdGUuaApAQCAtMjMsNiArMjMsOCBAQAogI2luY2x1ZGUgIldlYktpdEZpbGVD aG9vc2VyUmVxdWVzdC5oIgogI2luY2x1ZGUgIldlYktpdFByaXZhdGUuaCIKIAotV2ViS2l0Rmls ZUNob29zZXJSZXF1ZXN0KiB3ZWJraXRGaWxlQ2hvb3NlclJlcXVlc3RDcmVhdGUoV0tPcGVuUGFu ZWxQYXJhbWV0ZXJzUmVmLCBXS09wZW5QYW5lbFJlc3VsdExpc3RlbmVyUmVmKTsKK3VzaW5nIG5h bWVzcGFjZSBXZWJLaXQ7CisKK1dlYktpdEZpbGVDaG9vc2VyUmVxdWVzdCogd2Via2l0RmlsZUNo b29zZXJSZXF1ZXN0Q3JlYXRlKFdlYk9wZW5QYW5lbFBhcmFtZXRlcnMqLCBXZWJPcGVuUGFuZWxS ZXN1bHRMaXN0ZW5lclByb3h5Kik7CiAKICNlbmRpZiAvLyBXZWJLaXRGaWxlQ2hvb3NlclJlcXVl c3RQcml2YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFVJQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFVJQ2xpZW50LmNwcAppbmRleCBkMGQ5NjZjLi5mNmY1M2Y3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQuY3BwCkBAIC0xNDIs NyArMTQyLDcgQEAgc3RhdGljIHZvaWQgcHJpbnRGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFt ZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCopCiAKIHN0YXRpYyB2b2lkIHJ1bk9wZW5QYW5lbChXS1Bh Z2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tPcGVuUGFuZWxQYXJhbWV0ZXJzUmVmIHBh cmFtZXRlcnMsIFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJSZWYgbGlzdGVuZXIsIGNvbnN0IHZv aWQgKmNsaWVudEluZm8pCiB7Ci0gICAgR1JlZlB0cjxXZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3Q+ IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0RmlsZUNob29zZXJSZXF1ZXN0Q3JlYXRlKHBhcmFt ZXRlcnMsIGxpc3RlbmVyKSk7CisgICAgR1JlZlB0cjxXZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3Q+ IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0RmlsZUNob29zZXJSZXF1ZXN0Q3JlYXRlKHRvSW1w bChwYXJhbWV0ZXJzKSwgdG9JbXBsKGxpc3RlbmVyKSkpOwogICAgIHdlYmtpdFdlYlZpZXdSdW5G aWxlQ2hvb3NlclJlcXVlc3QoV0VCS0lUX1dFQl9WSUVXKGNsaWVudEluZm8pLCByZXF1ZXN0Lmdl dCgpKTsKIH0KIAo=