Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)

New snapshot that includes the fix for installing the QtWebProcess into libexec

Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h b/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
index 761c4a49c..29be36fc9 100644
--- a/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
+++ b/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
@@ -30,6 +30,10 @@
 #include "WebPageGroupData.h"
 #include "WebPageProxy.h"
 
+#if PLATFORM(MAC)
+#include "ObjCObjectGraphCoders.h"
+#endif
+
 namespace WebKit {
 
 // Adds
@@ -68,6 +72,13 @@ public:
             encoder << pageGroup->data();
             break;
         }
+#if PLATFORM(MAC)
+        case APIObject::TypeObjCObjectGraph: {
+            ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
+            encoder << WebContextObjCObjectGraphEncoder(objectGraph);
+            break;
+        }
+#endif
         default:
             ASSERT_NOT_REACHED();
             break;
@@ -127,6 +138,16 @@ public:
             coder.m_root = WebPageGroup::get(pageGroupID);
             break;
         }
+#if PLATFORM(MAC)
+        case APIObject::TypeObjCObjectGraph: {
+            RefPtr<ObjCObjectGraph> objectGraph;
+            WebContextObjCObjectGraphDecoder objectGraphDecoder(objectGraph, coder.m_process);
+            if (!decoder->decode(objectGraphDecoder))
+                return false;
+            coder.m_root = objectGraph.get();
+            break;
+        }
+#endif
         default:
             return false;
         }