From 6dbcd09121fe266c7704a524b5cbd7f2754659c0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Sep 2012 14:01:09 +0200 Subject: 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 --- Source/WebKit2/Shared/WebProcessCreationParameters.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Source/WebKit2/Shared/WebProcessCreationParameters.cpp') 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)) -- cgit v1.2.1