231549 2021-10-11 20:01:43 -0700 Modernize WebDatabaseManagerClient 2021-10-14 11:02:35 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ddkilzer ddkilzer ggaren sihui_liu webkit-bug-importer oldest_to_newest 1802938 0 ddkilzer 2021-10-11 20:01:43 -0700 Modernize WebDatabaseManagerClient. Originally I was going to make WebDatabaseManagerClient use a weak observer with CFNotificationCenter, but this isn't needed since it uses a singleton pattern. So what's left is a bit of clean-up: - Put WebDatabaseManagerClient in C++ namespace of "WebKit". - Change WebDatabaseManagerClient::sharedWebDatabaseManagerClient() to use NeverDestroyed<> and to return a reference. 1802939 1 webkit-bug-importer 2021-10-11 20:02:37 -0700 <rdar://problem/84129168> 1802941 2 440875 ddkilzer 2021-10-11 20:04:34 -0700 Created attachment 440875 Patch v1 1803272 3 ddkilzer 2021-10-12 11:46:05 -0700 (In reply to David Kilzer (:ddkilzer) from comment #2) > Created attachment 440875 [details] > Patch v1 The `api-gtk` failures are likely unrelated to this change as the `gtk` build succeeds. The WebDatabaseManagerClient class is not used by GTK. 1804329 4 440875 sihui_liu 2021-10-14 10:21:35 -0700 Comment on attachment 440875 Patch v1 r=me 1804356 5 ews-feeder 2021-10-14 11:02:32 -0700 Committed r284177 (242994@main): <https://commits.webkit.org/242994@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440875. 440875 2021-10-11 20:04:34 -0700 2021-10-14 11:02:33 -0700 Patch v1 bug-231549-20211011200433.patch text/plain 5427 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5k ZXggNTNhZThhODEwMDE4YzM3NDgyYjZjNzJhZmU4NDVmOTc2Nzc1NDkwOS4uOWZkYmY2NTNlZGE2 NzI1NzU0ZDNlNWFjNDk4ZGJmNzA4NmY3YWU4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTEwLTEwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuaXplIFdlYkRhdGFiYXNlTWFuYWdlckNsaWVudAor ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjMxNTQ5PgorICAgICAgICA8cmRhcjovL3By b2JsZW0vODQxMjkxNjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlci5tbToKKyAgICAgICAgKC1bV2Vi RGF0YWJhc2VNYW5hZ2VyIGluaXRdKToKKyAgICAgICAgLSBBZGQgV2ViS2l0IG5hbWVzcGFjZSB0 bworICAgICAgICAgIFdlYkRhdGFiYXNlTWFuYWdlckNsaWVudDo6c2hhcmVkV2ViRGF0YWJhc2VN YW5hZ2VyQ2xpZW50KCkKKyAgICAgICAgICBhbmQgY29udmVydCByZWZlcmVuY2UgaW50byBwb2lu dGVyLgorCisgICAgICAgICogU3RvcmFnZS9XZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQuaDoKKyAg ICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2VNYW5hZ2VyQ2xpZW50KToKKyAgICAgICAgLSBQdXQg V2ViRGF0YWJhc2VNYW5hZ2VyQ2xpZW50IGluIFdlYktpdCBuYW1lc3BhY2UuCisKKyAgICAgICAg KiBTdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlckNsaWVudC5tbToKKyAgICAgICAgLSBQdXQgV2Vi RGF0YWJhc2VNYW5hZ2VyQ2xpZW50IGluIFdlYktpdCBuYW1lc3BhY2UuCisgICAgICAgIChXZWJL aXQ6OldlYkRhdGFiYXNlTWFuYWdlckNsaWVudDo6c2hhcmVkV2ViRGF0YWJhc2VNYW5hZ2VyQ2xp ZW50KToKKyAgICAgICAgLSBVcGRhdGUgdG8gdXNlIE5ldmVyRGVzdHJveWVkPD4gYW5kIHRvIHJl dHVybiBhIHJlZmVyZW5jZS4KKwogMjAyMS0xMC0wOCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBbQnVpbGQtdGltZSBwZXJmXSBGb3J3YXJkLWRlY2xhcmUgbW9y ZSB0aGluZ3MgaW4gRWxlbWVudC5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9TdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlci5tbSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L1N0b3JhZ2UvV2ViRGF0YWJhc2VNYW5hZ2VyLm1tCmluZGV4IGY0MDU2OTk0MjE0Mjg4Y2U1ODY3 MWFhNzE2NzM4NzVlMzllMTgwZDUuLjE5OTM0NjdkMDQ0MmZhYmQzN2I5MGJlZDdlMWI3MGIxN2Rh MDg2YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1N0b3JhZ2UvV2ViRGF0 YWJhc2VNYW5hZ2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1N0b3JhZ2UvV2Vi RGF0YWJhc2VNYW5hZ2VyLm1tCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykg MjAwNywgMjAwOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMDctMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTgyLDcgKzgyLDcgQEAgLSAoaWQpaW5pdAogICAgIGRi TWFuYWdlci5pbml0aWFsaXplKGRhdGFiYXNlc0RpcmVjdG9yeVBhdGgoKSk7CiAKICAgICAvLyBT ZXQgdGhlIERhdGFiYXNlTWFuYWdlckNsaWVudAotICAgIGRiTWFuYWdlci5zZXRDbGllbnQoV2Vi RGF0YWJhc2VNYW5hZ2VyQ2xpZW50OjpzaGFyZWRXZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQoKSk7 CisgICAgZGJNYW5hZ2VyLnNldENsaWVudCgmV2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFnZXJDbGll bnQ6OnNoYXJlZFdlYkRhdGFiYXNlTWFuYWdlckNsaWVudCgpKTsKIAogICAgIHJldHVybiBzZWxm OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvU3RvcmFnZS9XZWJEYXRh YmFzZU1hbmFnZXJDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1N0b3JhZ2UvV2Vi RGF0YWJhc2VNYW5hZ2VyQ2xpZW50LmgKaW5kZXggOTM3NWNiNjlhNGQ2YmEyMThmYmNjNTI3NTA4 NzAxN2MyZDhlYjRhOC4uYmFkNjFhNTM5ODQ1YWNiNjI0ZTMzZjU3ZmY2YjljMWYxYzY2ZDk3ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvU3RvcmFnZS9XZWJEYXRhYmFzZU1h bmFnZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9TdG9yYWdlL1dlYkRh dGFiYXNlTWFuYWdlckNsaWVudC5oCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAo QykgMjAwNywyMDEyIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMDctMjAyMSBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNCwxMCArMjQsMTMgQEAKICAqLwogCiAjaW1w b3J0IDxXZWJDb3JlL0RhdGFiYXNlTWFuYWdlckNsaWVudC5oPgorI2ltcG9ydCA8d3RmL05ldmVy RGVzdHJveWVkLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBXZWJEYXRhYmFzZU1h bmFnZXJDbGllbnQgZmluYWwgOiBwdWJsaWMgV2ViQ29yZTo6RGF0YWJhc2VNYW5hZ2VyQ2xpZW50 IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgV2ViRGF0YWJhc2VNYW5hZ2VyQ2xpZW50KiBzaGFyZWRX ZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQoKTsKKyAgICBzdGF0aWMgV2ViRGF0YWJhc2VNYW5hZ2Vy Q2xpZW50JiBzaGFyZWRXZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQoKTsKICAgICAKICAgICB2aXJ0 dWFsIH5XZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQoKTsKICAgICB2b2lkIGRpc3BhdGNoRGlkTW9k aWZ5T3JpZ2luKGNvbnN0IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSYpIGZpbmFsOwpAQCAt NDMsNiArNDYsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJpdmF0ZToKKyAgICBmcmllbmQgTmV2 ZXJEZXN0cm95ZWQ8V2ViRGF0YWJhc2VNYW5hZ2VyQ2xpZW50PjsKICAgICBXZWJEYXRhYmFzZU1h bmFnZXJDbGllbnQoKTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC01MywzICs1Nyw1 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzSGFuZGxpbmdEZWxldGVEYXRhYmFzZU9yaWdpbk5v dGlmaWNhdGlvbiB7IGZhbHNlIH07CiAjZW5kaWYKIH07CisKK30gLy8gbmFtZXNwYWNlIFdlYktp dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvU3RvcmFnZS9XZWJEYXRhYmFz ZU1hbmFnZXJDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9TdG9yYWdlL1dlYkRh dGFiYXNlTWFuYWdlckNsaWVudC5tbQppbmRleCA1N2ZiYmZhZDllNjRiNzY3OGFkM2FjY2U4MDc3 OGJhY2YwMzc4MWI0Li43Mjc1ZWFhNjMzOGM0ZWQwZjY3YzJkZTg4ZjYzYmEyMzE2ZTRhN2ViIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9TdG9yYWdlL1dlYkRhdGFiYXNlTWFu YWdlckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9TdG9yYWdlL1dlYkRh dGFiYXNlTWFuYWdlckNsaWVudC5tbQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQg KEMpIDIwMDcsIDIwMTIgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAwNy0yMDIxIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI3LDEwICsyNywxMCBAQAogCiAjaW1wb3J0 ICJXZWJEYXRhYmFzZU1hbmFnZXJQcml2YXRlLmgiCiAjaW1wb3J0ICJXZWJTZWN1cml0eU9yaWdp bkludGVybmFsLmgiCi0jaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgotI2ltcG9ydCA8d3RmL1Jl dGFpblB0ci5oPgogI2ltcG9ydCA8V2ViQ29yZS9EYXRhYmFzZVRyYWNrZXIuaD4KICNpbXBvcnQg PFdlYkNvcmUvU2VjdXJpdHlPcmlnaW4uaD4KKyNpbXBvcnQgPHd0Zi9NYWluVGhyZWFkLmg+Cisj aW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogI2lt cG9ydCA8V2ViQ29yZS9XZWJDb3JlVGhyZWFkLmg+CkBAIC00NCw5ICs0NCwxMSBAQCBzdGF0aWMg Y29uc3QgQ0ZTdHJpbmdSZWYgV2ViRGF0YWJhc2VXYXNEZWxldGVkTm90aWZpY2F0aW9uID0gQ0ZT VFIoImNvbS5hcHBsZS5Nbwogc3RhdGljIGNvbnN0IENGU3RyaW5nUmVmIFdlYkRhdGFiYXNlT3Jp Z2luV2FzRGVsZXRlZE5vdGlmaWNhdGlvbiA9IENGU1RSKCJjb20uYXBwbGUuTW9iaWxlU2FmYXJp U2V0dGluZ3MuV2ViRGF0YWJhc2VPcmlnaW5XYXNEZWxldGVkTm90aWZpY2F0aW9uIik7CiAjZW5k aWYKIAotV2ViRGF0YWJhc2VNYW5hZ2VyQ2xpZW50KiBXZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQ6 OnNoYXJlZFdlYkRhdGFiYXNlTWFuYWdlckNsaWVudCgpCituYW1lc3BhY2UgV2ViS2l0IHsKKwor V2ViRGF0YWJhc2VNYW5hZ2VyQ2xpZW50JiBXZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQ6OnNoYXJl ZFdlYkRhdGFiYXNlTWFuYWdlckNsaWVudCgpCiB7Ci0gICAgc3RhdGljIFdlYkRhdGFiYXNlTWFu YWdlckNsaWVudCogc2hhcmVkQ2xpZW50ID0gbmV3IFdlYkRhdGFiYXNlTWFuYWdlckNsaWVudCgp OworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxXZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQ+IHNo YXJlZENsaWVudDsKICAgICByZXR1cm4gc2hhcmVkQ2xpZW50OwogfQogCkBAIC0yMTUsMyArMjE3 LDUgQEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJDbGllbnQ6OmRhdGFiYXNlT3JpZ2luc0RpZENo YW5nZSgpCiB9CiAKICNlbmRpZiAvLyBQTEFURk9STShJT1NfRkFNSUxZKQorCit9IC8vIG5hbWVz cGFjZSBXZWJLaXQK