From b297e0fa5c217c9467033b7c8b46891a52870120 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 16 Oct 2012 14:56:46 +0200
Subject: Revert "Imported WebKit commit
 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2
 (http://svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(
---
 Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp')

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp
index 2a1b8d5a3..84ad04d03 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp
@@ -21,16 +21,15 @@
 #include "WebKitJavascriptResult.h"
 
 #include "WebKitJavascriptResultPrivate.h"
-#include "WebSerializedScriptValue.h"
 #include <wtf/gobject/GRefPtr.h>
 
 struct _WebKitJavascriptResult {
-    _WebKitJavascriptResult(WebKitWebView* view, WebSerializedScriptValue* serializedScriptValue)
+    _WebKitJavascriptResult(WebKitWebView* view, WKSerializedScriptValueRef wkSerializedScriptValue)
         : webView(view)
         , referenceCount(1)
-    {
-        value = serializedScriptValue->deserialize(webkit_web_view_get_javascript_global_context(view), 0);
-    }
+        {
+            value = WKSerializedScriptValueDeserialize(wkSerializedScriptValue, webkit_web_view_get_javascript_global_context(view), 0);
+        }
 
     GRefPtr<WebKitWebView> webView;
     JSValueRef value;
@@ -40,10 +39,10 @@ struct _WebKitJavascriptResult {
 
 G_DEFINE_BOXED_TYPE(WebKitJavascriptResult, webkit_javascript_result, webkit_javascript_result_ref, webkit_javascript_result_unref)
 
-WebKitJavascriptResult* webkitJavascriptResultCreate(WebKitWebView* webView, WebSerializedScriptValue* serializedScriptValue)
+WebKitJavascriptResult* webkitJavascriptResultCreate(WebKitWebView* webView, WKSerializedScriptValueRef wkSerializedScriptValue)
 {
     WebKitJavascriptResult* result = g_slice_new(WebKitJavascriptResult);
-    new (result) WebKitJavascriptResult(webView, serializedScriptValue);
+    new (result) WebKitJavascriptResult(webView, wkSerializedScriptValue);
     return result;
 }
 
-- 
cgit v1.2.1