Skip to content
Permalink
Browse files
Roll out r223247 until we can find a way to not break performance tes…
…ting.

Canonical link: https://commits.webkit.org/194621@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223559 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aestes committed Oct 17, 2017
1 parent 7ea502a commit 7e039efa9829161d11506717334021c417dcf86d
Showing 3 changed files with 7 additions and 17 deletions.
@@ -106,12 +106,6 @@ 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 = $(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;
@@ -56,10 +56,10 @@
case ProcessLauncher::ProcessType::Network:
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
return "com.apple.WebKit.Databases";
#else
#if PLATFORM(MAC) || PLATFORM(IOS_SIMULATOR)
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)
@@ -904,11 +904,7 @@ 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

0 comments on commit 7e039ef

Please sign in to comment.