193444 2019-01-15 06:20:04 -0800 [SOUP] Remove usage of NetworkProcess::singleton() 2019-02-05 08:03:38 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 csaavedra csaavedra achristensen basuke bugs-noreply mcatanzaro webkit-bug-importer oldest_to_newest 1494607 0 csaavedra 2019-01-15 06:20:04 -0800 [SOUP] Remove usage of NetworkProcess::singleton() 1494608 1 359158 csaavedra 2019-01-15 06:20:32 -0800 Created attachment 359158 Patch 1494897 2 achristensen 2019-01-15 16:37:23 -0800 http://trac.webkit.org/r240019 This is a step in the right direction. Thanks! We should still move the soup things from NetworkProcessCreationParameters to NetworkSessionCreationParameters, and keep in mind the WebsiteDataStoreParameters member of NetworkProcessCreationParameters is going to eventually be detached. 1494899 3 achristensen 2019-01-15 16:39:27 -0800 Also, is GTK still using anything in LegacyCustomProtocolManager? It would be great if we could remove that. 1494989 4 mcatanzaro 2019-01-15 19:36:15 -0800 That's used in webkitWebContextStartLoadingCustomProtocol and webkitWebContextStopLoadingCustomProtocol in WebKitWebContext.cpp. It's also used in WebKitCustomProtocolManagerClient.[cpp,h], but I guess that class probably disappears if LegacyCustomProtocolManager is removed. I think those are the only places. Not sure how much effort to replace, though; there's a lot of code in LegacyCustomProtocolManagerSoup. Worth a separate bug report to sort this out. 359158 2019-01-15 06:20:32 -0800 2019-01-15 12:45:12 -0800 Patch bug-193444-20190115162031.patch text/plain 4197 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIxNTgwZmMwNThiNTM3ZWQx YWRlNWY3NTJlMzE3NjZmY2UzYmQ0MDEuLjg1ZDllMDU2Yzk0MDJkMGQ4MGM4ZGRmYzZkZmYxZDMw YzQyZDU1M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDEtMTUgIENsYXVkaW8g U2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0gUmVtb3Zl IHVzYWdlIG9mIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNDQ0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdv cmtEYXRhVGFza1NvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tTb3Vw Ojpkb3dubG9hZCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza1NvdXA6OmRpZFdy aXRlRG93bmxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2tTb3VwOjpkaWRG aW5pc2hEb3dubG9hZCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza1NvdXA6OmRp ZEZhaWxEb3dubG9hZCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vz c2lvblNvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvblNvdXA6Ok5ldHdv cmtTZXNzaW9uU291cCk6CisKIDIwMTktMDEtMTQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0 ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBTcGxpdCBoZWFkZXJWYWx1ZUZvclZhcnkgaW50 byBzcGVjaWFsaXplZCBmdW5jdGlvbnMgZm9yIE5ldHdvcmtQcm9jZXNzIGFuZCBXZWJQcm9jZXNz L1dlYktpdExlZ2FjeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z b3VwL05ldHdvcmtEYXRhVGFza1NvdXAuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9zb3VwL05ldHdvcmtEYXRhVGFza1NvdXAuY3BwCmluZGV4IDhlYTM1Njc2YmYwNGM5OTMyMTNl N2NkYmJlZmYyMzhhMTNlYWE5NTYuLmE1NzllZmE4YTZjMzVhZGMxNjIxYWU1YmIyOGM3Y2FiMDlm ZWI4ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3 b3JrRGF0YVRhc2tTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3Nv dXAvTmV0d29ya0RhdGFUYXNrU291cC5jcHAKQEAgLTkwNyw3ICs5MDcsNyBAQCB2b2lkIE5ldHdv cmtEYXRhVGFza1NvdXA6OmRvd25sb2FkKCkKICAgICB9CiAgICAgbV9kb3dubG9hZE91dHB1dFN0 cmVhbSA9IGFkb3B0R1JlZihHX09VVFBVVF9TVFJFQU0ob3V0cHV0U3RyZWFtLmxlYWtSZWYoKSkp OwogCi0gICAgYXV0byYgZG93bmxvYWRNYW5hZ2VyID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRv bigpLmRvd25sb2FkTWFuYWdlcigpOworICAgIGF1dG8mIGRvd25sb2FkTWFuYWdlciA9IG1fc2Vz c2lvbi0+bmV0d29ya1Byb2Nlc3MoKS5kb3dubG9hZE1hbmFnZXIoKTsKICAgICBhdXRvIGRvd25s b2FkID0gc3RkOjptYWtlX3VuaXF1ZTxEb3dubG9hZD4oZG93bmxvYWRNYW5hZ2VyLCBtX3BlbmRp bmdEb3dubG9hZElELCAqdGhpcywgbV9zZXNzaW9uLT5zZXNzaW9uSUQoKSwgc3VnZ2VzdGVkRmls ZW5hbWUoKSk7CiAgICAgYXV0byogZG93bmxvYWRQdHIgPSBkb3dubG9hZC5nZXQoKTsKICAgICBk b3dubG9hZE1hbmFnZXIuZGF0YVRhc2tCZWNhbWVEb3dubG9hZFRhc2sobV9wZW5kaW5nRG93bmxv YWRJRCwgV1RGTW92ZShkb3dubG9hZCkpOwpAQCAtOTc0LDcgKzk3NCw3IEBAIHZvaWQgTmV0d29y a0RhdGFUYXNrU291cDo6d3JpdGVEb3dubG9hZCgpCiB2b2lkIE5ldHdvcmtEYXRhVGFza1NvdXA6 OmRpZFdyaXRlRG93bmxvYWQoZ3NpemUgYnl0ZXNXcml0dGVuKQogewogICAgIEFTU0VSVChieXRl c1dyaXR0ZW4gPT0gbV9yZWFkQnVmZmVyLnNpemUoKSk7Ci0gICAgYXV0byogZG93bmxvYWQgPSBO ZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuZG93bmxvYWRNYW5hZ2VyKCkuZG93bmxvYWQobV9w ZW5kaW5nRG93bmxvYWRJRCk7CisgICAgYXV0byogZG93bmxvYWQgPSBtX3Nlc3Npb24tPm5ldHdv cmtQcm9jZXNzKCkuZG93bmxvYWRNYW5hZ2VyKCkuZG93bmxvYWQobV9wZW5kaW5nRG93bmxvYWRJ RCk7CiAgICAgQVNTRVJUKGRvd25sb2FkKTsKICAgICBkb3dubG9hZC0+ZGlkUmVjZWl2ZURhdGEo Ynl0ZXNXcml0dGVuKTsKICAgICByZWFkKCk7CkBAIC0xMDAyLDcgKzEwMDIsNyBAQCB2b2lkIE5l dHdvcmtEYXRhVGFza1NvdXA6OmRpZEZpbmlzaERvd25sb2FkKCkKICAgICBnX2ZpbGVfc2V0X2F0 dHJpYnV0ZXNfYXN5bmMobV9kb3dubG9hZERlc3RpbmF0aW9uRmlsZS5nZXQoKSwgaW5mby5nZXQo KSwgR19GSUxFX1FVRVJZX0lORk9fTk9ORSwgUnVuTG9vcFNvdXJjZVByaW9yaXR5OjpBc3luY0lP TmV0d29yaywgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cik7CiAKICAgICBjbGVhclJlcXVlc3Qo KTsKLSAgICBhdXRvKiBkb3dubG9hZCA9IE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5kb3du bG9hZE1hbmFnZXIoKS5kb3dubG9hZChtX3BlbmRpbmdEb3dubG9hZElEKTsKKyAgICBhdXRvKiBk b3dubG9hZCA9IG1fc2Vzc2lvbi0+bmV0d29ya1Byb2Nlc3MoKS5kb3dubG9hZE1hbmFnZXIoKS5k b3dubG9hZChtX3BlbmRpbmdEb3dubG9hZElEKTsKICAgICBBU1NFUlQoZG93bmxvYWQpOwogICAg IGRvd25sb2FkLT5kaWRGaW5pc2goKTsKIH0KQEAgLTEwMTQsNyArMTAxNCw3IEBAIHZvaWQgTmV0 d29ya0RhdGFUYXNrU291cDo6ZGlkRmFpbERvd25sb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImIGVy cm9yKQogICAgIGlmIChtX2NsaWVudCkKICAgICAgICAgZGlzcGF0Y2hEaWRDb21wbGV0ZVdpdGhF cnJvcihlcnJvcik7CiAgICAgZWxzZSB7Ci0gICAgICAgIGF1dG8qIGRvd25sb2FkID0gTmV0d29y a1Byb2Nlc3M6OnNpbmdsZXRvbigpLmRvd25sb2FkTWFuYWdlcigpLmRvd25sb2FkKG1fcGVuZGlu Z0Rvd25sb2FkSUQpOworICAgICAgICBhdXRvKiBkb3dubG9hZCA9IG1fc2Vzc2lvbi0+bmV0d29y a1Byb2Nlc3MoKS5kb3dubG9hZE1hbmFnZXIoKS5kb3dubG9hZChtX3BlbmRpbmdEb3dubG9hZElE KTsKICAgICAgICAgQVNTRVJUKGRvd25sb2FkKTsKICAgICAgICAgZG93bmxvYWQtPmRpZEZhaWwo ZXJyb3IsIElQQzo6RGF0YVJlZmVyZW5jZSgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNwcCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwCmluZGV4 IGE0NzUwMDcyODc1NjJlYzU1MWQyOThmN2EwYjA4YmQxYjNlNGVjNzAuLjQ4NzIyMWRjNTIzY2Y0 ZmRjOWI3YTBkMTg3ZTU3ZDRkNTMzODM1NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwCkBAIC00MCw3ICs0 MCw3IEBAIE5ldHdvcmtTZXNzaW9uU291cDo6TmV0d29ya1Nlc3Npb25Tb3VwKE5ldHdvcmtQcm9j ZXNzJiBuZXR3b3JrUHJvY2VzcywgTmV0d29ya1NlCiAgICAgOiBOZXR3b3JrU2Vzc2lvbihuZXR3 b3JrUHJvY2VzcywgcGFyYW1ldGVycy5zZXNzaW9uSUQpCiB7CiAgICAgbmV0d29ya1N0b3JhZ2VT ZXNzaW9uKCkuc2V0Q29va2llT2JzZXJ2ZXJIYW5kbGVyKFt0aGlzXSB7Ci0gICAgICAgIE5ldHdv cmtQcm9jZXNzOjpzaW5nbGV0b24oKS5zdXBwbGVtZW50PFdlYkNvb2tpZU1hbmFnZXI+KCktPm5v dGlmeUNvb2tpZXNEaWRDaGFuZ2UobV9zZXNzaW9uSUQpOworICAgICAgICB0aGlzLT5uZXR3b3Jr UHJvY2VzcygpLnN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlcj4oKS0+bm90aWZ5Q29va2llc0Rp ZENoYW5nZShtX3Nlc3Npb25JRCk7CiAgICAgfSk7CiB9CiAK