Changeset 223559 in webkit

Timestamp:

Oct 17, 2017 11:30:31 AM (7 years ago)

Author:

aestes@apple.com

Message:

Roll out r223247 until we can find a way to not break performance testing.

Location:

trunk

Files:

• Source/WebKit/Configurations/BaseTarget.xcconfig (modified) (1 diff)
• Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (2 diffs)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)

trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

@@ -107 +107 @@
 WK_CORE_PREDICTION_DEFINES_YES = HAVE_CORE_PREDICTION;
 
-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;
+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;

trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -57 +57 @@
         return "com.apple.WebKit.Networking";
     case ProcessLauncher::ProcessType::Storage:
-#if PLATFORM(IOS) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110300
+#if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
+        return "com.apple.WebKit.Storage";
+#else
         return "com.apple.WebKit.Databases";
-#else
-        return "com.apple.WebKit.Storage";
 #endif
 #if ENABLE(NETSCAPE_PLUGIN_API)
@@ -70 +70 @@
     }
 }
-
+    
 static bool shouldLeakBoost(const ProcessLauncher::LaunchOptions& launchOptions)
 {

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -905 +905 @@
     // 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";