Title: [223247] trunk
- Revision
- 223247
- Author
- [email protected]
- Date
- 2017-10-12 12:12:04 -0700 (Thu, 12 Oct 2017)
Log Message
[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.
Source/WebKit:
* Configurations/BaseTarget.xcconfig:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::serviceName):
* WebKit.xcodeproj/project.pbxproj:
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::databaseProcessName):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223246 => 223247)
--- trunk/Source/WebKit/ChangeLog 2017-10-12 18:45:04 UTC (rev 223246)
+++ trunk/Source/WebKit/ChangeLog 2017-10-12 19:12:04 UTC (rev 223247)
@@ -1,3 +1,16 @@
+2017-10-12 Andy Estes <[email protected]>
+
+ [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-12 Youenn Fablet <[email protected]>
CacheStorage persistent folder should be in /Library/Cache
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (223246 => 223247)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2017-10-12 18:45:04 UTC (rev 223246)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2017-10-12 19:12:04 UTC (rev 223247)
@@ -106,6 +106,12 @@
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;
Modified: trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (223246 => 223247)
--- trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-10-12 18:45:04 UTC (rev 223246)
+++ trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-10-12 19:12:04 UTC (rev 223247)
@@ -56,10 +56,10 @@
case ProcessLauncher::ProcessType::Network:
return "com.apple.WebKit.Networking";
case ProcessLauncher::ProcessType::Storage:
-#if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
+#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";
-#else
- return "com.apple.WebKit.Databases";
#endif
#if ENABLE(NETSCAPE_PLUGIN_API)
case ProcessLauncher::ProcessType::Plugin32:
@@ -69,7 +69,7 @@
#endif
}
}
-
+
static bool shouldLeakBoost(const ProcessLauncher::LaunchOptions& launchOptions)
{
#if PLATFORM(IOS)
Modified: trunk/Tools/ChangeLog (223246 => 223247)
--- trunk/Tools/ChangeLog 2017-10-12 18:45:04 UTC (rev 223246)
+++ trunk/Tools/ChangeLog 2017-10-12 19:12:04 UTC (rev 223247)
@@ -1,3 +1,14 @@
+2017-10-12 Andy Estes <[email protected]>
+
+ [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-12 Myles C. Maxfield <[email protected]>
Emit SPIR-V from WSL compiler (Part 1)
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (223246 => 223247)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-10-12 18:45:04 UTC (rev 223246)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-10-12 19:12:04 UTC (rev 223247)
@@ -904,7 +904,11 @@
{
// 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
