193209 2019-01-07 13:50:23 -0800 Remove use of NetworkProcess::singleton in ServiceWorker code 2019-01-07 14:32:31 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen megan_gardner webkit-bug-importer oldest_to_newest 1492380 0 achristensen 2019-01-07 13:50:23 -0800 Remove use of NetworkProcess::singleton in ServiceWorker code 1492382 1 358525 achristensen 2019-01-07 13:50:50 -0800 Created attachment 358525 Patch 1492415 2 achristensen 2019-01-07 14:31:54 -0800 http://trac.webkit.org/r239701 1492416 3 webkit-bug-importer 2019-01-07 14:32:31 -0800 <rdar://problem/47096707> 358525 2019-01-07 13:50:50 -0800 2019-01-07 14:30:50 -0800 Patch bug-193209-20190107135050.patch text/plain 7086 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzk2OTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE5LTAxLTA3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIHVzZSBv ZiBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uIGluIFNlcnZpY2VXb3JrZXIgY29kZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzMjA5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGEgbWVtYmVyIFJl ZjxOZXR3b3JrUHJvY2Vzcz4gaW5zdGVhZCB0byBhdm9pZCBnbG9iYWwgc2luZ2xldG9uIHVzZS4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmVz dGFibGlzaFNXU2VydmVyQ29ubmVjdGlvbik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvU2Vy dmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJTV1NlcnZlckNvbm5lY3Rpb246OldlYlNXU2VydmVyQ29ubmVjdGlvbik6CisgICAgICAgIChX ZWJLaXQ6OldlYlNXU2VydmVyQ29ubmVjdGlvbjo6fldlYlNXU2VydmVyQ29ubmVjdGlvbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlNXU2VydmVyQ29ubmVjdGlvbjo6c3RhcnRGZXRjaCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlNXU2VydmVyQ29ubmVjdGlvbjo6cG9zdE1lc3NhZ2VUb1NlcnZpY2VX b3JrZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJTV1NlcnZlckNvbm5lY3Rpb246OnNjaGVkdWxl Sm9iSW5TZXJ2ZXIpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2Vi U1dTZXJ2ZXJDb25uZWN0aW9uLmg6CisKIDIwMTktMDEtMDcgIEVyaWMgQ2FybHNvbiAgPGVyaWMu Y2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRGVhY3RpdmF0ZSBhdWRpbyBzZXNzaW9uIHdo ZW5ldmVyIHBvc3NpYmxlCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAkocmV2aXNp b24gMjM5NjgwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVj dGlvblRvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyNyw3ICs3MjcsNyBAQCB2 b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjp1bnJlCiB2b2lkIE5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjplc3RhYmxpc2hTV1NlcnZlckNvbm5lY3Rpb24oUEFMOjpTZXNz aW9uSUQgc2Vzc2lvbklELCBTV1NlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyJiBzZXJ2ZXJDb25u ZWN0aW9uSWRlbnRpZmllcikKIHsKICAgICBhdXRvJiBzZXJ2ZXIgPSBtX25ldHdvcmtQcm9jZXNz LT5zd1NlcnZlckZvclNlc3Npb24oc2Vzc2lvbklEKTsKLSAgICBhdXRvIGNvbm5lY3Rpb24gPSBz dGQ6Om1ha2VfdW5pcXVlPFdlYlNXU2VydmVyQ29ubmVjdGlvbj4oc2VydmVyLCBtX2Nvbm5lY3Rp b24uZ2V0KCksIHNlc3Npb25JRCk7CisgICAgYXV0byBjb25uZWN0aW9uID0gc3RkOjptYWtlX3Vu aXF1ZTxXZWJTV1NlcnZlckNvbm5lY3Rpb24+KG1fbmV0d29ya1Byb2Nlc3MsIHNlcnZlciwgbV9j b25uZWN0aW9uLmdldCgpLCBzZXNzaW9uSUQpOwogICAgIAogICAgIHNlcnZlckNvbm5lY3Rpb25J ZGVudGlmaWVyID0gY29ubmVjdGlvbi0+aWRlbnRpZmllcigpOwogICAgIExPRyhTZXJ2aWNlV29y a2VyLCAiTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmVzdGFibGlzaFNXU2VydmVyQ29u bmVjdGlvbiAtICVzIiwgc2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIubG9nZ2luZ1N0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2 aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlv bi5jcHAJKHJldmlzaW9uIDIzOTY3MCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv U2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC02MCwxNyArNjAsMTggQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAjZGVmaW5lIFNXU0VS VkVSQ09OTkVDVElPTl9SRUxFQVNFX0xPR19JRl9BTExPV0VEKGZtdCwgLi4uKSBSRUxFQVNFX0xP R19JRihtX3Nlc3Npb25JRC5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgU2VydmljZVdvcmtl ciwgIiVwIC0gV2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1Nf XykKICNkZWZpbmUgU1dTRVJWRVJDT05ORUNUSU9OX1JFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9X RUQoZm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKG1fc2Vzc2lvbklELmlzQWx3YXlzT25M b2dnaW5nQWxsb3dlZCgpLCBTZXJ2aWNlV29ya2VyLCAiJXAgLSBXZWJTV1NlcnZlckNvbm5lY3Rp b246OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQogCi1XZWJTV1NlcnZlckNvbm5lY3Rpb246 OldlYlNXU2VydmVyQ29ubmVjdGlvbihTV1NlcnZlciYgc2VydmVyLCBJUEM6OkNvbm5lY3Rpb24m IGNvbm5lY3Rpb24sIFNlc3Npb25JRCBzZXNzaW9uSUQpCitXZWJTV1NlcnZlckNvbm5lY3Rpb246 OldlYlNXU2VydmVyQ29ubmVjdGlvbihOZXR3b3JrUHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MsIFNX U2VydmVyJiBzZXJ2ZXIsIElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgU2Vzc2lvbklEIHNl c3Npb25JRCkKICAgICA6IFNXU2VydmVyOjpDb25uZWN0aW9uKHNlcnZlcikKICAgICAsIG1fc2Vz c2lvbklEKHNlc3Npb25JRCkKICAgICAsIG1fY29udGVudENvbm5lY3Rpb24oY29ubmVjdGlvbikK KyAgICAsIG1fbmV0d29ya1Byb2Nlc3MobmV0d29ya1Byb2Nlc3MpCiB7Ci0gICAgTmV0d29ya1By b2Nlc3M6OnNpbmdsZXRvbigpLnJlZ2lzdGVyU1dTZXJ2ZXJDb25uZWN0aW9uKCp0aGlzKTsKKyAg ICBuZXR3b3JrUHJvY2Vzcy5yZWdpc3RlclNXU2VydmVyQ29ubmVjdGlvbigqdGhpcyk7CiB9CiAK IFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6fldlYlNXU2VydmVyQ29ubmVjdGlvbigpCiB7Ci0gICAg TmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLnVucmVnaXN0ZXJTV1NlcnZlckNvbm5lY3Rpb24o KnRoaXMpOworICAgIG1fbmV0d29ya1Byb2Nlc3MtPnVucmVnaXN0ZXJTV1NlcnZlckNvbm5lY3Rp b24oKnRoaXMpOwogICAgIGZvciAoY29uc3QgYXV0byYga2V5VmFsdWUgOiBtX2NsaWVudE9yaWdp bnMpCiAgICAgICAgIHNlcnZlcigpLnVucmVnaXN0ZXJTZXJ2aWNlV29ya2VyQ2xpZW50KGtleVZh bHVlLnZhbHVlLCBrZXlWYWx1ZS5rZXkpOwogfQpAQCAtMTY1LDcgKzE2Niw3IEBAIHZvaWQgV2Vi U1dTZXJ2ZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKFMKICAgICAgICAgfQogCiAgICAgICAgIGlm ICghd29ya2VyLT5jb250ZXh0Q29ubmVjdGlvbigpKQotICAgICAgICAgICAgTmV0d29ya1Byb2Nl c3M6OnNpbmdsZXRvbigpLmNyZWF0ZVNlcnZlclRvQ29udGV4dENvbm5lY3Rpb24od29ya2VyLT5z ZWN1cml0eU9yaWdpbigpLCBzZXJ2ZXIoKS5zZXNzaW9uSUQoKSk7CisgICAgICAgICAgICBtX25l dHdvcmtQcm9jZXNzLT5jcmVhdGVTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uKHdvcmtlci0+c2Vj dXJpdHlPcmlnaW4oKSwgc2VydmVyKCkuc2Vzc2lvbklEKCkpOwogCiAgICAgICAgIHNlcnZlcigp LnJ1blNlcnZpY2VXb3JrZXJJZk5lY2Vzc2FyeShzZXJ2aWNlV29ya2VySWRlbnRpZmllciwgW3dl YWtUaGlzID0gV1RGTW92ZSh3ZWFrVGhpcyksIHRoaXMsIGZldGNoSWRlbnRpZmllciwgc2Vydmlj ZVdvcmtlcklkZW50aWZpZXIsIHJlcXVlc3QgPSBXVEZNb3ZlKHJlcXVlc3QpLCBvcHRpb25zID0g V1RGTW92ZShvcHRpb25zKSwgZm9ybURhdGEgPSBXVEZNb3ZlKGZvcm1EYXRhKSwgcmVmZXJyZXIg PSBXVEZNb3ZlKHJlZmVycmVyKV0oYXV0byogY29udGV4dENvbm5lY3Rpb24pIHsKICAgICAgICAg ICAgIGlmICghd2Vha1RoaXMpCkBAIC0yMDgsNyArMjA5LDcgQEAgdm9pZCBXZWJTV1NlcnZlckNv bm5lY3Rpb246OnBvc3RNZXNzYWdlVAogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIWRlc3Rp bmF0aW9uV29ya2VyLT5jb250ZXh0Q29ubmVjdGlvbigpKQotICAgICAgICBOZXR3b3JrUHJvY2Vz czo6c2luZ2xldG9uKCkuY3JlYXRlU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbihkZXN0aW5hdGlv bldvcmtlci0+c2VjdXJpdHlPcmlnaW4oKSwgc2VydmVyKCkuc2Vzc2lvbklEKCkpOworICAgICAg ICBtX25ldHdvcmtQcm9jZXNzLT5jcmVhdGVTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uKGRlc3Rp bmF0aW9uV29ya2VyLT5zZWN1cml0eU9yaWdpbigpLCBzZXJ2ZXIoKS5zZXNzaW9uSUQoKSk7CiAK ICAgICAvLyBJdCdzIHBvc3NpYmxlIHRoaXMgc3BlY2lmaWMgd29ya2VyIGNhbm5vdCBiZSByZS1y dW4gKGUuZy4gaXRzIHJlZ2lzdHJhdGlvbiBoYXMgYmVlbiByZW1vdmVkKQogICAgIHNlcnZlcigp LnJ1blNlcnZpY2VXb3JrZXJJZk5lY2Vzc2FyeShkZXN0aW5hdGlvbklkZW50aWZpZXIsIFtkZXN0 aW5hdGlvbklkZW50aWZpZXIsIG1lc3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2UpLCBzb3VyY2VEYXRh ID0gV1RGTW92ZSgqc291cmNlRGF0YSldKGF1dG8qIGNvbnRleHRDb25uZWN0aW9uKSBtdXRhYmxl IHsKQEAgLTIyMCw4ICsyMjEsOCBAQCB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6cG9zdE1l c3NhZ2VUCiB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6c2NoZWR1bGVKb2JJblNlcnZlcihT ZXJ2aWNlV29ya2VySm9iRGF0YSYmIGpvYkRhdGEpCiB7CiAgICAgYXV0byBzZWN1cml0eU9yaWdp biA9IFNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbVVSTChqb2JEYXRhLnNjcmlwdFVSTCk7Ci0gICAg aWYgKCFOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuc2VydmVyVG9Db250ZXh0Q29ubmVjdGlv bkZvck9yaWdpbihzZWN1cml0eU9yaWdpbikpCi0gICAgICAgIE5ldHdvcmtQcm9jZXNzOjpzaW5n bGV0b24oKS5jcmVhdGVTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uKHNlY3VyaXR5T3JpZ2luLCBz ZXJ2ZXIoKS5zZXNzaW9uSUQoKSk7CisgICAgaWYgKCFtX25ldHdvcmtQcm9jZXNzLT5zZXJ2ZXJU b0NvbnRleHRDb25uZWN0aW9uRm9yT3JpZ2luKHNlY3VyaXR5T3JpZ2luKSkKKyAgICAgICAgbV9u ZXR3b3JrUHJvY2Vzcy0+Y3JlYXRlU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbihzZWN1cml0eU9y aWdpbiwgc2VydmVyKCkuc2Vzc2lvbklEKCkpOwogCiAgICAgU1dTRVJWRVJDT05ORUNUSU9OX1JF TEVBU0VfTE9HX0lGX0FMTE9XRUQoIlNjaGVkdWxpbmcgU2VydmljZVdvcmtlciBqb2IgJXMgaW4g c2VydmVyIiwgam9iRGF0YS5pZGVudGlmaWVyKCkubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRh KCkpOwogICAgIEFTU0VSVChpZGVudGlmaWVyKCkgPT0gam9iRGF0YS5jb25uZWN0aW9uSWRlbnRp ZmllcigpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtl ci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmgJKHJldmlz aW9uIDIzOTY3MCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtl ci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNDgsOSArNDgsMTEg QEAgc3RydWN0IFNlcnZpY2VXb3JrZXJDbGllbnREYXRhOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAorY2xhc3MgTmV0d29ya1Byb2Nlc3M7CisKIGNsYXNzIFdlYlNXU2VydmVyQ29ubmVjdGlvbiA6 IHB1YmxpYyBXZWJDb3JlOjpTV1NlcnZlcjo6Q29ubmVjdGlvbiwgcHVibGljIElQQzo6TWVzc2Fn ZVNlbmRlciwgcHVibGljIElQQzo6TWVzc2FnZVJlY2VpdmVyIHsKIHB1YmxpYzoKLSAgICBXZWJT V1NlcnZlckNvbm5lY3Rpb24oV2ViQ29yZTo6U1dTZXJ2ZXImLCBJUEM6OkNvbm5lY3Rpb24mLCBQ QUw6OlNlc3Npb25JRCk7CisgICAgV2ViU1dTZXJ2ZXJDb25uZWN0aW9uKE5ldHdvcmtQcm9jZXNz JiwgV2ViQ29yZTo6U1dTZXJ2ZXImLCBJUEM6OkNvbm5lY3Rpb24mLCBQQUw6OlNlc3Npb25JRCk7 CiAgICAgV2ViU1dTZXJ2ZXJDb25uZWN0aW9uKGNvbnN0IFdlYlNXU2VydmVyQ29ubmVjdGlvbiYp ID0gZGVsZXRlOwogICAgIH5XZWJTV1NlcnZlckNvbm5lY3Rpb24oKSBmaW5hbDsKIApAQCAtMTAz LDYgKzEwNSw3IEBAIHByaXZhdGU6CiAKICAgICBQQUw6OlNlc3Npb25JRCBtX3Nlc3Npb25JRDsK ICAgICBSZWY8SVBDOjpDb25uZWN0aW9uPiBtX2NvbnRlbnRDb25uZWN0aW9uOworICAgIFJlZjxO ZXR3b3JrUHJvY2Vzcz4gbV9uZXR3b3JrUHJvY2VzczsKICAgICBIYXNoTWFwPFdlYkNvcmU6OlNl cnZpY2VXb3JrZXJDbGllbnRJZGVudGlmaWVyLCBXZWJDb3JlOjpDbGllbnRPcmlnaW4+IG1fY2xp ZW50T3JpZ2luczsKIH07CiAK