117157 2013-06-03 09:15:13 -0700 [GTK][SOUP] Migrate SoupRequestManager to GTask 2013-06-19 00:34:27 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Soup P2 Normal --- 117149 1 cgarcia webkit-unassigned cdumez danw gustavo laszlo.gombos xan.lopez oldest_to_newest 896487 0 cgarcia 2013-06-03 09:15:13 -0700 Migrate SoupRequestManager to GTask 896489 1 203602 cgarcia 2013-06-03 09:19:18 -0700 Created attachment 203602 Patch 897176 2 203602 cdumez 2013-06-05 01:14:49 -0700 Comment on attachment 203602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203602&action=review > Source/WebKit2/ChangeLog:7 > + Could you please explain in the Changelog why we are migrating to GTask? 901244 3 203602 gustavo 2013-06-17 20:18:19 -0700 Comment on attachment 203602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203602&action=review I kept wondering if we could do away with the data struct like you did on the other patch, but I don't think there's a lot to gain here. >> Source/WebKit2/ChangeLog:7 >> + > > Could you please explain in the Changelog why we are migrating to GTask? ++ 901679 4 cgarcia 2013-06-19 00:32:25 -0700 (In reply to comment #3) > (From update of attachment 203602 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=203602&action=review > > I kept wondering if we could do away with the data struct like you did on the other patch, but I don't think there's a lot to gain here. In this case the AsyncData struct is not only for the GTask async operation but for the whole custom uri scheme operation. Note that this data struct is not set as task data, but it contains the GTask that is released (see releaseTask) when it finishes. > >> Source/WebKit2/ChangeLog:7 > >> + > > > > Could you please explain in the Changelog why we are migrating to GTask? > > ++ 901681 5 cgarcia 2013-06-19 00:34:27 -0700 Committed r151726: <http://trac.webkit.org/changeset/151726> 203602 2013-06-03 09:19:18 -0700 2013-06-17 20:18:19 -0700 Patch wk2-gtask-soup-custom-uris.diff text/plain 9512 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjZGIwZmU2Li5lMjZlZWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQg QEAKIDIwMTMtMDYtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdW1NPVVBdIE1pZ3JhdGUgU291cFJlcXVlc3RNYW5hZ2VyIHRvIEdU YXNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcx NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl YlByb2Nlc3Mvc291cC9XZWJLaXRTb3VwUmVxdWVzdEdlbmVyaWMuY3BwOgorICAgICAgICAod2Vi a2l0U291cFJlcXVlc3RHZW5lcmljU2VuZEFzeW5jKToKKyAgICAgICAgKHdlYmtpdFNvdXBSZXF1 ZXN0R2VuZXJpY1NlbmRGaW5pc2gpOgorICAgICAgICAqIFdlYlByb2Nlc3Mvc291cC9XZWJTb3Vw UmVxdWVzdE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTb3VwUmVxdWVzdEFzeW5j RGF0YTo6V2ViU291cFJlcXVlc3RBc3luY0RhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJTb3Vw UmVxdWVzdEFzeW5jRGF0YTo6cmVsZWFzZVRhc2spOgorICAgICAgICAoV2ViS2l0OjpXZWJTb3Vw UmVxdWVzdE1hbmFnZXI6OmRpZEhhbmRsZVVSSVJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpX ZWJTb3VwUmVxdWVzdE1hbmFnZXI6OmRpZEZhaWxVUklSZXF1ZXN0KToKKyAgICAgICAgKFdlYktp dDo6V2ViU291cFJlcXVlc3RNYW5hZ2VyOjpzZW5kKToKKyAgICAgICAgKFdlYktpdDo6V2ViU291 cFJlcXVlc3RNYW5hZ2VyOjpmaW5pc2gpOgorICAgICAgICAqIFdlYlByb2Nlc3Mvc291cC9XZWJT b3VwUmVxdWVzdE1hbmFnZXIuaDoKKworMjAxMy0wNi0wMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gTWlncmF0ZSBXZWJLaXRGYXZp Y29uRGF0YWJhc2UgdG8gR1Rhc2sKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNzE1NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL3NvdXAvV2ViS2l0U291cFJlcXVlc3RHZW5lcmljLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3Mvc291cC9XZWJLaXRTb3VwUmVxdWVzdEdlbmVyaWMuY3BwCmluZGV4IDI0OTJkYTYu LjQxNjFiZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9XZWJL aXRTb3VwUmVxdWVzdEdlbmVyaWMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv c291cC9XZWJLaXRTb3VwUmVxdWVzdEdlbmVyaWMuY3BwCkBAIC00OCwxOSArNDgsMTMgQEAgc3Rh dGljIHZvaWQgd2Via2l0X3NvdXBfcmVxdWVzdF9nZW5lcmljX2luaXQoV2ViS2l0U291cFJlcXVl c3RHZW5lcmljKiByZXF1ZXN0KQogCiBzdGF0aWMgdm9pZCB3ZWJraXRTb3VwUmVxdWVzdEdlbmVy aWNTZW5kQXN5bmMoU291cFJlcXVlc3QqIHJlcXVlc3QsIEdDYW5jZWxsYWJsZSogY2FuY2VsbGFi bGUsIEdBc3luY1JlYWR5Q2FsbGJhY2sgY2FsbGJhY2ssIGdwb2ludGVyIHVzZXJEYXRhKQogewot ICAgIEdTaW1wbGVBc3luY1Jlc3VsdCogcmVzdWx0ID0gZ19zaW1wbGVfYXN5bmNfcmVzdWx0X25l dyhHX09CSkVDVChyZXF1ZXN0KSwgY2FsbGJhY2ssIHVzZXJEYXRhLCByZWludGVycHJldF9jYXN0 PHZvaWQqPih3ZWJraXRTb3VwUmVxdWVzdEdlbmVyaWNTZW5kQXN5bmMpKTsKLSAgICBXZWJQcm9j ZXNzOjpzaGFyZWQoKS5zdXBwbGVtZW50PFdlYlNvdXBSZXF1ZXN0TWFuYWdlcj4oKS0+c2VuZChy ZXN1bHQsIGNhbmNlbGxhYmxlKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5zdXBwbGVtZW50 PFdlYlNvdXBSZXF1ZXN0TWFuYWdlcj4oKS0+c2VuZChnX3Rhc2tfbmV3KHJlcXVlc3QsIGNhbmNl bGxhYmxlLCBjYWxsYmFjaywgdXNlckRhdGEpKTsKIH0KIAotc3RhdGljIEdJbnB1dFN0cmVhbSog d2Via2l0U291cFJlcXVlc3RHZW5lcmljU2VuZEZpbmlzaChTb3VwUmVxdWVzdCosIEdBc3luY1Jl c3VsdCogcmVzdWx0LCBHRXJyb3IqKiBlcnJvcikKK3N0YXRpYyBHSW5wdXRTdHJlYW0qIHdlYmtp dFNvdXBSZXF1ZXN0R2VuZXJpY1NlbmRGaW5pc2goU291cFJlcXVlc3QqIHJlcXVlc3QsIEdBc3lu Y1Jlc3VsdCogcmVzdWx0LCBHRXJyb3IqKiBlcnJvcikKIHsKLSAgICBHU2ltcGxlQXN5bmNSZXN1 bHQqIHNpbXBsZVJlc3VsdCA9IEdfU0lNUExFX0FTWU5DX1JFU1VMVChyZXN1bHQpOwotICAgIGdf d2Fybl9pZl9mYWlsKGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9nZXRfc291cmNlX3RhZyhzaW1wbGVS ZXN1bHQpID09IHdlYmtpdFNvdXBSZXF1ZXN0R2VuZXJpY1NlbmRBc3luYyk7Ci0KLSAgICBpZiAo Z19zaW1wbGVfYXN5bmNfcmVzdWx0X3Byb3BhZ2F0ZV9lcnJvcihzaW1wbGVSZXN1bHQsIGVycm9y KSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICByZXR1cm4gV2ViUHJvY2Vzczo6c2hhcmVkKCku c3VwcGxlbWVudDxXZWJTb3VwUmVxdWVzdE1hbmFnZXI+KCktPmZpbmlzaChzaW1wbGVSZXN1bHQp OworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKGdfdGFza19pc192YWxpZChyZXN1bHQsIHJlcXVl c3QpLCAwKTsKKyAgICByZXR1cm4gV2ViUHJvY2Vzczo6c2hhcmVkKCkuc3VwcGxlbWVudDxXZWJT b3VwUmVxdWVzdE1hbmFnZXI+KCktPmZpbmlzaChHX1RBU0socmVzdWx0KSwgZXJyb3IpOwogfQog CiBzdGF0aWMgZ29mZnNldCB3ZWJraXRTb3VwUmVxdWVzdEdlbmVyaWNHZXRDb250ZW50TGVuZ3Ro KFNvdXBSZXF1ZXN0KiByZXF1ZXN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9zb3VwL1dlYlNvdXBSZXF1ZXN0TWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL3NvdXAvV2ViU291cFJlcXVlc3RNYW5hZ2VyLmNwcAppbmRleCA0MjUxODI0Li4yMGY5 ZWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViU291cFJl cXVlc3RNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2Vi U291cFJlcXVlc3RNYW5hZ2VyLmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQg KEMpIDIwMTIgSWdhbGlhIFMuTC4KKyAqIENvcHlyaWdodCAoQykgMjAxMiwgMjAxMyBJZ2FsaWEg Uy5MLgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlz dHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdO VSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC00MiwxMCArNDIsMTAgQEAgc3RhdGljIHVpbnQ2 NF90IGdlbmVyYXRlU291cFJlcXVlc3RJRCgpCiB9CiAKIHN0cnVjdCBXZWJTb3VwUmVxdWVzdEFz eW5jRGF0YSB7Ci0gICAgV2ViU291cFJlcXVlc3RBc3luY0RhdGEoR1NpbXBsZUFzeW5jUmVzdWx0 KiByZXN1bHQsIFdlYktpdFNvdXBSZXF1ZXN0R2VuZXJpYyogcmVxdWVzdEdlbmVyaWMsIEdDYW5j ZWxsYWJsZSogY2FuY2VsbGFibGUpCi0gICAgICAgIDogcmVzdWx0KHJlc3VsdCkKKyAgICBXZWJT b3VwUmVxdWVzdEFzeW5jRGF0YShHVGFzayogdGFzaywgV2ViS2l0U291cFJlcXVlc3RHZW5lcmlj KiByZXF1ZXN0R2VuZXJpYykKKyAgICAgICAgOiB0YXNrKHRhc2spCiAgICAgICAgICwgcmVxdWVz dChyZXF1ZXN0R2VuZXJpYykKLSAgICAgICAgLCBjYW5jZWxsYWJsZShjYW5jZWxsYWJsZSkKKyAg ICAgICAgLCBjYW5jZWxsYWJsZShnX3Rhc2tfZ2V0X2NhbmNlbGxhYmxlKHRhc2spKQogICAgIHsK ICAgICAgICAgLy8gSWYgdGhlIHN0cnVjdCBjb250YWlucyBhIG51bGwgcmVxdWVzdCwgaXQgaXMg YmVjYXVzZSB0aGUgcmVxdWVzdCBmYWlsZWQuCiAgICAgICAgIGdfb2JqZWN0X2FkZF93ZWFrX3Bv aW50ZXIoR19PQkpFQ1QocmVxdWVzdCksIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmcmVxdWVz dCkpOwpAQCAtNjIsMTQgKzYyLDE0IEBAIHN0cnVjdCBXZWJTb3VwUmVxdWVzdEFzeW5jRGF0YSB7 CiAgICAgICAgIHJldHVybiBnX2NhbmNlbGxhYmxlX2lzX2NhbmNlbGxlZChjYW5jZWxsYWJsZS5n ZXQoKSkgfHwgIXJlcXVlc3Q7CiAgICAgfQogCi0gICAgR1JlZlB0cjxHU2ltcGxlQXN5bmNSZXN1 bHQ+IHJlbGVhc2VSZXN1bHQoKQorICAgIEdSZWZQdHI8R1Rhc2s+IHJlbGVhc2VUYXNrKCkKICAg ICB7Ci0gICAgICAgIEdTaW1wbGVBc3luY1Jlc3VsdCogcmV0dXJuVmFsdWUgPSByZXN1bHQ7Ci0g ICAgICAgIHJlc3VsdCA9IDA7CisgICAgICAgIEdUYXNrKiByZXR1cm5WYWx1ZSA9IHRhc2s7Cisg ICAgICAgIHRhc2sgPSAwOwogICAgICAgICByZXR1cm4gYWRvcHRHUmVmKHJldHVyblZhbHVlKTsK ICAgICB9CiAKLSAgICBHU2ltcGxlQXN5bmNSZXN1bHQqIHJlc3VsdDsKKyAgICBHVGFzayogdGFz azsKICAgICBXZWJLaXRTb3VwUmVxdWVzdEdlbmVyaWMqIHJlcXVlc3Q7CiAgICAgR1JlZlB0cjxH Q2FuY2VsbGFibGU+IGNhbmNlbGxhYmxlOwogICAgIEdSZWZQdHI8R0lucHV0U3RyZWFtPiBzdHJl YW07CkBAIC0xMDgsMTIgKzEwOCwxMiBAQCB2b2lkIFdlYlNvdXBSZXF1ZXN0TWFuYWdlcjo6ZGlk SGFuZGxlVVJJUmVxdWVzdChjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJiByZQogewogICAg IFdlYlNvdXBSZXF1ZXN0QXN5bmNEYXRhKiBkYXRhID0gbV9yZXF1ZXN0TWFwLmdldChyZXF1ZXN0 SUQpOwogICAgIEFTU0VSVChkYXRhKTsKLSAgICBHUmVmUHRyPEdTaW1wbGVBc3luY1Jlc3VsdD4g cmVzdWx0ID0gZGF0YS0+cmVsZWFzZVJlc3VsdCgpOwotICAgIEFTU0VSVChyZXN1bHQuZ2V0KCkp OworICAgIEdSZWZQdHI8R1Rhc2s+IHRhc2sgPSBkYXRhLT5yZWxlYXNlVGFzaygpOworICAgIEFT U0VSVCh0YXNrLmdldCgpKTsKIAotICAgIEdSZWZQdHI8V2ViS2l0U291cFJlcXVlc3RHZW5lcmlj PiByZXF1ZXN0ID0gYWRvcHRHUmVmKFdFQktJVF9TT1VQX1JFUVVFU1RfR0VORVJJQyhnX2FzeW5j X3Jlc3VsdF9nZXRfc291cmNlX29iamVjdChHX0FTWU5DX1JFU1VMVChyZXN1bHQuZ2V0KCkpKSkp OwotICAgIHdlYmtpdFNvdXBSZXF1ZXN0R2VuZXJpY1NldENvbnRlbnRMZW5ndGgocmVxdWVzdC5n ZXQoKSwgY29udGVudExlbmd0aCA/IGNvbnRlbnRMZW5ndGggOiAtMSk7Ci0gICAgd2Via2l0U291 cFJlcXVlc3RHZW5lcmljU2V0Q29udGVudFR5cGUocmVxdWVzdC5nZXQoKSwgIW1pbWVUeXBlLmlz RW1wdHkoKSA/IG1pbWVUeXBlLnV0ZjgoKS5kYXRhKCkgOiAwKTsKKyAgICBXZWJLaXRTb3VwUmVx dWVzdEdlbmVyaWMqIHJlcXVlc3QgPSBXRUJLSVRfU09VUF9SRVFVRVNUX0dFTkVSSUMoZ190YXNr X2dldF9zb3VyY2Vfb2JqZWN0KHRhc2suZ2V0KCkpKTsKKyAgICB3ZWJraXRTb3VwUmVxdWVzdEdl bmVyaWNTZXRDb250ZW50TGVuZ3RoKHJlcXVlc3QsIGNvbnRlbnRMZW5ndGggPyBjb250ZW50TGVu Z3RoIDogLTEpOworICAgIHdlYmtpdFNvdXBSZXF1ZXN0R2VuZXJpY1NldENvbnRlbnRUeXBlKHJl cXVlc3QsICFtaW1lVHlwZS5pc0VtcHR5KCkgPyBtaW1lVHlwZS51dGY4KCkuZGF0YSgpIDogMCk7 CiAKICAgICBHSW5wdXRTdHJlYW0qIGRhdGFTdHJlYW07CiAgICAgaWYgKCFyZXF1ZXN0RGF0YS5z aXplKCkpIHsKQEAgLTEzMCw4ICsxMzAsNyBAQCB2b2lkIFdlYlNvdXBSZXF1ZXN0TWFuYWdlcjo6 ZGlkSGFuZGxlVVJJUmVxdWVzdChjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJiByZQogICAg ICAgICBkYXRhLT5zdHJlYW0gPSBkYXRhU3RyZWFtOwogICAgICAgICB3ZWJraXRTb3VwUmVxdWVz dElucHV0U3RyZWFtQWRkRGF0YShXRUJLSVRfU09VUF9SRVFVRVNUX0lOUFVUX1NUUkVBTShkYXRh U3RyZWFtKSwgcmVxdWVzdERhdGEuZGF0YSgpLCByZXF1ZXN0RGF0YS5zaXplKCkpOwogICAgIH0K LSAgICBnX3NpbXBsZV9hc3luY19yZXN1bHRfc2V0X29wX3Jlc19ncG9pbnRlcihyZXN1bHQuZ2V0 KCksIGRhdGFTdHJlYW0sIGdfb2JqZWN0X3VucmVmKTsKLSAgICBnX3NpbXBsZV9hc3luY19yZXN1 bHRfY29tcGxldGUocmVzdWx0LmdldCgpKTsKKyAgICBnX3Rhc2tfcmV0dXJuX3BvaW50ZXIodGFz ay5nZXQoKSwgZGF0YVN0cmVhbSwgZ19vYmplY3RfdW5yZWYpOwogfQogCiB2b2lkIFdlYlNvdXBS ZXF1ZXN0TWFuYWdlcjo6ZGlkUmVjZWl2ZVVSSVJlcXVlc3REYXRhKGNvbnN0IENvcmVJUEM6OkRh dGFSZWZlcmVuY2UmIHJlcXVlc3REYXRhLCB1aW50NjRfdCByZXF1ZXN0SUQpCkBAIC0xNjQsMzQg KzE2MywzMSBAQCB2b2lkIFdlYlNvdXBSZXF1ZXN0TWFuYWdlcjo6ZGlkRmFpbFVSSVJlcXVlc3Qo Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJybwogewogICAgIFdlYlNvdXBSZXF1ZXN0 QXN5bmNEYXRhKiBkYXRhID0gbV9yZXF1ZXN0TWFwLmdldChyZXF1ZXN0SUQpOwogICAgIEFTU0VS VChkYXRhKTsKLSAgICBHUmVmUHRyPEdTaW1wbGVBc3luY1Jlc3VsdD4gcmVzdWx0ID0gZGF0YS0+ cmVsZWFzZVJlc3VsdCgpOwotICAgIEFTU0VSVChyZXN1bHQuZ2V0KCkpOwotCi0gICAgZ19zaW1w bGVfYXN5bmNfcmVzdWx0X3Rha2VfZXJyb3IocmVzdWx0LmdldCgpLAotICAgICAgICBnX2Vycm9y X25ld19saXRlcmFsKGdfcXVhcmtfZnJvbV9zdHJpbmcoZXJyb3IuZG9tYWluKCkudXRmOCgpLmRh dGEoKSksCi0gICAgICAgICAgICBlcnJvci5lcnJvckNvZGUoKSwKLSAgICAgICAgICAgIGVycm9y LmxvY2FsaXplZERlc2NyaXB0aW9uKCkudXRmOCgpLmRhdGEoKSkpOwotICAgIGdfc2ltcGxlX2Fz eW5jX3Jlc3VsdF9jb21wbGV0ZShyZXN1bHQuZ2V0KCkpOworICAgIEdSZWZQdHI8R1Rhc2s+IHRh c2sgPSBkYXRhLT5yZWxlYXNlVGFzaygpOworICAgIEFTU0VSVCh0YXNrLmdldCgpKTsKIAorICAg IGdfdGFza19yZXR1cm5fbmV3X2Vycm9yKHRhc2suZ2V0KCksIGdfcXVhcmtfZnJvbV9zdHJpbmco ZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSksCisgICAgICAgIGVycm9yLmVycm9yQ29kZSgp LCAiJXMiLCBlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpLnV0ZjgoKS5kYXRhKCkpOwogICAg IG1fcmVxdWVzdE1hcC5yZW1vdmUocmVxdWVzdElEKTsKIH0KIAotdm9pZCBXZWJTb3VwUmVxdWVz dE1hbmFnZXI6OnNlbmQoR1NpbXBsZUFzeW5jUmVzdWx0KiByZXN1bHQsIEdDYW5jZWxsYWJsZSog Y2FuY2VsbGFibGUpCit2b2lkIFdlYlNvdXBSZXF1ZXN0TWFuYWdlcjo6c2VuZChHVGFzayogdGFz aykKIHsKLSAgICBHUmVmUHRyPFdlYktpdFNvdXBSZXF1ZXN0R2VuZXJpYz4gcmVxdWVzdCA9IGFk b3B0R1JlZihXRUJLSVRfU09VUF9SRVFVRVNUX0dFTkVSSUMoZ19hc3luY19yZXN1bHRfZ2V0X3Nv dXJjZV9vYmplY3QoR19BU1lOQ19SRVNVTFQocmVzdWx0KSkpKTsKLSAgICBTb3VwUmVxdWVzdCog c291cFJlcXVlc3QgPSBTT1VQX1JFUVVFU1QocmVxdWVzdC5nZXQoKSk7CisgICAgV2ViS2l0U291 cFJlcXVlc3RHZW5lcmljKiByZXF1ZXN0ID0gV0VCS0lUX1NPVVBfUkVRVUVTVF9HRU5FUklDKGdf dGFza19nZXRfc291cmNlX29iamVjdCh0YXNrKSk7CisgICAgU291cFJlcXVlc3QqIHNvdXBSZXF1 ZXN0ID0gU09VUF9SRVFVRVNUKHJlcXVlc3QpOwogICAgIEdPd25QdHI8Y2hhcj4gdXJpU3RyaW5n KHNvdXBfdXJpX3RvX3N0cmluZyhzb3VwX3JlcXVlc3RfZ2V0X3VyaShzb3VwUmVxdWVzdCksIEZB TFNFKSk7CiAKICAgICB1aW50NjRfdCByZXF1ZXN0SUQgPSBnZW5lcmF0ZVNvdXBSZXF1ZXN0SUQo KTsKLSAgICBtX3JlcXVlc3RNYXAuc2V0KHJlcXVlc3RJRCwgYWRvcHRQdHIobmV3IFdlYlNvdXBS ZXF1ZXN0QXN5bmNEYXRhKHJlc3VsdCwgcmVxdWVzdC5nZXQoKSwgY2FuY2VsbGFibGUpKSk7Cisg ICAgbV9yZXF1ZXN0TWFwLnNldChyZXF1ZXN0SUQsIGFkb3B0UHRyKG5ldyBXZWJTb3VwUmVxdWVz dEFzeW5jRGF0YSh0YXNrLCByZXF1ZXN0KSkpOwogCiAgICAgdWludDY0X3QgaW5pdGlhdGluZ1Bh Z2VJRCA9IFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpnZXRTb3VwUmVxdWVzdEluaXRpYXRpbmdQ YWdlSUQoc291cFJlcXVlc3QpOwogICAgIG1fcHJvY2Vzcy0+cGFyZW50UHJvY2Vzc0Nvbm5lY3Rp b24oKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRSZWNlaXZlVVJJUmVxdWVzdChT dHJpbmc6OmZyb21VVEY4KHVyaVN0cmluZy5nZXQoKSksIHJlcXVlc3RJRCksIGluaXRpYXRpbmdQ YWdlSUQpOwogfQogCi1HSW5wdXRTdHJlYW0qIFdlYlNvdXBSZXF1ZXN0TWFuYWdlcjo6ZmluaXNo KEdTaW1wbGVBc3luY1Jlc3VsdCogcmVzdWx0KQorR0lucHV0U3RyZWFtKiBXZWJTb3VwUmVxdWVz dE1hbmFnZXI6OmZpbmlzaChHVGFzayogdGFzaywgR0Vycm9yKiogZXJyb3IpCiB7Ci0gICAgcmV0 dXJuIEdfSU5QVVRfU1RSRUFNKGdfb2JqZWN0X3JlZihnX3NpbXBsZV9hc3luY19yZXN1bHRfZ2V0 X29wX3Jlc19ncG9pbnRlcihyZXN1bHQpKSk7CisgICAgZ3BvaW50ZXIgaW5wdXRTdHJlYW0gPSBn X3Rhc2tfcHJvcGFnYXRlX3BvaW50ZXIodGFzaywgZXJyb3IpOworICAgIHJldHVybiBpbnB1dFN0 cmVhbSA/IEdfSU5QVVRfU1RSRUFNKGlucHV0U3RyZWFtKSA6IDA7CiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dl YlNvdXBSZXF1ZXN0TWFuYWdlci5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9zb3VwL1dl YlNvdXBSZXF1ZXN0TWFuYWdlci5oCmluZGV4IDZjYTdlYzguLmM2ZGU0NDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mvc291cC9XZWJTb3VwUmVxdWVzdE1hbmFnZXIuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3NvdXAvV2ViU291cFJlcXVlc3RNYW5hZ2Vy LmgKQEAgLTMxLDcgKzMxLDcgQEAKICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAog dHlwZWRlZiBzdHJ1Y3QgX0dJbnB1dFN0cmVhbSBHSW5wdXRTdHJlYW07Ci10eXBlZGVmIHN0cnVj dCBfR1NpbXBsZUFzeW5jUmVzdWx0IEdTaW1wbGVBc3luY1Jlc3VsdDsKK3R5cGVkZWYgc3RydWN0 IF9HVGFzayBHVGFzazsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTQ2LDggKzQ2LDggQEAg cHVibGljOgogCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIHN1cHBsZW1lbnROYW1lKCk7CiAKLSAg ICB2b2lkIHNlbmQoR1NpbXBsZUFzeW5jUmVzdWx0KiwgR0NhbmNlbGxhYmxlKik7Ci0gICAgR0lu cHV0U3RyZWFtKiBmaW5pc2goR1NpbXBsZUFzeW5jUmVzdWx0Kik7CisgICAgdm9pZCBzZW5kKEdU YXNrKik7CisgICAgR0lucHV0U3RyZWFtKiBmaW5pc2goR1Rhc2sqLCBHRXJyb3IqKik7CiAKICAg ICB2b2lkIHJlZ2lzdGVyVVJJU2NoZW1lKGNvbnN0IFN0cmluZyYgc2NoZW1lKTsKIAo=