Changeset 182930 in webkit

Timestamp:

Apr 16, 2015, 5:46:07 PM (10 years ago)

Author:

andersca@apple.com

Message:

Deprecate _WKWebsiteDataStore in favor of WKWebsiteDataStore
​https://bugs.webkit.org/show_bug.cgi?id=143844

Reviewed by Dan Bernstein.

Source/WebKit2:

• Shared/API/Cocoa/WKFoundation.h:
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration _validate]):

• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
• UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
• UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
• mac/postprocess-framework-headers.sh:

Tools:

• MiniBrowser/mac/AppDelegate.m:

(-[BrowserAppDelegate newPrivateWindow:]):

• MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController initWithConfiguration:]):
(-[WK2BrowserWindowController fetchWebsiteData:]):
(-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
(-[WK2BrowserWindowController clearWebsiteData:]):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (3 diffs)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (modified) (2 diffs)
• Source/WebKit2/mac/postprocess-framework-headers.sh (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/mac/AppDelegate.m (modified) (2 diffs)
• Tools/MiniBrowser/mac/WK2BrowserWindowController.m (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-16  Anders Carlsson  <andersca@apple.com>
+
+        Deprecate _WKWebsiteDataStore in favor of WKWebsiteDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=143844
+
+        Reviewed by Dan Bernstein.
+
+        * Shared/API/Cocoa/WKFoundation.h:
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration _validate]):
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+        * UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
+        * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+        * mac/postprocess-framework-headers.sh:
+
 2015-04-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

@@ -51 +51 @@
 #define WK_CLASS_AVAILABLE(_mac, _ios) __attribute__((visibility ("default")))
 #define WK_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
+#define WK_CLASS_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((visibility("default"))) __attribute__((deprecated(__VA_ARGS__)))
 #define WK_ENUM_AVAILABLE(_mac, _ios)
 #define WK_ENUM_AVAILABLE_IOS(_ios)

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -216 +216 @@
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 - (_WKWebsiteDataStore *)_websiteDataStore
 {
@@ -225 +228 @@
     self.websiteDataStore = websiteDataStore;
 }
+
+#pragma clang diagnostic pop
 
 #if PLATFORM(IOS)
@@ -249 +254 @@
         [NSException raise:NSInvalidArgumentException format:@"configuration.userContentController is nil"];
 
+    if (!self.websiteDataStore)
+        [NSException raise:NSInvalidArgumentException format:@"configuration.websiteDataStore is nil"];
+
     if (!self._visitedLinkProvider)
         [NSException raise:NSInvalidArgumentException format:@"configuration._visitedLinkProvider is nil"];
 
-    if (!self._websiteDataStore)
-        [NSException raise:NSInvalidArgumentException format:@"configuration._websiteDataStore is nil"];
-
 #if PLATFORM(IOS)
     if (!self._contentProviderRegistry)

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

@@ -39 +39 @@
 @property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider;
 
-@property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore;
+@property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use websiteDataStore instead");
 
 @property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataRecord.h

@@ -30 +30 @@
 #import <WebKit/WKWebsiteDataRecord.h>
 
-WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
+WK_CLASS_DEPRECATED(WK_MAC_TBA, WK_MAC_TBA, WK_IOS_TBA, WK_IOS_TBA, "Please use WKWebsiteDataRecord instead")
 @interface _WKWebsiteDataRecord : WKWebsiteDataRecord
 @end

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h

@@ -30 +30 @@
 #import <WebKit/WKWebsiteDataStore.h>
 
-WK_CLASS_AVAILABLE(10_10, 8_0)
+WK_CLASS_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use WKWebsiteDataStore instead")
 @interface _WKWebsiteDataStore : WKWebsiteDataStore
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm

@@ -29 +29 @@
 #if WK_API_ENABLED
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 @implementation _WKWebsiteDataStore
 
@@ -43 +46 @@
 @end
 
+#pragma clang diagnostic pop
+
 #endif

trunk/Source/WebKit2/mac/postprocess-framework-headers.sh

@@ -51 +51 @@
                 sed -i .tmp -e s/WK_MAC_TBA/${OSX_VERSION}/g -e s/WK_IOS_TBA/${IOS_VERSION}/g ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
             else
-                sed -i .tmp -E -e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_DEPRECATED\(.+\)//g' ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
+                sed -i .tmp -E -e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_(CLASS_?)DEPRECATED\(.+\)//g' ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
             fi
 
-            sed -i .tmp -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/ -e s/WK_NULLABLE_PROPERTY/nullable,/ -e s/WK_NULLABLE_SPECIFIER/__nullable/g -e s/WK_NULLABLE/nullable/g -e s/WK_NULL_UNSPECIFIED/null_unspecified/ ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
+            sed -i .tmp -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/ -e s/WK_NULLABLE_PROPERTY/nullable,/ -e s/WK_NULLABLE_SPECIFIER/__nullable/g -e s/WK_NULLABLE/nullable/g -e s/WK_NULL_UNSPECIFIED/null_unspecified/ ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
             mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
         fi

trunk/Tools/ChangeLog

@@ +1 @@
+2015-04-16  Anders Carlsson  <andersca@apple.com>
+
+        Deprecate _WKWebsiteDataStore in favor of WKWebsiteDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=143844
+
+        Reviewed by Dan Bernstein.
+
+        * MiniBrowser/mac/AppDelegate.m:
+        (-[BrowserAppDelegate newPrivateWindow:]):
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController initWithConfiguration:]):
+        (-[WK2BrowserWindowController fetchWebsiteData:]):
+        (-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
+        (-[WK2BrowserWindowController clearWebsiteData:]):
+
 2015-04-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/MiniBrowser/mac/AppDelegate.m

@@ -37 +37 @@
 #import <WebKit/_WKProcessPoolConfiguration.h>
 #import <WebKit/_WKUserContentExtensionStore.h>
-#import <WebKit/_WKWebsiteDataStore.h>
 
 enum {
@@ -119 +118 @@
 #if WK_API_ENABLED
     WKWebViewConfiguration *privateConfiguraton = [defaultConfiguration() copy];
-    privateConfiguraton._websiteDataStore = [_WKWebsiteDataStore nonPersistentDataStore];
+    privateConfiguraton.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
 
     BrowserWindowController *controller = [[WK2BrowserWindowController alloc] initWithConfiguration:privateConfiguraton];

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -37 +37 @@
 #import <WebKit/WKWebViewPrivate.h>
 #import <WebKit/WebNSURLExtras.h>
-#import <WebKit/_WKWebsiteDataStore.h>
 
 static void* keyValueObservingContext = &keyValueObservingContext;
@@ -80 +79 @@
 
     _configuration = [configuration copy];
-    _isPrivateBrowsingWindow = _configuration._websiteDataStore.isNonPersistent;
+    _isPrivateBrowsingWindow = _configuration.websiteDataStore.isNonPersistent;
 
     return self;
@@ -446 +445 @@
 - (IBAction)fetchWebsiteData:(id)sender
 {
-    [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
+    [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
         NSLog(@"did fetch website data %@.", websiteDataRecords);
     }];
@@ -453 +452 @@
 - (IBAction)fetchAndClearWebsiteData:(id)sender
 {
-    [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
-        [_configuration._websiteDataStore removeDataOfTypes:dataTypes forDataRecords:websiteDataRecords completionHandler:^{
-            [_configuration._websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
+    [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
+        [_configuration.websiteDataStore removeDataOfTypes:dataTypes forDataRecords:websiteDataRecords completionHandler:^{
+            [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
                 NSLog(@"did clear website data, after clearing data is %@.", websiteDataRecords);
             }];
@@ -464 +463 @@
 - (IBAction)clearWebsiteData:(id)sender
 {
-    [_configuration._websiteDataStore removeDataOfTypes:dataTypes modifiedSince:[NSDate distantPast] completionHandler:^{
+    [_configuration.websiteDataStore removeDataOfTypes:dataTypes modifiedSince:[NSDate distantPast] completionHandler:^{
         NSLog(@"Did clear website data.");
     }];