WebKit2 doesn't support viewer services that accept image attachments

https://bugs.webkit.org/show_bug.cgi?id=136349
<rdar://problem/18164606>

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 7e17b2fa1fa81337ea398b03b5cc98a596d466fa..171602d2960ff191a5697d14f802d8e2e2218888 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2014-08-28  Tim Horton  <timothy_horton@apple.com>
+
+        WebKit2 doesn't support viewer services that accept image attachments
+        https://bugs.webkit.org/show_bug.cgi?id=136349
+        <rdar://problem/18164606>
+
+        Reviewed by Brady Eidson.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        Encode the already-existing parameter.
+
 2014-08-28  Zalan Bujtas  <zalan@apple.com>
 
         Subpixel layout: Remove unused pixel snapping functions.

diff --git a/Source/WebKit2/Shared/WebProcessCreationParameters.cpp b/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
index 5a5b166c64a2ab34e0cc24f5d3f053d2aa2e0d5c..1d8f9878f3abdbba0eeb9060d092daea8751ef8d 100644 (file)
--- 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;