Changeset 219200 in webkit

Timestamp:

Jul 6, 2017, 9:31:34 AM (8 years ago)

Author:

beidson@apple.com

Message:

Add logging to first attempt to use the WebIconDatabase class.
​https://bugs.webkit.org/show_bug.cgi?id=174190

Reviewed by Andy Estes.

• Misc/WebIconDatabase.mm:

(+[WebIconDatabase sharedIconDatabase]): On first call, log a warning of the bleak future of this non-API.

• Misc/WebKitVersionChecks.h:

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebIconDatabase.mm (modified) (2 diffs)
• Misc/WebKitVersionChecks.h (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2017-07-06  Brady Eidson  <beidson@apple.com>
+
+        Add logging to first attempt to use the WebIconDatabase class.
+        https://bugs.webkit.org/show_bug.cgi?id=174190
+
+        Reviewed by Andy Estes.
+
+        * Misc/WebIconDatabase.mm:
+        (+[WebIconDatabase sharedIconDatabase]): On first call, log a warning of the bleak future of this non-API.
+        * Misc/WebKitVersionChecks.h:
+
 2017-07-06  Matt Lewis  <jlewis3@apple.com>
 

trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm

@@ -35 +35 @@
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
+#import "WebKitVersionChecks.h"
 #import "WebNSFileManagerExtras.h"
 #import "WebNSURLExtras.h"
@@ -98 +99 @@
 + (WebIconDatabase *)sharedIconDatabase
 {
-    static WebIconDatabase *database = nil;
-    if (!database)
+    static WebIconDatabase *database;
+    static dispatch_once_t once;
+    dispatch_once(&once, ^ {
+        if (linkedOnOrAfter(SDKVersion::FirstWithWebIconDatabaseWarning))
+            NSLog(@"+[WebIconDatabase sharedIconDatabase] is not API and should not be used. WebIconDatabase no longer handles icon loading and it will be removed in a future release.");
+
         database = [[WebIconDatabase alloc] init];
+    });
+
     return database;
 }

trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h

@@ -85 +85 @@
     FirstToExcludeLocalStorageFromBackup = DYLD_IOS_VERSION_11_0,
 #else
-    FirstWithDropToNavigateDisallowedByDefault = DYLD_MACOSX_VERSION_10_13
+    FirstWithDropToNavigateDisallowedByDefault = DYLD_MACOSX_VERSION_10_13,
+    FirstWithWebIconDatabaseWarning = DYLD_MACOSX_VERSION_10_13,
 #endif
 };