221251 2021-02-02 02:08:47 -0800 [GTK][WPE] Reduce the use of SoupURI in preparation for libsoup3 2021-02-03 00:30:30 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 220508 1 cgarcia webkit-unassigned aperez berto bugs-noreply ews-watchlist gustavo oldest_to_newest 1724575 0 cgarcia 2021-02-02 02:08:47 -0800 SoupURI is gone in libsoup3. 1724577 1 418976 cgarcia 2021-02-02 02:10:24 -0800 Created attachment 418976 Patch 1724578 2 ews-watchlist 2021-02-02 02:11:02 -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 https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1724641 3 418976 aperez 2021-02-02 06:42:16 -0800 Comment on attachment 418976 Patch Patch LGTM, but please make the style checker happy before landing =) 1725052 4 cgarcia 2021-02-03 00:30:30 -0800 Committed r272301: <https://trac.webkit.org/changeset/272301> 418976 2021-02-02 02:10:24 -0800 2021-02-02 06:42:16 -0800 Patch wk2-soup-uri.diff text/plain 7518 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3YzRjZWVmMzEwNTUuLjgzYTBhZDYwYTFhNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE3IEBACisyMDIxLTAyLTAyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXUEVdIFJlZHVjZSB0aGUgdXNlIG9mIFNvdXBV UkkgaW4gcHJlcGFyYXRpb24gZm9yIGxpYnNvdXAzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEyNTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9BdXRoZW50aWNh dGlvbkNoYWxsZW5nZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJvdGVjdGlvblNwYWNl U2VydmVyVHlwZUZyb21VUkwpOgorICAgICAgICAoV2ViQ29yZTo6cHJvdGVjdGlvblNwYWNlRnJv bVNvdXBBdXRoQW5kVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpwcm90ZWN0 aW9uU3BhY2VTZXJ2ZXJUeXBlRnJvbVVSSSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpw cm90ZWN0aW9uU3BhY2VGcm9tU291cEF1dGhBbmRNZXNzYWdlKTogRGVsZXRlZC4KKwogMjAyMS0w Mi0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1NPVVBdIFN0b3AgdXNpbmcgU291cEJ1ZmZlciBpbiBwcmVwYXJhdGlvbiBmb3IgbGlic291 cDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9BdXRo ZW50aWNhdGlvbkNoYWxsZW5nZVNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlU291cC5jcHAKaW5kZXggNDZkNjAwZmQ4 NDQwLi4wYTg3YmUwMDJiZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvc291cC9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZVNvdXAu Y3BwCkBAIC0zNCwxOCArMzQsMTggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMg UHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZSBwcm90ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlRnJvbVVS SShTb3VwVVJJKiB1cmksIGJvb2wgaXNGb3JQcm94eSkKK3N0YXRpYyBQcm90ZWN0aW9uU3BhY2VT ZXJ2ZXJUeXBlIHByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGVGcm9tVVJMKGNvbnN0IFVSTCYgdXJs LCBib29sIGlzRm9yUHJveHkpCiB7Ci0gICAgaWYgKHVyaS0+c2NoZW1lID09IFNPVVBfVVJJX1ND SEVNRV9IVFRQUykKKyAgICBpZiAodXJsLnByb3RvY29sSXMoImh0dHBzIikpCiAgICAgICAgIHJl dHVybiBpc0ZvclByb3h5ID8gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQUyA6IFByb3RlY3Rpb25T cGFjZVNlcnZlckhUVFBTOwotICAgIGlmICh1cmktPnNjaGVtZSA9PSBTT1VQX1VSSV9TQ0hFTUVf SFRUUCkKKyAgICBpZiAodXJsLnByb3RvY29sSXMoImh0dHAiKSkKICAgICAgICAgcmV0dXJuIGlz Rm9yUHJveHkgPyBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFAgOiBQcm90ZWN0aW9uU3BhY2VTZXJ2 ZXJIVFRQOwotICAgIGlmICh1cmktPnNjaGVtZSA9PSBTT1VQX1VSSV9TQ0hFTUVfRlRQKQorICAg IGlmICh1cmwucHJvdG9jb2xJcygiZnRwIikpCiAgICAgICAgIHJldHVybiBpc0ZvclByb3h5ID8g UHJvdGVjdGlvblNwYWNlUHJveHlGVFAgOiBQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJGVFA7CiAgICAg cmV0dXJuIGlzRm9yUHJveHkgPyBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFAgOiBQcm90ZWN0aW9u U3BhY2VTZXJ2ZXJIVFRQOwogfQogCi1zdGF0aWMgUHJvdGVjdGlvblNwYWNlIHByb3RlY3Rpb25T cGFjZUZyb21Tb3VwQXV0aEFuZE1lc3NhZ2UoU291cEF1dGgqIHNvdXBBdXRoLCBTb3VwTWVzc2Fn ZSogbWVzc2FnZSkKK3N0YXRpYyBQcm90ZWN0aW9uU3BhY2UgcHJvdGVjdGlvblNwYWNlRnJvbVNv dXBBdXRoQW5kVVJMKFNvdXBBdXRoKiBzb3VwQXV0aCwgY29uc3QgVVJMJiB1cmwpCiB7CiAgICAg Y29uc3QgY2hhciogc2NoZW1lTmFtZSA9IHNvdXBfYXV0aF9nZXRfc2NoZW1lX25hbWUoc291cEF1 dGgpOwogICAgIFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lIHNjaGVtZTsKQEAg LTYwLDE0ICs2MCwxMyBAQCBzdGF0aWMgUHJvdGVjdGlvblNwYWNlIHByb3RlY3Rpb25TcGFjZUZy b21Tb3VwQXV0aEFuZE1lc3NhZ2UoU291cEF1dGgqIHNvdXBBdXRoLAogICAgIGVsc2UKICAgICAg ICAgc2NoZW1lID0gUHJvdGVjdGlvblNwYWNlQXV0aGVudGljYXRpb25TY2hlbWVVbmtub3duOwog Ci0gICAgU291cFVSSSogc291cFVSSSA9IHNvdXBfbWVzc2FnZV9nZXRfdXJpKG1lc3NhZ2UpOwot ICAgIHJldHVybiBQcm90ZWN0aW9uU3BhY2UoU3RyaW5nOjpmcm9tVVRGOChzb3VwX3VyaV9nZXRf aG9zdChzb3VwVVJJKSksIHNvdXBfdXJpX2dldF9wb3J0KHNvdXBVUkkpLAotICAgICAgICBwcm90 ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlRnJvbVVSSShzb3VwVVJJLCBzb3VwX2F1dGhfaXNfZm9yX3By b3h5KHNvdXBBdXRoKSksCisgICAgcmV0dXJuIFByb3RlY3Rpb25TcGFjZSh1cmwuaG9zdCgpLnRv U3RyaW5nKCksIHN0YXRpY19jYXN0PGludD4odXJsLnBvcnQoKS52YWx1ZU9yKDApKSwKKyAgICAg ICAgcHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZUZyb21VUkwodXJsLCBzb3VwX2F1dGhfaXNfZm9y X3Byb3h5KHNvdXBBdXRoKSksCiAgICAgICAgIFN0cmluZzo6ZnJvbVVURjgoc291cF9hdXRoX2dl dF9yZWFsbShzb3VwQXV0aCkpLCBzY2hlbWUpOwogfQogCiBBdXRoZW50aWNhdGlvbkNoYWxsZW5n ZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UoU291cE1lc3NhZ2UqIHNvdXBNZXNzYWdlLCBTb3Vw QXV0aCogc291cEF1dGgsIGJvb2wgcmV0cnlpbmcsIEF1dGhlbnRpY2F0aW9uQ2xpZW50KiBjbGll bnQpCi0gICAgOiBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUJhc2UocHJvdGVjdGlvblNwYWNlRnJv bVNvdXBBdXRoQW5kTWVzc2FnZShzb3VwQXV0aCwgc291cE1lc3NhZ2UpLAorICAgIDogQXV0aGVu dGljYXRpb25DaGFsbGVuZ2VCYXNlKHByb3RlY3Rpb25TcGFjZUZyb21Tb3VwQXV0aEFuZFVSTChz b3VwQXV0aCwgc291cFVSSVRvVVJMKHNvdXBfbWVzc2FnZV9nZXRfdXJpKHNvdXBNZXNzYWdlKSkp LAogICAgICAgICBDcmVkZW50aWFsKCksIC8vIHByb3Bvc2VkQ3JlZGVudGlhbHMKICAgICAgICAg cmV0cnlpbmcgPyAxIDogMCwgLy8gcHJldmlvdXNGYWlsdXJlQ291bnQKICAgICAgICAgc291cE1l c3NhZ2UsIC8vIGZhaWx1cmVSZXNwb25zZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAwYzY0NmQxODExMzkuLmI3ZGRl NDhiZWE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wMi0wMiAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBS ZWR1Y2UgdGhlIHVzZSBvZiBTb3VwVVJJIGluIHByZXBhcmF0aW9uIGZvciBsaWJzb3VwMworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMjUxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2dsaWIvV2ViS2l0VVJJU2NoZW1lUmVxdWVzdC5jcHA6CisgICAgICAgICh3ZWJraXRfdXJp X3NjaGVtZV9yZXF1ZXN0X2dldF9zY2hlbWUpOgorICAgICAgICAod2Via2l0X3VyaV9zY2hlbWVf cmVxdWVzdF9nZXRfcGF0aCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFdl YlZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKToKKwogMjAyMS0w Mi0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1NPVVBdIFN0b3AgdXNpbmcgU291cEJ1ZmZlciBpbiBwcmVwYXJhdGlvbiBmb3IgbGlic291 cDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFVS SVNjaGVtZVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdC5jcHAKaW5kZXggNWI2MTQ2ZDk1NDRjLi42N2VjODIzYzI2YTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFVSSVNj aGVtZVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dl YktpdFVSSVNjaGVtZVJlcXVlc3QuY3BwCkBAIC0yNiwxMiArMjYsOSBAQAogI2luY2x1ZGUgIldl YktpdFdlYkNvbnRleHRQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlldy5oIgogI2lu Y2x1ZGUgIldlYlBhZ2VQcm94eS5oIgotI2luY2x1ZGUgPFdlYkNvcmUvR1VuaXF1ZVB0clNvdXAu aD4KICNpbmNsdWRlIDxXZWJDb3JlL0hUVFBQYXJzZXJzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9N SU1FVHlwZVJlZ2lzdHJ5Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+Ci0j aW5jbHVkZSA8V2ViQ29yZS9VUkxTb3VwLmg+Ci0jaW5jbHVkZSA8bGlic291cC9zb3VwLmg+CiAj aW5jbHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL1J1bkxvb3BT b3VyY2VQcmlvcml0eS5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL1dURkdUeXBlLmg+CkBAIC02NCw3 ICs2MSw4IEBAIHN0cnVjdCBfV2ViS2l0VVJJU2NoZW1lUmVxdWVzdFByaXZhdGUgewogCiAgICAg UmVmUHRyPFdlYlBhZ2VQcm94eT4gaW5pdGlhdGluZ1BhZ2U7CiAgICAgQ1N0cmluZyB1cmk7Ci0g ICAgR1VuaXF1ZVB0cjxTb3VwVVJJPiBzb3VwVVJJOworICAgIENTdHJpbmcgdXJpU2NoZW1lOwor ICAgIENTdHJpbmcgdXJpUGF0aDsKIAogICAgIEdSZWZQdHI8R0lucHV0U3RyZWFtPiBzdHJlYW07 CiAgICAgdWludDY0X3Qgc3RyZWFtTGVuZ3RoOwpAQCAtMTA2LDEwICsxMDQsMTAgQEAgY29uc3Qg Y2hhciogd2Via2l0X3VyaV9zY2hlbWVfcmVxdWVzdF9nZXRfc2NoZW1lKFdlYktpdFVSSVNjaGVt ZVJlcXVlc3QqIHJlcXVlc3QKIHsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNf VVJJX1NDSEVNRV9SRVFVRVNUKHJlcXVlc3QpLCBudWxscHRyKTsKIAotICAgIGlmICghcmVxdWVz dC0+cHJpdi0+c291cFVSSSkKLSAgICAgICAgcmVxdWVzdC0+cHJpdi0+c291cFVSSSA9IHVybFRv U291cFVSSShyZXF1ZXN0LT5wcml2LT50YXNrLT5yZXF1ZXN0KCkudXJsKCkpOworICAgIGlmIChy ZXF1ZXN0LT5wcml2LT51cmlTY2hlbWUuaXNOdWxsKCkpCisgICAgICAgIHJlcXVlc3QtPnByaXYt PnVyaVNjaGVtZSA9IHJlcXVlc3QtPnByaXYtPnRhc2stPnJlcXVlc3QoKS51cmwoKS5wcm90b2Nv bCgpLnRvU3RyaW5nKCkudXRmOCgpOwogCi0gICAgcmV0dXJuIHJlcXVlc3QtPnByaXYtPnNvdXBV UkktPnNjaGVtZTsKKyAgICByZXR1cm4gcmVxdWVzdC0+cHJpdi0+dXJpU2NoZW1lLmRhdGEoKTsK IH0KIAogLyoqCkBAIC0xNDIsMTAgKzE0MCwxMCBAQCBjb25zdCBjaGFyKiB3ZWJraXRfdXJpX3Nj aGVtZV9yZXF1ZXN0X2dldF9wYXRoKFdlYktpdFVSSVNjaGVtZVJlcXVlc3QqIHJlcXVlc3QpCiB7 CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1VSSV9TQ0hFTUVfUkVRVUVTVChy ZXF1ZXN0KSwgbnVsbHB0cik7CiAKLSAgICBpZiAoIXJlcXVlc3QtPnByaXYtPnNvdXBVUkkpCi0g ICAgICAgIHJlcXVlc3QtPnByaXYtPnNvdXBVUkkgPSB1cmxUb1NvdXBVUkkocmVxdWVzdC0+cHJp di0+dGFzay0+cmVxdWVzdCgpLnVybCgpKTsKKyAgICBpZiAocmVxdWVzdC0+cHJpdi0+dXJpUGF0 aC5pc051bGwoKSkKKyAgICAgICAgcmVxdWVzdC0+cHJpdi0+dXJpUGF0aCA9IHJlcXVlc3QtPnBy aXYtPnRhc2stPnJlcXVlc3QoKS51cmwoKS5wYXRoKCkudG9TdHJpbmcoKS51dGY4KCk7CiAKLSAg ICByZXR1cm4gcmVxdWVzdC0+cHJpdi0+c291cFVSSS0+cGF0aDsKKyAgICByZXR1cm4gcmVxdWVz dC0+cHJpdi0+dXJpUGF0aC5kYXRhKCk7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCAzMzI5NjI0OGRmNGMu LmUwODFmMTAyOWE5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2ds aWIvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2ds aWIvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTcxLDEyICs3MSwxMSBAQAogI2luY2x1ZGUgPEphdmFT Y3JpcHRDb3JlL0pTUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8anNjL0pTQ0NvbnRleHRQcml2YXRl Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9DZXJ0aWZpY2F0ZUluZm8uaD4KLSNpbmNsdWRlIDxXZWJD b3JlL0dVbmlxdWVQdHJTb3VwLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9KU0RPTUV4Y2VwdGlvbkhh bmRsaW5nLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybVNjcmVlbi5oPgogI2luY2x1ZGUg PFdlYkNvcmUvUmVmUHRyQ2Fpcm8uaD4KLSNpbmNsdWRlIDxXZWJDb3JlL1VSTFNvdXAuaD4KICNp bmNsdWRlIDxnbGliL2dpMThuLWxpYi5oPgorI2luY2x1ZGUgPGxpYnNvdXAvc291cC5oPgogI2lu Y2x1ZGUgPHd0Zi9TZXRGb3JTY29wZS5oPgogI2luY2x1ZGUgPHd0Zi9VUkwuaD4KICNpbmNsdWRl IDx3dGYvZ2xpYi9HUmVmUHRyLmg+CkBAIC0zMDIwLDggKzMwMTksNyBAQCB2b2lkIHdlYmtpdF93 ZWJfdmlld19sb2FkX3VyaShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBnY2hhciogdXJp KQogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpKTsKICAg ICBnX3JldHVybl9pZl9mYWlsKHVyaSk7CiAKLSAgICBHVW5pcXVlUHRyPFNvdXBVUkk+IHNvdXBV Ukkoc291cF91cmlfbmV3KHVyaSkpOwotICAgIGdldFBhZ2Uod2ViVmlldykubG9hZFJlcXVlc3Qo c291cFVSSVRvVVJMKHNvdXBVUkkuZ2V0KCkpKTsKKyAgICBnZXRQYWdlKHdlYlZpZXcpLmxvYWRS ZXF1ZXN0KFVSTCh7IH0sIFN0cmluZzo6ZnJvbVVURjgodXJpKSkpOwogfQogCiAvKioK