<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176017] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176017">176017</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-12 04:26:26 -0800 (Wed, 12 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Fix how SerializedScriptValue is exposed to GObject DOM bindings
https://bugs.webkit.org/show_bug.cgi?id=138409
Reviewed by Philippe Normand.
It's currently exposed as a WebKitDOMSerializedScriptValue class
that doesn't really exist. It should be handled as a string, that
is used to create a SerializedScriptValue when coming from the
API, and converted to a string again when returned to the API.
* bindings/scripts/CodeGeneratorGObject.pm:
(GetGlibTypeName): Return gchar* as glib type of SerializedScriptValue.
(IsGDOMClassType): Don't consider SerializedScriptValue as a GDOM class.
(GenerateFunction): Handle SerializedScriptValue parameters and
return values specially.
* bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
(webkit_dom_test_callback_callback_with_serialized_script_value_param):
* bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(webkit_dom_test_obj_serialized_value):
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
(webkit_dom_test_serialized_script_value_interface_class_init):
(webkit_dom_test_serialized_script_value_interface_get_value):
(webkit_dom_test_serialized_script_value_interface_set_value):
(webkit_dom_test_serialized_script_value_interface_get_readonly_value):
(webkit_dom_test_serialized_script_value_interface_get_cached_value):
(webkit_dom_test_serialized_script_value_interface_set_cached_value):
(webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value):
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
(webkit_dom_test_typedefs_class_init):
(webkit_dom_test_typedefs_get_immutable_serialized_script_value):
(webkit_dom_test_typedefs_set_immutable_serialized_script_value):
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestSerializedScriptValueInterfaceh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefsh">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/ChangeLog 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2014-11-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Fix how SerializedScriptValue is exposed to GObject DOM bindings
+ https://bugs.webkit.org/show_bug.cgi?id=138409
+
+ Reviewed by Philippe Normand.
+
+ It's currently exposed as a WebKitDOMSerializedScriptValue class
+ that doesn't really exist. It should be handled as a string, that
+ is used to create a SerializedScriptValue when coming from the
+ API, and converted to a string again when returned to the API.
+
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GetGlibTypeName): Return gchar* as glib type of SerializedScriptValue.
+ (IsGDOMClassType): Don't consider SerializedScriptValue as a GDOM class.
+ (GenerateFunction): Handle SerializedScriptValue parameters and
+ return values specially.
+ * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+ (webkit_dom_test_callback_callback_with_serialized_script_value_param):
+ * bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (webkit_dom_test_obj_serialized_value):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
+ (webkit_dom_test_serialized_script_value_interface_class_init):
+ (webkit_dom_test_serialized_script_value_interface_get_value):
+ (webkit_dom_test_serialized_script_value_interface_set_value):
+ (webkit_dom_test_serialized_script_value_interface_get_readonly_value):
+ (webkit_dom_test_serialized_script_value_interface_get_cached_value):
+ (webkit_dom_test_serialized_script_value_interface_set_cached_value):
+ (webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value):
+ * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
+ (webkit_dom_test_typedefs_class_init):
+ (webkit_dom_test_typedefs_get_immutable_serialized_script_value):
+ (webkit_dom_test_typedefs_set_immutable_serialized_script_value):
+ * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
+
+2014-11-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Move RedirectedXCompositeWindow from platform to WebKit2 layer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138093
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -380,6 +380,7 @@
</span><span class="cx"> my %types = ("DOMString", "gchar*",
</span><span class="cx"> "DOMTimeStamp", "guint32",
</span><span class="cx"> "CompareHow", "gushort",
</span><ins>+ "SerializedScriptValue", "gchar*",
</ins><span class="cx"> "float", "gfloat",
</span><span class="cx"> "unrestricted float", "gfloat",
</span><span class="cx"> "double", "gdouble",
</span><span class="lines">@@ -406,7 +407,7 @@
</span><span class="cx"> sub IsGDOMClassType {
</span><span class="cx"> my $type = shift;
</span><span class="cx">
</span><del>- return 0 if $codeGenerator->IsNonPointerType($type) || $codeGenerator->IsStringType($type);
</del><ins>+ return 0 if $codeGenerator->IsNonPointerType($type) || $codeGenerator->IsStringType($type) || $type eq "SerializedScriptValue";
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -989,6 +990,10 @@
</span><span class="cx"> if ($paramIDLType eq "NodeFilter" || $paramIDLType eq "XPathNSResolver") {
</span><span class="cx"> $paramName = "WTF::getPtr(" . $paramName . ")";
</span><span class="cx"> }
</span><ins>+ if ($paramIDLType eq "SerializedScriptValue") {
+ $implIncludes{"SerializedScriptValue.h"} = 1;
+ $paramName = "WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(" . $paramName . "))";
+ }
</ins><span class="cx"> push(@callImplParams, $paramName);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1121,6 +1126,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> $assign = "${returnType} result = ";
</span><span class="cx"> }
</span><ins>+
+ if ($functionSigType eq "SerializedScriptValue") {
+ $assignPre = "convertToUTF8String(";
+ $assignPost = "->toString())";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # FIXME: Should we return a default value when isNull == true?
</span><span class="lines">@@ -1194,7 +1204,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $functionName = "item->${functionName}";
</span><span class="cx"> }
</span><del>- $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
</del><ins>+ $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
</ins><span class="cx"> } elsif ($prefix eq "set_") {
</span><span class="cx"> my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $function);
</span><span class="cx"> push(@arguments, @callImplParams);
</span><span class="lines">@@ -1203,10 +1213,10 @@
</span><span class="cx"> $implIncludes{"${implementedBy}.h"} = 1;
</span><span class="cx"> unshift(@arguments, "item");
</span><span class="cx"> $functionName = "WebCore::${implementedBy}::${functionName}";
</span><del>- $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
</del><ins>+ $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
</ins><span class="cx"> } else {
</span><span class="cx"> $functionName = "item->${functionName}";
</span><del>- $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
</del><ins>+ $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> my @arguments = @callImplParams;
</span><span class="lines">@@ -1214,9 +1224,9 @@
</span><span class="cx"> my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
</span><span class="cx"> $implIncludes{"${implementedBy}.h"} = 1;
</span><span class="cx"> unshift(@arguments, "item");
</span><del>- $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionImplementationName}(" . join(", ", @arguments) . "${assignPost});\n";
</del><ins>+ $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionImplementationName}(" . join(", ", @arguments) . ")${assignPost};\n";
</ins><span class="cx"> } else {
</span><del>- $contentHead = "${assign}${assignPre}item->${functionImplementationName}(" . join(", ", @arguments) . "${assignPost});\n";
</del><ins>+ $contentHead = "${assign}${assignPre}item->${functionImplementationName}(" . join(", ", @arguments) . ")${assignPost};\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> push(@cBody, " ${contentHead}");
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ExceptionCodeDescription.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><ins>+#include "SerializedScriptValue.h"
</ins><span class="cx"> #include "WebKitDOMDOMStringListPrivate.h"
</span><span class="cx"> #include "WebKitDOMFloat32ArrayPrivate.h"
</span><span class="cx"> #include "WebKitDOMPrivate.h"
</span><del>-#include "WebKitDOMSerializedScriptValuePrivate.h"
</del><span class="cx"> #include "WebKitDOMTestCallbackPrivate.h"
</span><span class="cx"> #include "WebKitDOMTestNodePrivate.h"
</span><span class="cx"> #include "gobject/ConvertToUTF8String.h"
</span><span class="lines">@@ -145,17 +145,16 @@
</span><span class="cx"> #endif /* ENABLE(SQL_DATABASE) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg)
</del><ins>+gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
</span><del>- g_return_val_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(srzParam), FALSE);
</del><ins>+ g_return_val_if_fail(srzParam, FALSE);
</ins><span class="cx"> g_return_val_if_fail(strArg, FALSE);
</span><span class="cx"> WebCore::TestCallback* item = WebKit::core(self);
</span><del>- WebCore::SerializedScriptValue* convertedSrzParam = WebKit::core(srzParam);
</del><span class="cx"> WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
</span><del>- gboolean result = item->callbackWithSerializedScriptValueParam(convertedSrzParam, convertedStrArg);
</del><ins>+ gboolean result = item->callbackWithSerializedScriptValueParam(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(srzParam)), convertedStrArg);
</ins><span class="cx"> return result;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_callback_callback_with_serialized_script_value_param:
</span><span class="cx"> * @self: A #WebKitDOMTestCallback
</span><del>- * @srzParam: A #WebKitDOMSerializedScriptValue
</del><ins>+ * @srzParam: A #gchar
</ins><span class="cx"> * @strArg: A #gchar
</span><span class="cx"> *
</span><span class="cx"> * Returns: A #gboolean
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><span class="cx"> WEBKIT_API gboolean
</span><del>-webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg);
</del><ins>+webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_callback_callback_with_non_bool_return_type:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -28,12 +28,12 @@
</span><span class="cx"> #include "ExceptionCodeDescription.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><ins>+#include "SerializedScriptValue.h"
</ins><span class="cx"> #include "WebKitDOMDictionaryPrivate.h"
</span><span class="cx"> #include "WebKitDOMDocumentPrivate.h"
</span><span class="cx"> #include "WebKitDOMNodePrivate.h"
</span><span class="cx"> #include "WebKitDOMPrivate.h"
</span><span class="cx"> #include "WebKitDOMSVGPointPrivate.h"
</span><del>-#include "WebKitDOMSerializedScriptValuePrivate.h"
</del><span class="cx"> #include "WebKitDOMTestEnumTypePrivate.h"
</span><span class="cx"> #include "WebKitDOMTestNodePrivate.h"
</span><span class="cx"> #include "WebKitDOMTestObjPrivate.h"
</span><span class="lines">@@ -1140,14 +1140,13 @@
</span><span class="cx"> return WebKit::kit(gobjectResult.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg)
</del><ins>+void webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, const gchar* serializedArg)
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
</span><del>- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(serializedArg));
</del><ins>+ g_return_if_fail(serializedArg);
</ins><span class="cx"> WebCore::TestObj* item = WebKit::core(self);
</span><del>- WebCore::SerializedScriptValue* convertedSerializedArg = WebKit::core(serializedArg);
- item->serializedValue(convertedSerializedArg);
</del><ins>+ item->serializedValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(serializedArg)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMDictionary* oo, WebKitDOMDictionary* ooo)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -262,12 +262,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_obj_serialized_value:
</span><span class="cx"> * @self: A #WebKitDOMTestObj
</span><del>- * @serializedArg: A #WebKitDOMSerializedScriptValue
</del><ins>+ * @serializedArg: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><span class="cx"> WEBKIT_API void
</span><del>-webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg);
</del><ins>+webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, const gchar* serializedArg);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_obj_options_object:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ExceptionCodeDescription.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><ins>+#include "SerializedScriptValue.h"
</ins><span class="cx"> #include "WebKitDOMPrivate.h"
</span><del>-#include "WebKitDOMSerializedScriptValuePrivate.h"
</del><span class="cx"> #include "WebKitDOMTestSerializedScriptValueInterfacePrivate.h"
</span><span class="cx"> #include "gobject/ConvertToUTF8String.h"
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> g_param_spec_object(
</span><span class="cx"> "value",
</span><span class="cx"> "TestSerializedScriptValueInterface:value",
</span><del>- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:value",
</del><ins>+ "read-only gchar* TestSerializedScriptValueInterface:value",
</ins><span class="cx"> WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
</span><span class="cx"> WEBKIT_PARAM_READABLE));
</span><span class="cx">
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> g_param_spec_object(
</span><span class="cx"> "readonly-value",
</span><span class="cx"> "TestSerializedScriptValueInterface:readonly-value",
</span><del>- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:readonly-value",
</del><ins>+ "read-only gchar* TestSerializedScriptValueInterface:readonly-value",
</ins><span class="cx"> WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
</span><span class="cx"> WEBKIT_PARAM_READABLE));
</span><span class="cx">
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> g_param_spec_object(
</span><span class="cx"> "cached-value",
</span><span class="cx"> "TestSerializedScriptValueInterface:cached-value",
</span><del>- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-value",
</del><ins>+ "read-only gchar* TestSerializedScriptValueInterface:cached-value",
</ins><span class="cx"> WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
</span><span class="cx"> WEBKIT_PARAM_READABLE));
</span><span class="cx">
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> g_param_spec_object(
</span><span class="cx"> "cached-readonly-value",
</span><span class="cx"> "TestSerializedScriptValueInterface:cached-readonly-value",
</span><del>- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-readonly-value",
</del><ins>+ "read-only gchar* TestSerializedScriptValueInterface:cached-readonly-value",
</ins><span class="cx"> WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
</span><span class="cx"> WEBKIT_PARAM_READABLE));
</span><span class="cx">
</span><span class="lines">@@ -182,14 +182,14 @@
</span><span class="cx"> new (priv) WebKitDOMTestSerializedScriptValueInterfacePrivate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
</del><ins>+gchar* webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
</span><span class="cx"> WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
</span><del>- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->value());
- return WebKit::kit(gobjectResult.get());
</del><ins>+ gchar* result = convertToUTF8String(item->value()->toString());
+ return result;
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
</span><span class="lines">@@ -198,15 +198,14 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
</del><ins>+void webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
</span><del>- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
</del><ins>+ g_return_if_fail(value);
</ins><span class="cx"> WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
</span><del>- WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
- item->setValue(convertedValue);
</del><ins>+ item->setValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(value);
</span><span class="lines">@@ -215,14 +214,14 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
</del><ins>+gchar* webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
</span><span class="cx"> WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
</span><del>- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->readonlyValue());
- return WebKit::kit(gobjectResult.get());
</del><ins>+ gchar* result = convertToUTF8String(item->readonlyValue()->toString());
+ return result;
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
</span><span class="lines">@@ -231,14 +230,14 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
</del><ins>+gchar* webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
</span><span class="cx"> WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
</span><del>- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedValue());
- return WebKit::kit(gobjectResult.get());
</del><ins>+ gchar* result = convertToUTF8String(item->cachedValue()->toString());
+ return result;
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
</span><span class="lines">@@ -247,15 +246,14 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
</del><ins>+void webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
</span><del>- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
</del><ins>+ g_return_if_fail(value);
</ins><span class="cx"> WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
</span><del>- WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
- item->setCachedValue(convertedValue);
</del><ins>+ item->setCachedValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> UNUSED_PARAM(value);
</span><span class="lines">@@ -264,14 +262,14 @@
</span><span class="cx"> #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
</del><ins>+gchar* webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(Condition1) || ENABLE(Condition2)
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
</span><span class="cx"> WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
</span><del>- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedReadonlyValue());
- return WebKit::kit(gobjectResult.get());
</del><ins>+ gchar* result = convertToUTF8String(item->cachedReadonlyValue()->toString());
+ return result;
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(self);
</span><span class="cx"> WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestSerializedScriptValueInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -51,64 +51,64 @@
</span><span class="cx"> * webkit_dom_test_serialized_script_value_interface_get_value:
</span><span class="cx"> * @self: A #WebKitDOMTestSerializedScriptValueInterface
</span><span class="cx"> *
</span><del>- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
</del><ins>+ * Returns: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><del>-WEBKIT_API WebKitDOMSerializedScriptValue*
</del><ins>+WEBKIT_API gchar*
</ins><span class="cx"> webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self);
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_serialized_script_value_interface_set_value:
</span><span class="cx"> * @self: A #WebKitDOMTestSerializedScriptValueInterface
</span><del>- * @value: A #WebKitDOMSerializedScriptValue
</del><ins>+ * @value: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><span class="cx"> WEBKIT_API void
</span><del>-webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value);
</del><ins>+webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_serialized_script_value_interface_get_readonly_value:
</span><span class="cx"> * @self: A #WebKitDOMTestSerializedScriptValueInterface
</span><span class="cx"> *
</span><del>- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
</del><ins>+ * Returns: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><del>-WEBKIT_API WebKitDOMSerializedScriptValue*
</del><ins>+WEBKIT_API gchar*
</ins><span class="cx"> webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self);
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_serialized_script_value_interface_get_cached_value:
</span><span class="cx"> * @self: A #WebKitDOMTestSerializedScriptValueInterface
</span><span class="cx"> *
</span><del>- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
</del><ins>+ * Returns: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><del>-WEBKIT_API WebKitDOMSerializedScriptValue*
</del><ins>+WEBKIT_API gchar*
</ins><span class="cx"> webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self);
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_serialized_script_value_interface_set_cached_value:
</span><span class="cx"> * @self: A #WebKitDOMTestSerializedScriptValueInterface
</span><del>- * @value: A #WebKitDOMSerializedScriptValue
</del><ins>+ * @value: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><span class="cx"> WEBKIT_API void
</span><del>-webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value);
</del><ins>+webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value:
</span><span class="cx"> * @self: A #WebKitDOMTestSerializedScriptValueInterface
</span><span class="cx"> *
</span><del>- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
</del><ins>+ * Returns: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><del>-WEBKIT_API WebKitDOMSerializedScriptValue*
</del><ins>+WEBKIT_API gchar*
</ins><span class="cx"> webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self);
</span><span class="cx">
</span><span class="cx"> G_END_DECLS
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ExceptionCodeDescription.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><ins>+#include "SerializedScriptValue.h"
</ins><span class="cx"> #include "WebKitDOMPrivate.h"
</span><span class="cx"> #include "WebKitDOMSVGPointPrivate.h"
</span><del>-#include "WebKitDOMSerializedScriptValuePrivate.h"
</del><span class="cx"> #include "WebKitDOMTestTypedefsPrivate.h"
</span><span class="cx"> #include "gobject/ConvertToUTF8String.h"
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> g_param_spec_object(
</span><span class="cx"> "immutable-serialized-script-value",
</span><span class="cx"> "TestTypedefs:immutable-serialized-script-value",
</span><del>- "read-only WebKitDOMSerializedScriptValue* TestTypedefs:immutable-serialized-script-value",
</del><ins>+ "read-only gchar* TestTypedefs:immutable-serialized-script-value",
</ins><span class="cx"> WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
</span><span class="cx"> WEBKIT_PARAM_READABLE));
</span><span class="cx">
</span><span class="lines">@@ -302,23 +302,22 @@
</span><span class="cx"> item->setUnsignedLongLongAttr(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitDOMSerializedScriptValue* webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self)
</del><ins>+gchar* webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self)
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_val_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self), 0);
</span><span class="cx"> WebCore::TestTypedefs* item = WebKit::core(self);
</span><del>- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->immutableSerializedScriptValue());
- return WebKit::kit(gobjectResult.get());
</del><ins>+ gchar* result = convertToUTF8String(item->immutableSerializedScriptValue()->toString());
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* value)
</del><ins>+void webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, const gchar* value)
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
</span><del>- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
</del><ins>+ g_return_if_fail(value);
</ins><span class="cx"> WebCore::TestTypedefs* item = WebKit::core(self);
</span><del>- WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
- item->setImmutableSerializedScriptValue(convertedValue);
</del><ins>+ item->setImmutableSerializedScriptValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> glong webkit_dom_test_typedefs_get_attr_with_getter_exception(WebKitDOMTestTypedefs* self, GError** error)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h (176016 => 176017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2014-11-12 12:13:10 UTC (rev 176016)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h 2014-11-12 12:26:26 UTC (rev 176017)
</span><span class="lines">@@ -127,22 +127,22 @@
</span><span class="cx"> * webkit_dom_test_typedefs_get_immutable_serialized_script_value:
</span><span class="cx"> * @self: A #WebKitDOMTestTypedefs
</span><span class="cx"> *
</span><del>- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
</del><ins>+ * Returns: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><del>-WEBKIT_API WebKitDOMSerializedScriptValue*
</del><ins>+WEBKIT_API gchar*
</ins><span class="cx"> webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self);
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_typedefs_set_immutable_serialized_script_value:
</span><span class="cx"> * @self: A #WebKitDOMTestTypedefs
</span><del>- * @value: A #WebKitDOMSerializedScriptValue
</del><ins>+ * @value: A #gchar
</ins><span class="cx"> *
</span><span class="cx"> * Stability: Unstable
</span><span class="cx"> **/
</span><span class="cx"> WEBKIT_API void
</span><del>-webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* value);
</del><ins>+webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, const gchar* value);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * webkit_dom_test_typedefs_get_attr_with_getter_exception:
</span></span></pre>
</div>
</div>
</body>
</html>