Title: [284177] trunk/Source/WebKitLegacy/mac
- Revision
- 284177
- Author
- [email protected]
- Date
- 2021-10-14 11:02:22 -0700 (Thu, 14 Oct 2021)
Log Message
Modernize WebDatabaseManagerClient
<https://webkit.org/b/231549>
<rdar://problem/84129168>
Reviewed by Sihui Liu.
* Storage/WebDatabaseManager.mm:
(-[WebDatabaseManager init]):
- Add WebKit namespace to
WebDatabaseManagerClient::sharedWebDatabaseManagerClient()
and convert reference into pointer.
* Storage/WebDatabaseManagerClient.h:
(WebKit::WebDatabaseManagerClient):
- Put WebDatabaseManagerClient in WebKit namespace.
* Storage/WebDatabaseManagerClient.mm:
- Put WebDatabaseManagerClient in WebKit namespace.
(WebKit::WebDatabaseManagerClient::sharedWebDatabaseManagerClient):
- Update to use NeverDestroyed<> and to return a reference.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (284176 => 284177)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-14 17:58:17 UTC (rev 284176)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-10-14 18:02:22 UTC (rev 284177)
@@ -1,3 +1,26 @@
+2021-10-14 David Kilzer <[email protected]>
+
+ Modernize WebDatabaseManagerClient
+ <https://webkit.org/b/231549>
+ <rdar://problem/84129168>
+
+ Reviewed by Sihui Liu.
+
+ * Storage/WebDatabaseManager.mm:
+ (-[WebDatabaseManager init]):
+ - Add WebKit namespace to
+ WebDatabaseManagerClient::sharedWebDatabaseManagerClient()
+ and convert reference into pointer.
+
+ * Storage/WebDatabaseManagerClient.h:
+ (WebKit::WebDatabaseManagerClient):
+ - Put WebDatabaseManagerClient in WebKit namespace.
+
+ * Storage/WebDatabaseManagerClient.mm:
+ - Put WebDatabaseManagerClient in WebKit namespace.
+ (WebKit::WebDatabaseManagerClient::sharedWebDatabaseManagerClient):
+ - Update to use NeverDestroyed<> and to return a reference.
+
2021-10-13 Chris Dumez <[email protected]>
Drop makeWeakPtr() and use WeakPtr { } directly
Modified: trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManager.mm (284176 => 284177)
--- trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManager.mm 2021-10-14 17:58:17 UTC (rev 284176)
+++ trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManager.mm 2021-10-14 18:02:22 UTC (rev 284177)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2021 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -82,7 +82,7 @@
dbManager.initialize(databasesDirectoryPath());
// Set the DatabaseManagerClient
- dbManager.setClient(WebDatabaseManagerClient::sharedWebDatabaseManagerClient());
+ dbManager.setClient(&WebKit::WebDatabaseManagerClient::sharedWebDatabaseManagerClient());
return self;
}
Modified: trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerClient.h (284176 => 284177)
--- trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerClient.h 2021-10-14 17:58:17 UTC (rev 284176)
+++ trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerClient.h 2021-10-14 18:02:22 UTC (rev 284177)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007,2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2021 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -24,10 +24,13 @@
*/
#import <WebCore/DatabaseManagerClient.h>
+#import <wtf/NeverDestroyed.h>
+namespace WebKit {
+
class WebDatabaseManagerClient final : public WebCore::DatabaseManagerClient {
public:
- static WebDatabaseManagerClient* sharedWebDatabaseManagerClient();
+ static WebDatabaseManagerClient& sharedWebDatabaseManagerClient();
virtual ~WebDatabaseManagerClient();
void dispatchDidModifyOrigin(const WebCore::SecurityOriginData&) final;
@@ -43,6 +46,7 @@
#endif
private:
+ friend NeverDestroyed<WebDatabaseManagerClient>;
WebDatabaseManagerClient();
#if PLATFORM(IOS_FAMILY)
@@ -53,3 +57,5 @@
bool m_isHandlingDeleteDatabaseOriginNotification { false };
#endif
};
+
+} // namespace WebKit
Modified: trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerClient.mm (284176 => 284177)
--- trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerClient.mm 2021-10-14 17:58:17 UTC (rev 284176)
+++ trunk/Source/WebKitLegacy/mac/Storage/WebDatabaseManagerClient.mm 2021-10-14 18:02:22 UTC (rev 284177)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2021 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,10 +27,10 @@
#import "WebDatabaseManagerPrivate.h"
#import "WebSecurityOriginInternal.h"
+#import <WebCore/DatabaseTracker.h>
+#import <WebCore/SecurityOrigin.h>
#import <wtf/MainThread.h>
#import <wtf/RetainPtr.h>
-#import <WebCore/DatabaseTracker.h>
-#import <WebCore/SecurityOrigin.h>
#if PLATFORM(IOS_FAMILY)
#import <WebCore/WebCoreThread.h>
@@ -44,9 +44,11 @@
static const CFStringRef WebDatabaseOriginWasDeletedNotification = CFSTR("com.apple.MobileSafariSettings.WebDatabaseOriginWasDeletedNotification");
#endif
-WebDatabaseManagerClient* WebDatabaseManagerClient::sharedWebDatabaseManagerClient()
+namespace WebKit {
+
+WebDatabaseManagerClient& WebDatabaseManagerClient::sharedWebDatabaseManagerClient()
{
- static WebDatabaseManagerClient* sharedClient = new WebDatabaseManagerClient();
+ static NeverDestroyed<WebDatabaseManagerClient> sharedClient;
return sharedClient;
}
@@ -215,3 +217,5 @@
}
#endif // PLATFORM(IOS_FAMILY)
+
+} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
