diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
| commit | 6dbcd09121fe266c7704a524b5cbd7f2754659c0 (patch) | |
| tree | 5ae0d16cec0cc61f576d51c57b3a4613c7e91e22 /Source/WebKit2/Shared/WebProcessCreationParameters.cpp | |
| parent | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (diff) | |
| download | qtwebkit-6dbcd09121fe266c7704a524b5cbd7f2754659c0.tar.gz | |
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)
New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
Diffstat (limited to 'Source/WebKit2/Shared/WebProcessCreationParameters.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebProcessCreationParameters.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp index 4339d59e2..31f11a7e8 100644 --- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp @@ -60,6 +60,10 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con encoder->encode(urlSchemesRegistererdAsEmptyDocument); encoder->encode(urlSchemesRegisteredAsSecure); encoder->encode(urlSchemesForWhichDomainRelaxationIsForbidden); + encoder->encode(urlSchemesRegisteredAsLocal); + encoder->encode(urlSchemesRegisteredAsNoAccess); + encoder->encode(urlSchemesRegisteredAsDisplayIsolated); + encoder->encode(urlSchemesRegisteredAsCORSEnabled); encoder->encode(mimeTypesWithCustomRepresentation); encoder->encodeEnum(cacheModel); encoder->encode(shouldTrackVisitedLinks); @@ -134,6 +138,14 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web return false; if (!decoder->decode(parameters.urlSchemesForWhichDomainRelaxationIsForbidden)) return false; + if (!decoder->decode(parameters.urlSchemesRegisteredAsLocal)) + return false; + if (!decoder->decode(parameters.urlSchemesRegisteredAsNoAccess)) + return false; + if (!decoder->decode(parameters.urlSchemesRegisteredAsDisplayIsolated)) + return false; + if (!decoder->decode(parameters.urlSchemesRegisteredAsCORSEnabled)) + return false; if (!decoder->decode(parameters.mimeTypesWithCustomRepresentation)) return false; if (!decoder->decodeEnum(parameters.cacheModel)) |