Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 16 insertions, 30 deletions

diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
index cc2cecc88..e15e53382 100644
--- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
+++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
@@ -42,6 +42,7 @@ WebProcessCreationParameters::WebProcessCreationParameters()
     , nsURLCacheMemoryCapacity(0)
     , nsURLCacheDiskCapacity(0)
     , shouldForceScreenFontSubstitution(false)
+    , shouldEnableKerningAndLigaturesByDefault(false)
 #elif PLATFORM(WIN)
     , shouldPaintNativeControls(false)
 #endif
@@ -58,6 +59,10 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con
     encoder->encode(databaseDirectoryExtensionHandle);
     encoder->encode(localStorageDirectory);
     encoder->encode(localStorageDirectoryExtensionHandle);
+    encoder->encode(diskCacheDirectory);
+    encoder->encode(diskCacheDirectoryExtensionHandle);
+    encoder->encode(cookieStorageDirectory);
+    encoder->encode(cookieStorageDirectoryExtensionHandle);
     encoder->encode(urlSchemesRegistererdAsEmptyDocument);
     encoder->encode(urlSchemesRegisteredAsSecure);
     encoder->encode(urlSchemesForWhichDomainRelaxationIsForbidden);
@@ -65,15 +70,11 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con
     encoder->encode(urlSchemesRegisteredAsNoAccess);
     encoder->encode(urlSchemesRegisteredAsDisplayIsolated);
     encoder->encode(urlSchemesRegisteredAsCORSEnabled);
-    encoder->encode(mimeTypesWithCustomRepresentation);
     encoder->encodeEnum(cacheModel);
     encoder->encode(shouldTrackVisitedLinks);
     encoder->encode(shouldAlwaysUseComplexTextCodePath);
     encoder->encode(shouldUseFontSmoothing);
     encoder->encode(iconDatabaseEnabled);
-#if ENABLE(PLUGIN_PROCESS)
-    encoder->encode(disablePluginProcessMessageTimeout);
-#endif
     encoder->encode(terminationTimeout);
     encoder->encode(languages);
     encoder->encode(textCheckerState);
@@ -85,17 +86,15 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con
 #if PLATFORM(MAC)
     encoder->encode(parentProcessName);
     encoder->encode(presenterApplicationPid);
-    encoder->encode(nsURLCachePath);
-    encoder->encode(nsURLCachePathExtensionHandle);
     encoder->encode(nsURLCacheMemoryCapacity);
     encoder->encode(nsURLCacheDiskCapacity);
     encoder->encode(acceleratedCompositingPort);
     encoder->encode(uiProcessBundleResourcePath);
     encoder->encode(uiProcessBundleResourcePathExtensionHandle);
     encoder->encode(shouldForceScreenFontSubstitution);
+    encoder->encode(shouldEnableKerningAndLigaturesByDefault);
 #elif PLATFORM(WIN)
     encoder->encode(shouldPaintNativeControls);
-    encoder->encode(cfURLCachePath);
     encoder->encode(cfURLCacheDiskCapacity);
     encoder->encode(cfURLCacheMemoryCapacity);
     encoder->encode(initialHTTPCookieAcceptPolicy);
@@ -106,10 +105,6 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con
         CoreIPC::encode(encoder, storageSession);
 #endif // USE(CFURLSTORAGESESSIONS)
 #endif
-#if PLATFORM(QT)
-    encoder->encode(cookieStorageDirectory);
-    encoder->encode(diskCacheDirectory);
-#endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     encoder->encode(notificationPermissions);
@@ -134,6 +129,14 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
     if (!decoder->decode(parameters.localStorageDirectoryExtensionHandle))
         return false;
+    if (!decoder->decode(parameters.diskCacheDirectory))
+        return false;
+    if (!decoder->decode(parameters.diskCacheDirectoryExtensionHandle))
+        return false;
+    if (!decoder->decode(parameters.cookieStorageDirectory))
+        return false;
+    if (!decoder->decode(parameters.cookieStorageDirectoryExtensionHandle))
+        return false;
     if (!decoder->decode(parameters.urlSchemesRegistererdAsEmptyDocument))
         return false;
     if (!decoder->decode(parameters.urlSchemesRegisteredAsSecure))
@@ -148,8 +151,6 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
     if (!decoder->decode(parameters.urlSchemesRegisteredAsCORSEnabled))
         return false;
-    if (!decoder->decode(parameters.mimeTypesWithCustomRepresentation))
-        return false;
     if (!decoder->decodeEnum(parameters.cacheModel))
         return false;
     if (!decoder->decode(parameters.shouldTrackVisitedLinks))
@@ -160,10 +161,6 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
     if (!decoder->decode(parameters.iconDatabaseEnabled))
         return false;
-#if ENABLE(PLUGIN_PROCESS)
-    if (!decoder->decode(parameters.disablePluginProcessMessageTimeout))
-        return false;
-#endif
     if (!decoder->decode(parameters.terminationTimeout))
         return false;
     if (!decoder->decode(parameters.languages))
@@ -184,10 +181,6 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
     if (!decoder->decode(parameters.presenterApplicationPid))
         return false;
-    if (!decoder->decode(parameters.nsURLCachePath))
-        return false;
-    if (!decoder->decode(parameters.nsURLCachePathExtensionHandle))
-        return false;
     if (!decoder->decode(parameters.nsURLCacheMemoryCapacity))
         return false;
     if (!decoder->decode(parameters.nsURLCacheDiskCapacity))
@@ -200,11 +193,11 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
     if (!decoder->decode(parameters.shouldForceScreenFontSubstitution))
         return false;
+    if (!decoder->decode(parameters.shouldEnableKerningAndLigaturesByDefault))
+        return false;
 #elif PLATFORM(WIN)
     if (!decoder->decode(parameters.shouldPaintNativeControls))
         return false;
-    if (!decoder->decode(parameters.cfURLCachePath))
-        return false;
     if (!decoder->decode(parameters.cfURLCacheDiskCapacity))
         return false;
     if (!decoder->decode(parameters.cfURLCacheMemoryCapacity))
@@ -220,13 +213,6 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
 #endif // USE(CFURLSTORAGESESSIONS)
 #endif
 
-#if PLATFORM(QT)
-    if (!decoder->decode(parameters.cookieStorageDirectory))
-        return false;
-    if (!decoder->decode(parameters.diskCacheDirectory))
-        return false;
-#endif
-
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     if (!decoder->decode(parameters.notificationPermissions))
         return false;