[iOS] Conditionally rename DatabaseProcess to StorageProcess when building for iOS...
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Oct 2017 22:47:49 +0000 (22:47 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Oct 2017 22:47:49 +0000 (22:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=178181
<rdar://problem/33660282>

Reviewed by Dan Bernstein.

Source/WebKit:

* Configurations/BaseTarget.xcconfig:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::serviceName):
* WebKit.xcodeproj/project.pbxproj:

Tools:

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::databaseProcessName):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/Configurations/BaseTarget.xcconfig
Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
Tools/ChangeLog
Tools/WebKitTestRunner/TestController.cpp

index fcca31d..1a9e21c 100644 (file)
@@ -1,3 +1,16 @@
+2017-10-19  Andy Estes  <aestes@apple.com>
+
+        [iOS] Conditionally rename DatabaseProcess to StorageProcess when building for iOS devices
+        https://bugs.webkit.org/show_bug.cgi?id=178181
+        <rdar://problem/33660282>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/BaseTarget.xcconfig:
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::serviceName):
+        * WebKit.xcodeproj/project.pbxproj:
+
 2017-10-19  Youenn Fablet  <youenn@apple.com>
 
         Add preliminary support for ServiceWorker Handle Fetch
index f7ab180..984a260 100644 (file)
@@ -106,6 +106,12 @@ WK_HAVE_CORE_PREDICTION[sdk=macosx*][arch=i386] = NO;
 WK_CORE_PREDICTION_DEFINES = $(WK_CORE_PREDICTION_DEFINES_$(WK_HAVE_CORE_PREDICTION));
 WK_CORE_PREDICTION_DEFINES_YES = HAVE_CORE_PREDICTION;
 
-WK_STORAGE_SERVICE_PRODUCT_NAME = com.apple.WebKit.Databases;
-WK_STORAGE_SERVICE_PRODUCT_NAME[sdk=macosx*] = com.apple.WebKit.Storage;
-WK_STORAGE_SERVICE_PRODUCT_NAME[sdk=*simulator*] = com.apple.WebKit.Storage;
+WK_STORAGE_SERVICE_PRODUCT_NAME = $(WK_STORAGE_SERVICE_PRODUCT_NAME_$(WK_USE_LEGACY_STORAGE_SERVICE_NAME));
+WK_STORAGE_SERVICE_PRODUCT_NAME_ = $(WK_STORAGE_SERVICE_PRODUCT_NAME_NO);
+WK_STORAGE_SERVICE_PRODUCT_NAME_NO = com.apple.WebKit.Storage;
+WK_STORAGE_SERVICE_PRODUCT_NAME_YES = com.apple.WebKit.Databases;
+
+WK_USE_LEGACY_STORAGE_SERVICE_NAME[sdk=iphoneos11*] = $(WK_USE_LEGACY_STORAGE_SERVICE_NAME_11$(IPHONEOS_DEPLOYMENT_TARGET:suffix:identifier));
+WK_USE_LEGACY_STORAGE_SERVICE_NAME_11_0 = YES;
+WK_USE_LEGACY_STORAGE_SERVICE_NAME_11_1 = YES;
+WK_USE_LEGACY_STORAGE_SERVICE_NAME_11_2 = YES;
index 6489f5b..6ff7356 100644 (file)
@@ -56,10 +56,10 @@ static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptio
     case ProcessLauncher::ProcessType::Network:
         return "com.apple.WebKit.Networking";
     case ProcessLauncher::ProcessType::Storage:
-#if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
-        return "com.apple.WebKit.Storage";
-#else
+#if PLATFORM(IOS) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110300
         return "com.apple.WebKit.Databases";
+#else
+        return "com.apple.WebKit.Storage";
 #endif
 #if ENABLE(NETSCAPE_PLUGIN_API)
     case ProcessLauncher::ProcessType::Plugin32:
@@ -69,7 +69,7 @@ static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptio
 #endif
     }
 }
-    
+
 static bool shouldLeakBoost(const ProcessLauncher::LaunchOptions& launchOptions)
 {
 #if PLATFORM(IOS)
index 30e8b0f..3385e2f 100644 (file)
@@ -1,3 +1,14 @@
+2017-10-19  Andy Estes  <aestes@apple.com>
+
+        [iOS] Conditionally rename DatabaseProcess to StorageProcess when building for iOS devices
+        https://bugs.webkit.org/show_bug.cgi?id=178181
+        <rdar://problem/33660282>
+
+        Reviewed by Dan Bernstein.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::databaseProcessName):
+
 2017-10-19  Saam Barati  <sbarati@apple.com>
 
         Turn poly proto back on by default and remove the option
index fb20495..3c59f62 100644 (file)
@@ -908,7 +908,11 @@ const char* TestController::databaseProcessName()
 {
     // FIXME: Find a way to not hardcode the process name.
 #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110300
     return "com.apple.WebKit.Databases";
+#else
+    return "com.apple.WebKit.Storage";
+#endif
 #elif PLATFORM(COCOA)
     return "com.apple.WebKit.Storage.Development";
 #else