From d202b8f38191cd864717c3a21944c5312d783d77 Mon Sep 17 00:00:00 2001 From: "timothy_horton@apple.com" Date: Thu, 28 Aug 2014 20:45:59 +0000 Subject: [PATCH] WebKit2 doesn't support viewer services that accept image attachments https://bugs.webkit.org/show_bug.cgi?id=136349 Reviewed by Brady Eidson. * Shared/WebProcessCreationParameters.cpp: (WebKit::WebProcessCreationParameters::encode): (WebKit::WebProcessCreationParameters::decode): Encode the already-existing parameter. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173078 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 13 +++++++++++++ .../WebKit2/Shared/WebProcessCreationParameters.cpp | 3 +++ 2 files changed, 16 insertions(+) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 7e17b2fa1fa8..171602d2960f 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,16 @@ +2014-08-28 Tim Horton + + WebKit2 doesn't support viewer services that accept image attachments + https://bugs.webkit.org/show_bug.cgi?id=136349 + + + Reviewed by Brady Eidson. + + * Shared/WebProcessCreationParameters.cpp: + (WebKit::WebProcessCreationParameters::encode): + (WebKit::WebProcessCreationParameters::decode): + Encode the already-existing parameter. + 2014-08-28 Zalan Bujtas Subpixel layout: Remove unused pixel snapping functions. diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp index 5a5b166c64a2..1d8f9878f3ab 100644 --- a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp +++ b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp @@ -141,6 +141,7 @@ void WebProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const #if ENABLE(SERVICE_CONTROLS) encoder << hasImageServices; encoder << hasSelectionServices; + encoder << hasRichContentServices; #endif } @@ -296,6 +297,8 @@ bool WebProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebProc return false; if (!decoder.decode(parameters.hasSelectionServices)) return false; + if (!decoder.decode(parameters.hasRichContentServices)) + return false; #endif return true; -- 2.36.0