96772 2012-09-14 06:52:36 -0700 [GTK] Don't use the C API internally in WebKitCookieManager 2012-10-17 08:56:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96770 96766 96773 1 cgarcia webkit-unassigned mario oldest_to_newest 720700 0 cgarcia 2012-09-14 06:52:36 -0700 Use the C++ classes instead. 720701 1 164132 cgarcia 2012-09-14 06:54:20 -0700 Created attachment 164132 Patch 733436 2 164132 mario 2012-10-03 01:34:49 -0700 Comment on attachment 164132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164132&action=review Looks good to me > Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:37 > + RefPtr<WebCookieManagerProxy> webCookieManager; As I commented in another patch, I would probably not use the "web" prefix here. Just cookieManager would be enough, IMO 733442 3 cgarcia 2012-10-03 01:38:42 -0700 (In reply to comment #2) > (From update of attachment 164132 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164132&action=review > > Looks good to me > > > Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:37 > > + RefPtr<WebCookieManagerProxy> webCookieManager; > > As I commented in another patch, I would probably not use the "web" prefix here. Just cookieManager would be enough, IMO Class name is WebCookieManagerProxy, I don't see the problem of suing the web prefix 744283 4 cgarcia 2012-10-17 08:56:40 -0700 Committed r131607: <http://trac.webkit.org/changeset/131607> 164132 2012-09-14 06:54:20 -0700 2012-10-17 06:08:53 -0700 Patch wk2-no-c-api-cookies.diff text/plain 10010 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi41Y2YxMzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRDb29raWVNYW5hZ2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05Njc3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFVzaW5nIHRoZSBDKysgY2xhc3NlcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRoZSBDIEFQ SSB3cmFwcGVycyB3ZQorICAgICAgICBhdm9pZCBhIGxvdCBvZiB0b0ltcGwvdG9BUEkgY2FzdHMs IHN0cmluZyBjb252ZXJzaW9ucyBhbmQKKyAgICAgICAgYWxsb2NhdGlvbnMuIFRoZSBjb2RlIGlz IGFsc28gYSBsb3Qgc2ltcGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKF9XZWJLaXRD b29raWVNYW5hZ2VyUHJpdmF0ZSk6CisgICAgICAgICh3ZWJraXRDb29raWVNYW5hZ2VyRmluYWxp emUpOgorICAgICAgICAod2Via2l0Q29va2llTWFuYWdlckNyZWF0ZSk6CisgICAgICAgICh3ZWJr aXRfY29va2llX21hbmFnZXJfc2V0X3BlcnNpc3RlbnRfc3RvcmFnZSk6CisgICAgICAgICh3ZWJr aXRfY29va2llX21hbmFnZXJfc2V0X2FjY2VwdF9wb2xpY3kpOgorICAgICAgICAod2Via2l0X2Nv b2tpZV9tYW5hZ2VyX2dldF9hY2NlcHRfcG9saWN5KToKKyAgICAgICAgKHdlYmtpdENvb2tpZU1h bmFnZXJHZXREb21haW5zV2l0aENvb2tpZXNDYWxsYmFjayk6CisgICAgICAgICh3ZWJraXRfY29v a2llX21hbmFnZXJfZ2V0X2RvbWFpbnNfd2l0aF9jb29raWVzKToKKyAgICAgICAgKHdlYmtpdF9j b29raWVfbWFuYWdlcl9kZWxldGVfY29va2llc19mb3JfZG9tYWluKToKKyAgICAgICAgKHdlYmtp dF9jb29raWVfbWFuYWdlcl9kZWxldGVfYWxsX2Nvb2tpZXMpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdENvb2tpZU1hbmFnZXJQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX2Nv bnRleHRfZ2V0X2Nvb2tpZV9tYW5hZ2VyKToKKwogMjAxMi0wOS0xMiAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEyNzg3Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdENvb2tpZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0Q29va2llTWFuYWdlci5jcHAKaW5kZXggODc5MGM3Yy4uMDM3YjY5MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29va2llTWFu YWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29v a2llTWFuYWdlci5jcHAKQEAgLTI3LDggKzI3LDYgQEAKICNpbmNsdWRlIDx3dGYvZ29iamVjdC9H UmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCi11c2luZyBuYW1lc3Bh Y2UgV2ViS2l0OwotCiBlbnVtIHsKICAgICBDSEFOR0VELAogCkBAIC0zNiw3ICszNCw3IEBAIGVu dW0gewogfTsKIAogc3RydWN0IF9XZWJLaXRDb29raWVNYW5hZ2VyUHJpdmF0ZSB7Ci0gICAgV0tS ZXRhaW5QdHI8V0tDb29raWVNYW5hZ2VyUmVmPiB3a0Nvb2tpZU1hbmFnZXI7CisgICAgUmVmUHRy PFdlYkNvb2tpZU1hbmFnZXJQcm94eT4gd2ViQ29va2llTWFuYWdlcjsKIH07CiAKIHN0YXRpYyBn dWludCBzaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKQEAgLTQ2LDkgKzQ0LDkgQEAgR19E RUZJTkVfVFlQRShXZWJLaXRDb29raWVNYW5hZ2VyLCB3ZWJraXRfY29va2llX21hbmFnZXIsIEdf VFlQRV9PQkpFQ1QpCiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9DT09LSUVf UEVSU0lTVEVOVF9TVE9SQUdFX1RFWFQsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVRleHQp OwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfQ09PS0lFX1BFUlNJU1RFTlRf U1RPUkFHRV9TUUxJVEUsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVNRTGl0ZSk7CiAKLUNP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX0NPT0tJRV9QT0xJQ1lfQUNDRVBUX0FM V0FZUywga1dLSFRUUENvb2tpZUFjY2VwdFBvbGljeUFsd2F5cyk7Ci1DT01QSUxFX0FTU0VSVF9N QVRDSElOR19FTlVNKFdFQktJVF9DT09LSUVfUE9MSUNZX0FDQ0VQVF9ORVZFUiwga1dLSFRUUENv b2tpZUFjY2VwdFBvbGljeU5ldmVyKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VC S0lUX0NPT0tJRV9QT0xJQ1lfQUNDRVBUX05PX1RISVJEX1BBUlRZLCBrV0tIVFRQQ29va2llQWNj ZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4pOworQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfQUxXQVlTLCBIVFRQQ29va2ll QWNjZXB0UG9saWN5QWx3YXlzKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lU X0NPT0tJRV9QT0xJQ1lfQUNDRVBUX05FVkVSLCBIVFRQQ29va2llQWNjZXB0UG9saWN5TmV2ZXIp OworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NF UFRfTk9fVEhJUkRfUEFSVFksIEhUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1 bWVudERvbWFpbik7CiAKIHN0YXRpYyB2b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9pbml0KFdl YktpdENvb2tpZU1hbmFnZXIqIG1hbmFnZXIpCiB7CkBAIC02MCw3ICs1OCw3IEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9pbml0KFdlYktpdENvb2tpZU1hbmFnZXIqIG1hbmFn ZXIpCiBzdGF0aWMgdm9pZCB3ZWJraXRDb29raWVNYW5hZ2VyRmluYWxpemUoR09iamVjdCogb2Jq ZWN0KQogewogICAgIFdlYktpdENvb2tpZU1hbmFnZXJQcml2YXRlKiBwcml2ID0gV0VCS0lUX0NP T0tJRV9NQU5BR0VSKG9iamVjdCktPnByaXY7Ci0gICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2Vy dmluZ0Nvb2tpZUNoYW5nZXMocHJpdi0+d2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKyAgICBwcml2 LT53ZWJDb29raWVNYW5hZ2VyLT5zdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogICAgIHBy aXYtPn5XZWJLaXRDb29raWVNYW5hZ2VyUHJpdmF0ZSgpOwogICAgIEdfT0JKRUNUX0NMQVNTKHdl YmtpdF9jb29raWVfbWFuYWdlcl9wYXJlbnRfY2xhc3MpLT5maW5hbGl6ZShvYmplY3QpOwogfQpA QCAtOTIsMTggKzkwLDE4IEBAIHN0YXRpYyB2b2lkIGNvb2tpZXNEaWRDaGFuZ2UoV0tDb29raWVN YW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogICAgIGdfc2lnbmFsX2VtaXQoV0VC S0lUX0NPT0tJRV9NQU5BR0VSKGNsaWVudEluZm8pLCBzaWduYWxzW0NIQU5HRURdLCAwKTsKIH0K IAotV2ViS2l0Q29va2llTWFuYWdlciogd2Via2l0Q29va2llTWFuYWdlckNyZWF0ZShXS0Nvb2tp ZU1hbmFnZXJSZWYgd2tDb29raWVNYW5hZ2VyKQorV2ViS2l0Q29va2llTWFuYWdlciogd2Via2l0 Q29va2llTWFuYWdlckNyZWF0ZShXZWJDb29raWVNYW5hZ2VyUHJveHkqIHdlYkNvb2tpZU1hbmFn ZXIpCiB7CiAgICAgV2ViS2l0Q29va2llTWFuYWdlciogbWFuYWdlciA9IFdFQktJVF9DT09LSUVf TUFOQUdFUihnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfQ09PS0lFX01BTkFHRVIsIE5VTEwpKTsK LSAgICBtYW5hZ2VyLT5wcml2LT53a0Nvb2tpZU1hbmFnZXIgPSB3a0Nvb2tpZU1hbmFnZXI7Cisg ICAgbWFuYWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdlciA9IHdlYkNvb2tpZU1hbmFnZXI7CiAK ICAgICBXS0Nvb2tpZU1hbmFnZXJDbGllbnQgd2tDb29raWVNYW5hZ2VyQ2xpZW50ID0gewogICAg ICAgICBrV0tDb29raWVNYW5hZ2VyQ2xpZW50Q3VycmVudFZlcnNpb24sCiAgICAgICAgIG1hbmFn ZXIsIC8vIGNsaWVudEluZm8KICAgICAgICAgY29va2llc0RpZENoYW5nZQogICAgIH07Ci0gICAg V0tDb29raWVNYW5hZ2VyU2V0Q2xpZW50KHdrQ29va2llTWFuYWdlciwgJndrQ29va2llTWFuYWdl ckNsaWVudCk7Ci0gICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2Vz KHdrQ29va2llTWFuYWdlcik7CisgICAgV0tDb29raWVNYW5hZ2VyU2V0Q2xpZW50KHRvQVBJKHdl YkNvb2tpZU1hbmFnZXIpLCAmd2tDb29raWVNYW5hZ2VyQ2xpZW50KTsKKyAgICBtYW5hZ2VyLT5w cml2LT53ZWJDb29raWVNYW5hZ2VyLT5zdGFydE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMoKTsKIAog ICAgIHJldHVybiBtYW5hZ2VyOwogfQpAQCAtMTI3LDkgKzEyNSw5IEBAIHZvaWQgd2Via2l0X2Nv b2tpZV9tYW5hZ2VyX3NldF9wZXJzaXN0ZW50X3N0b3JhZ2UoV2ViS2l0Q29va2llTWFuYWdlciog bWFuYWdlciwKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19DT09LSUVfTUFOQUdFUiht YW5hZ2VyKSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChmaWxlbmFtZSk7CiAKLSAgICBXS0Nvb2tp ZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcyhtYW5hZ2VyLT5wcml2LT53a0Nvb2tp ZU1hbmFnZXIuZ2V0KCkpOwotICAgIHRvSW1wbChtYW5hZ2VyLT5wcml2LT53a0Nvb2tpZU1hbmFn ZXIuZ2V0KCkpLT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShTdHJpbmc6OmZyb21VVEY4KGZp bGVuYW1lKSwgc3RvcmFnZSk7Ci0gICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29r aWVDaGFuZ2VzKG1hbmFnZXItPnByaXYtPndrQ29va2llTWFuYWdlci5nZXQoKSk7CisgICAgbWFu YWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdlci0+c3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMo KTsKKyAgICBtYW5hZ2VyLT5wcml2LT53ZWJDb29raWVNYW5hZ2VyLT5zZXRDb29raWVQZXJzaXN0 ZW50U3RvcmFnZShTdHJpbmc6OmZyb21VVEY4KGZpbGVuYW1lKSwgc3RvcmFnZSk7CisgICAgbWFu YWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdlci0+c3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2Vz KCk7CiB9CiAKIC8qKgpAQCAtMTQzLDcgKzE0MSw3IEBAIHZvaWQgd2Via2l0X2Nvb2tpZV9tYW5h Z2VyX3NldF9hY2NlcHRfcG9saWN5KFdlYktpdENvb2tpZU1hbmFnZXIqIG1hbmFnZXIsIFdlYktp CiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfQ09PS0lFX01BTkFHRVIobWFuYWdl cikpOwogCi0gICAgV0tDb29raWVNYW5hZ2VyU2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShtYW5h Z2VyLT5wcml2LT53a0Nvb2tpZU1hbmFnZXIuZ2V0KCksIHBvbGljeSk7CisgICAgbWFuYWdlci0+ cHJpdi0+d2ViQ29va2llTWFuYWdlci0+c2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShwb2xpY3kp OwogfQogCiBzdHJ1Y3QgR2V0QWNjZXB0UG9saWN5QXN5bmNEYXRhIHsKQEAgLTE4Niw3ICsxODQs NyBAQCB2b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9nZXRfYWNjZXB0X3BvbGljeShXZWJLaXRD b29raWVNYW5hZ2VyKiBtYW5hZ2VyLCBHQ2FuYwogICAgIGRhdGEtPmNhbmNlbGxhYmxlID0gY2Fu Y2VsbGFibGU7CiAgICAgZ19zaW1wbGVfYXN5bmNfcmVzdWx0X3NldF9vcF9yZXNfZ3BvaW50ZXIo cmVzdWx0LCBkYXRhLCByZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5PihkZXN0cm95R2V0 QWNjZXB0UG9saWN5QXN5bmNEYXRhKSk7CiAKLSAgICBXS0Nvb2tpZU1hbmFnZXJHZXRIVFRQQ29v a2llQWNjZXB0UG9saWN5KG1hbmFnZXItPnByaXYtPndrQ29va2llTWFuYWdlci5nZXQoKSwgcmVz dWx0LCB3ZWJraXRDb29raWVNYW5hZ2VyR2V0QWNjZXB0UG9saWN5Q2FsbGJhY2spOworICAgIG1h bmFnZXItPnByaXYtPndlYkNvb2tpZU1hbmFnZXItPmdldEhUVFBDb29raWVBY2NlcHRQb2xpY3ko SFRUUENvb2tpZUFjY2VwdFBvbGljeUNhbGxiYWNrOjpjcmVhdGUocmVzdWx0LCB3ZWJraXRDb29r aWVNYW5hZ2VyR2V0QWNjZXB0UG9saWN5Q2FsbGJhY2spKTsKIH0KIAogLyoqCkBAIC0yMjgsMTAg KzIyNiwxMSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRDb29raWVNYW5hZ2VyR2V0RG9tYWluc1dpdGhD b29raWVzQ2FsbGJhY2soV0tBcnJheVJlZiB3a0RvbWFpbgogICAgIGlmIChnX2NhbmNlbGxhYmxl X3NldF9lcnJvcl9pZl9jYW5jZWxsZWQoZGF0YS0+Y2FuY2VsbGFibGUuZ2V0KCksICZlcnJvcikp CiAgICAgICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF90YWtlX2Vycm9yKHJlc3VsdC5nZXQoKSwg ZXJyb3IpOwogICAgIGVsc2UgeworICAgICAgICBJbW11dGFibGVBcnJheSogZG9tYWlucyA9IHRv SW1wbCh3a0RvbWFpbnMpOwogICAgICAgICBkYXRhLT5kb21haW5zID0gYWRvcHRHUmVmKGdfcHRy X2FycmF5X25ld193aXRoX2ZyZWVfZnVuYyhnX2ZyZWUpKTsKLSAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBXS0FycmF5R2V0U2l6ZSh3a0RvbWFpbnMpOyArK2kpIHsKLSAgICAgICAgICAg IFdLU3RyaW5nUmVmIHdrRG9tYWluID0gc3RhdGljX2Nhc3Q8V0tTdHJpbmdSZWY+KFdLQXJyYXlH ZXRJdGVtQXRJbmRleCh3a0RvbWFpbnMsIGkpKTsKLSAgICAgICAgICAgIFN0cmluZyBkb21haW4g PSB0b0ltcGwod2tEb21haW4pLT5zdHJpbmcoKTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBkb21haW5zLT5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgV2ViU3RyaW5nKiBkb21h aW5TdHJpbmcgPSBzdGF0aWNfY2FzdDxXZWJTdHJpbmcqPihkb21haW5zLT5hdChpKSk7CisgICAg ICAgICAgICBTdHJpbmcgZG9tYWluID0gZG9tYWluU3RyaW5nLT5zdHJpbmcoKTsKICAgICAgICAg ICAgIGlmIChkb21haW4uaXNFbXB0eSgpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICAgICAgZ19wdHJfYXJyYXlfYWRkKGRhdGEtPmRvbWFpbnMuZ2V0KCksIGdfc3RyZHVwKGRv bWFpbi51dGY4KCkuZGF0YSgpKSk7CkBAIC0yNjIsNyArMjYxLDcgQEAgdm9pZCB3ZWJraXRfY29v a2llX21hbmFnZXJfZ2V0X2RvbWFpbnNfd2l0aF9jb29raWVzKFdlYktpdENvb2tpZU1hbmFnZXIq IG1hbmFnZXIKICAgICBHZXREb21haW5zV2l0aENvb2tpZXNBc3luY0RhdGEqIGRhdGEgPSBjcmVh dGVHZXREb21haW5zV2l0aENvb2tpZXNBc3luY0RhdGEoKTsKICAgICBkYXRhLT5jYW5jZWxsYWJs ZSA9IGNhbmNlbGxhYmxlOwogICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9zZXRfb3BfcmVzX2dw b2ludGVyKHJlc3VsdCwgZGF0YSwgcmVpbnRlcnByZXRfY2FzdDxHRGVzdHJveU5vdGlmeT4oZGVz dHJveUdldERvbWFpbnNXaXRoQ29va2llc0FzeW5jRGF0YSkpOwotICAgIFdLQ29va2llTWFuYWdl ckdldEhvc3RuYW1lc1dpdGhDb29raWVzKG1hbmFnZXItPnByaXYtPndrQ29va2llTWFuYWdlci5n ZXQoKSwgcmVzdWx0LCB3ZWJraXRDb29raWVNYW5hZ2VyR2V0RG9tYWluc1dpdGhDb29raWVzQ2Fs bGJhY2spOworICAgIG1hbmFnZXItPnByaXYtPndlYkNvb2tpZU1hbmFnZXItPmdldEhvc3RuYW1l c1dpdGhDb29raWVzKEFycmF5Q2FsbGJhY2s6OmNyZWF0ZShyZXN1bHQsIHdlYmtpdENvb2tpZU1h bmFnZXJHZXREb21haW5zV2l0aENvb2tpZXNDYWxsYmFjaykpOwogfQogCiAvKioKQEAgLTMwNSw4 ICszMDQsNyBAQCB2b2lkIHdlYmtpdF9jb29raWVfbWFuYWdlcl9kZWxldGVfY29va2llc19mb3Jf ZG9tYWluKFdlYktpdENvb2tpZU1hbmFnZXIqIG1hbmFnZQogICAgIGdfcmV0dXJuX2lmX2ZhaWwo V0VCS0lUX0lTX0NPT0tJRV9NQU5BR0VSKG1hbmFnZXIpKTsKICAgICBnX3JldHVybl9pZl9mYWls KGRvbWFpbik7CiAKLSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tEb21haW4oQWRvcHRX SywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoZG9tYWluKSk7Ci0gICAgV0tDb29raWVN YW5hZ2VyRGVsZXRlQ29va2llc0Zvckhvc3RuYW1lKG1hbmFnZXItPnByaXYtPndrQ29va2llTWFu YWdlci5nZXQoKSwgd2tEb21haW4uZ2V0KCkpOworICAgIG1hbmFnZXItPnByaXYtPndlYkNvb2tp ZU1hbmFnZXItPmRlbGV0ZUNvb2tpZXNGb3JIb3N0bmFtZShTdHJpbmc6OmZyb21VVEY4KGRvbWFp bikpOwogfQogCiAvKioKQEAgLTMxOSw1ICszMTcsNSBAQCB2b2lkIHdlYmtpdF9jb29raWVfbWFu YWdlcl9kZWxldGVfYWxsX2Nvb2tpZXMoV2ViS2l0Q29va2llTWFuYWdlciogbWFuYWdlcikKIHsK ICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19DT09LSUVfTUFOQUdFUihtYW5hZ2VyKSk7 CiAKLSAgICBXS0Nvb2tpZU1hbmFnZXJEZWxldGVBbGxDb29raWVzKG1hbmFnZXItPnByaXYtPndr Q29va2llTWFuYWdlci5nZXQoKSk7CisgICAgbWFuYWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdl ci0+ZGVsZXRlQWxsQ29va2llcygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29va2llTWFuYWdlclByaXZhdGUuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvb2tpZU1hbmFnZXJQcml2YXRlLmgKaW5kZXgg YTM4N2FmOS4uNTI4ZDFmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0Q29va2llTWFuYWdlclByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyUHJpdmF0ZS5oCkBAIC0yMyw2ICsy Myw4IEBACiAjaW5jbHVkZSAiV2ViS2l0Q29va2llTWFuYWdlci5oIgogI2luY2x1ZGUgIldlYktp dFByaXZhdGUuaCIKIAotV2ViS2l0Q29va2llTWFuYWdlciogd2Via2l0Q29va2llTWFuYWdlckNy ZWF0ZShXS0Nvb2tpZU1hbmFnZXJSZWYpOwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKworV2Vi S2l0Q29va2llTWFuYWdlciogd2Via2l0Q29va2llTWFuYWdlckNyZWF0ZShXZWJDb29raWVNYW5h Z2VyUHJveHkqKTsKIAogI2VuZGlmIC8vIFdlYktpdENvb2tpZU1hbmFnZXJQcml2YXRlX2gKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRl eHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4 dC5jcHAKaW5kZXggYzI2YzU1Zi4uYjAzNmRlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTMxMiw3ICszMTIs NyBAQCBXZWJLaXRDb29raWVNYW5hZ2VyKiB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2Nvb2tpZV9t YW5hZ2VyKFdlYktpdFdlYkNvbnRleHQqIGNvbgogCiAgICAgV2ViS2l0V2ViQ29udGV4dFByaXZh dGUqIHByaXYgPSBjb250ZXh0LT5wcml2OwogICAgIGlmICghcHJpdi0+Y29va2llTWFuYWdlcikK LSAgICAgICAgcHJpdi0+Y29va2llTWFuYWdlciA9IGFkb3B0R1JlZih3ZWJraXRDb29raWVNYW5h Z2VyQ3JlYXRlKHRvQVBJKHByaXYtPmNvbnRleHQtPmNvb2tpZU1hbmFnZXJQcm94eSgpKSkpOwor ICAgICAgICBwcml2LT5jb29raWVNYW5hZ2VyID0gYWRvcHRHUmVmKHdlYmtpdENvb2tpZU1hbmFn ZXJDcmVhdGUocHJpdi0+Y29udGV4dC0+Y29va2llTWFuYWdlclByb3h5KCkpKTsKIAogICAgIHJl dHVybiBwcml2LT5jb29raWVNYW5hZ2VyLmdldCgpOwogfQo=