diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/Shared/WebProcessCreationParameters.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/Shared/WebProcessCreationParameters.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebProcessCreationParameters.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp index 8e1d16485..acbfb3e6d 100644 --- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp @@ -54,7 +54,6 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con encoder->encode(applicationCacheDirectory); encoder->encode(databaseDirectory); encoder->encode(localStorageDirectory); - encoder->encode(webInspectorLocalizedStringsPath); encoder->encode(urlSchemesRegistererdAsEmptyDocument); encoder->encode(urlSchemesRegisteredAsSecure); encoder->encode(urlSchemesForWhichDomainRelaxationIsForbidden); @@ -71,7 +70,7 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con encoder->encode(textCheckerState); encoder->encode(fullKeyboardAccessEnabled); encoder->encode(defaultRequestTimeoutInterval); -#if USE(CFURLSTORAGESESSIONS) +#if PLATFORM(MAC) || USE(CFURLSTORAGESESSIONS) encoder->encode(uiProcessBundleIdentifier); #endif #if PLATFORM(MAC) @@ -100,7 +99,7 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con encoder->encode(cookieStorageDirectory); #endif -#if ENABLE(NOTIFICATIONS) +#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) encoder->encode(notificationPermissions); #endif } @@ -117,8 +116,6 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web return false; if (!decoder->decode(parameters.localStorageDirectory)) return false; - if (!decoder->decode(parameters.webInspectorLocalizedStringsPath)) - return false; if (!decoder->decode(parameters.urlSchemesRegistererdAsEmptyDocument)) return false; if (!decoder->decode(parameters.urlSchemesRegisteredAsSecure)) @@ -150,7 +147,7 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web return false; if (!decoder->decode(parameters.defaultRequestTimeoutInterval)) return false; -#if USE(CFURLSTORAGESESSIONS) +#if PLATFORM(MAC) || USE(CFURLSTORAGESESSIONS) if (!decoder->decode(parameters.uiProcessBundleIdentifier)) return false; #endif @@ -197,7 +194,7 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web return false; #endif -#if ENABLE(NOTIFICATIONS) +#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) if (!decoder->decode(parameters.notificationPermissions)) return false; #endif |