Bug 179238 – Use WK_IOS_TBA instead of WK_MAC_TBA to indicate availability of private functions on iOS

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Frédéric Wang (:fredw)]

The changes happened in r224057 and r223207. Also I recently upgraded Xcode. These are the errors I get:

/Users/fred/WebKit/Tools/TestWebKitAPI/Tests/WebKitCocoa/NowPlayingControlsTests
.mm:63:11: error: 
      '_requestActiveNowPlayingSessionInfo:' is unavailable: not available on
      iOS
    [self _requestActiveNowPlayingSessionInfo:completionHandler];
          ^
In file included from /Users/fred/WebKit/Tools/TestWebKitAPI/Tests/WebKitCocoa/NowPlayingControlsTests.mm:32:
/Users/fred/WebKit/WebKitBuild/Debug-iphonesimulator/WebKit.framework/PrivateHeaders/WKWebViewPrivate.h:439:1: note: 
      '_requestActiveNowPlayingSessionInfo:' has been explicitly marked
      unavailable here
- (void)_requestActiveNowPlayingSessionInfo:(void(^)(BOOL, NSString*, do...
^
1 error generated.

/Users/fred/WebKit/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:84:27: er
ror: 
      '_setCacheStoragePerOriginQuota:' is unavailable: not available on iOS
    [poolWebsiteDataStore _setCacheStoragePerOriginQuota: 400 * 1024];
                          ^
In file included from /Users/fred/WebKit/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:46:
/Users/fred/WebKit/WebKitBuild/Debug-iphonesimulator/WebKit.framework/PrivateHeaders/WKWebsiteDataStorePrivate.h:48:74: note: 
      property '_cacheStoragePerOriginQuota' is declared unavailable here
  ...(nonatomic, setter=_setCacheStoragePerOriginQuota:) NSUInteger _cacheSto...
                                                                    ^
/Users/fred/WebKit/WebKitBuild/Debug-iphonesimulator/WebKit.framework/PrivateHeaders/WKWebsiteDataStorePrivate.h:48:74: note: 
      '_setCacheStoragePerOriginQuota:' has been explicitly marked unavailable
      here
/Users/fred/WebKit/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:87:31: error: 
      '_setCacheStorageDirectory:' is unavailable: not available on iOS
        [poolWebsiteDataStore _setCacheStorageDirectory: cacheStorageDirectory];
                              ^
In file included from /Users/fred/WebKit/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:46:
/Users/fred/WebKit/WebKitBuild/Debug-iphonesimulator/WebKit.framework/PrivateHeaders/WKWebsiteDataStorePrivate.h:49:68: note: 
      property '_cacheStorageDirectory' is declared unavailable here
@property (nonatomic, setter=_setCacheStorageDirectory:) NSString* _cach...
                                                                   ^
/Users/fred/WebKit/WebKitBuild/Debug-iphonesimulator/WebKit.framework/PrivateHeaders/WKWebsiteDataStorePrivate.h:49:68: note: 
      '_setCacheStorageDirectory:' has been explicitly marked unavailable here
2 errors generated.

[Frédéric Wang (:fredw)]

Created attachment 325882 [details]
Patch

This patch fixes the build errors, but I have no ideas whether it is correct.

[Ali Juma]

Is the problem that on lines 48 and 49 of WKWebsiteDataStorePrivate.h, the ios version is set to WK_MAC_TBA instead of WK_IOS_TBA?

[Frédéric Wang (:fredw)]

Created attachment 325893 [details]
Patch

[Frédéric Wang (:fredw)]

Committed r224396: <https://trac.webkit.org/changeset/224396>

[Radar WebKit Bug Importer]

<rdar://problem/35567189>