diff options
Diffstat (limited to 'Source/WebKit2/Shared/WebProcessCreationParameters.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebProcessCreationParameters.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp index b41e64b82..4339d59e2 100644 --- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp @@ -52,8 +52,11 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con encoder->encode(injectedBundlePath); encoder->encode(injectedBundlePathExtensionHandle); encoder->encode(applicationCacheDirectory); + encoder->encode(applicationCacheDirectoryExtensionHandle); encoder->encode(databaseDirectory); + encoder->encode(databaseDirectoryExtensionHandle); encoder->encode(localStorageDirectory); + encoder->encode(localStorageDirectoryExtensionHandle); encoder->encode(urlSchemesRegistererdAsEmptyDocument); encoder->encode(urlSchemesRegisteredAsSecure); encoder->encode(urlSchemesForWhichDomainRelaxationIsForbidden); @@ -66,6 +69,7 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con #if ENABLE(PLUGIN_PROCESS) encoder->encode(disablePluginProcessMessageTimeout); #endif + encoder->encode(terminationTimeout); encoder->encode(languages); encoder->encode(textCheckerState); encoder->encode(fullKeyboardAccessEnabled); @@ -77,11 +81,12 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con 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(webInspectorBaseDirectory); + encoder->encode(uiProcessBundleResourcePathExtensionHandle); #elif PLATFORM(WIN) encoder->encode(shouldPaintNativeControls); encoder->encode(cfURLCachePath); @@ -113,10 +118,16 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web return false; if (!decoder->decode(parameters.applicationCacheDirectory)) return false; + if (!decoder->decode(parameters.applicationCacheDirectoryExtensionHandle)) + return false; if (!decoder->decode(parameters.databaseDirectory)) return false; + if (!decoder->decode(parameters.databaseDirectoryExtensionHandle)) + return false; if (!decoder->decode(parameters.localStorageDirectory)) return false; + if (!decoder->decode(parameters.localStorageDirectoryExtensionHandle)) + return false; if (!decoder->decode(parameters.urlSchemesRegistererdAsEmptyDocument)) return false; if (!decoder->decode(parameters.urlSchemesRegisteredAsSecure)) @@ -139,7 +150,8 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web if (!decoder->decode(parameters.disablePluginProcessMessageTimeout)) return false; #endif - + if (!decoder->decode(parameters.terminationTimeout)) + return false; if (!decoder->decode(parameters.languages)) return false; if (!decoder->decode(parameters.textCheckerState)) @@ -160,6 +172,8 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web 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)) @@ -168,7 +182,7 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web return false; if (!decoder->decode(parameters.uiProcessBundleResourcePath)) return false; - if (!decoder->decode(parameters.webInspectorBaseDirectory)) + if (!decoder->decode(parameters.uiProcessBundleResourcePathExtensionHandle)) return false; #elif PLATFORM(WIN) if (!decoder->decode(parameters.shouldPaintNativeControls)) |