Diff
Modified: trunk/Source/WebCore/ChangeLog (176016 => 176017)
--- 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)
@@ -1,5 +1,43 @@
2014-11-12 Carlos Garcia Campos <[email protected]>
+ [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 <[email protected]>
+
[GTK] Move RedirectedXCompositeWindow from platform to WebKit2 layer
https://bugs.webkit.org/show_bug.cgi?id=138093
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (176016 => 176017)
--- 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)
@@ -380,6 +380,7 @@
my %types = ("DOMString", "gchar*",
"DOMTimeStamp", "guint32",
"CompareHow", "gushort",
+ "SerializedScriptValue", "gchar*",
"float", "gfloat",
"unrestricted float", "gfloat",
"double", "gdouble",
@@ -406,7 +407,7 @@
sub IsGDOMClassType {
my $type = shift;
- return 0 if $codeGenerator->IsNonPointerType($type) || $codeGenerator->IsStringType($type);
+ return 0 if $codeGenerator->IsNonPointerType($type) || $codeGenerator->IsStringType($type) || $type eq "SerializedScriptValue";
return 1;
}
@@ -989,6 +990,10 @@
if ($paramIDLType eq "NodeFilter" || $paramIDLType eq "XPathNSResolver") {
$paramName = "WTF::getPtr(" . $paramName . ")";
}
+ if ($paramIDLType eq "SerializedScriptValue") {
+ $implIncludes{"SerializedScriptValue.h"} = 1;
+ $paramName = "WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(" . $paramName . "))";
+ }
push(@callImplParams, $paramName);
}
@@ -1121,6 +1126,11 @@
} else {
$assign = "${returnType} result = ";
}
+
+ if ($functionSigType eq "SerializedScriptValue") {
+ $assignPre = "convertToUTF8String(";
+ $assignPost = "->toString())";
+ }
}
# FIXME: Should we return a default value when isNull == true?
@@ -1194,7 +1204,7 @@
} else {
$functionName = "item->${functionName}";
}
- $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
+ $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
} elsif ($prefix eq "set_") {
my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $function);
push(@arguments, @callImplParams);
@@ -1203,10 +1213,10 @@
$implIncludes{"${implementedBy}.h"} = 1;
unshift(@arguments, "item");
$functionName = "WebCore::${implementedBy}::${functionName}";
- $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
+ $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
} else {
$functionName = "item->${functionName}";
- $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
+ $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
}
} else {
my @arguments = @callImplParams;
@@ -1214,9 +1224,9 @@
my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
$implIncludes{"${implementedBy}.h"} = 1;
unshift(@arguments, "item");
- $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionImplementationName}(" . join(", ", @arguments) . "${assignPost});\n";
+ $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionImplementationName}(" . join(", ", @arguments) . ")${assignPost};\n";
} else {
- $contentHead = "${assign}${assignPre}item->${functionImplementationName}(" . join(", ", @arguments) . "${assignPost});\n";
+ $contentHead = "${assign}${assignPre}item->${functionImplementationName}(" . join(", ", @arguments) . ")${assignPost};\n";
}
}
push(@cBody, " ${contentHead}");
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp (176016 => 176017)
--- 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)
@@ -27,10 +27,10 @@
#include "ExceptionCode.h"
#include "ExceptionCodeDescription.h"
#include "JSMainThreadExecState.h"
+#include "SerializedScriptValue.h"
#include "WebKitDOMDOMStringListPrivate.h"
#include "WebKitDOMFloat32ArrayPrivate.h"
#include "WebKitDOMPrivate.h"
-#include "WebKitDOMSerializedScriptValuePrivate.h"
#include "WebKitDOMTestCallbackPrivate.h"
#include "WebKitDOMTestNodePrivate.h"
#include "gobject/ConvertToUTF8String.h"
@@ -145,17 +145,16 @@
#endif /* ENABLE(SQL_DATABASE) */
}
-gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg)
+gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg)
{
#if ENABLE(SQL_DATABASE)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
- g_return_val_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(srzParam), FALSE);
+ g_return_val_if_fail(srzParam, FALSE);
g_return_val_if_fail(strArg, FALSE);
WebCore::TestCallback* item = WebKit::core(self);
- WebCore::SerializedScriptValue* convertedSrzParam = WebKit::core(srzParam);
WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
- gboolean result = item->callbackWithSerializedScriptValueParam(convertedSrzParam, convertedStrArg);
+ gboolean result = item->callbackWithSerializedScriptValueParam(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(srzParam)), convertedStrArg);
return result;
#else
UNUSED_PARAM(self);
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h (176016 => 176017)
--- 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)
@@ -73,7 +73,7 @@
/**
* webkit_dom_test_callback_callback_with_serialized_script_value_param:
* @self: A #WebKitDOMTestCallback
- * @srzParam: A #WebKitDOMSerializedScriptValue
+ * @srzParam: A #gchar
* @strArg: A #gchar
*
* Returns: A #gboolean
@@ -81,7 +81,7 @@
* Stability: Unstable
**/
WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg);
+webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg);
/**
* webkit_dom_test_callback_callback_with_non_bool_return_type:
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (176016 => 176017)
--- 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)
@@ -28,12 +28,12 @@
#include "ExceptionCodeDescription.h"
#include "HTMLNames.h"
#include "JSMainThreadExecState.h"
+#include "SerializedScriptValue.h"
#include "WebKitDOMDictionaryPrivate.h"
#include "WebKitDOMDocumentPrivate.h"
#include "WebKitDOMNodePrivate.h"
#include "WebKitDOMPrivate.h"
#include "WebKitDOMSVGPointPrivate.h"
-#include "WebKitDOMSerializedScriptValuePrivate.h"
#include "WebKitDOMTestEnumTypePrivate.h"
#include "WebKitDOMTestNodePrivate.h"
#include "WebKitDOMTestObjPrivate.h"
@@ -1140,14 +1140,13 @@
return WebKit::kit(gobjectResult.get());
}
-void webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg)
+void webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, const gchar* serializedArg)
{
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(serializedArg));
+ g_return_if_fail(serializedArg);
WebCore::TestObj* item = WebKit::core(self);
- WebCore::SerializedScriptValue* convertedSerializedArg = WebKit::core(serializedArg);
- item->serializedValue(convertedSerializedArg);
+ item->serializedValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(serializedArg)));
}
void webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMDictionary* oo, WebKitDOMDictionary* ooo)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (176016 => 176017)
--- 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)
@@ -262,12 +262,12 @@
/**
* webkit_dom_test_obj_serialized_value:
* @self: A #WebKitDOMTestObj
- * @serializedArg: A #WebKitDOMSerializedScriptValue
+ * @serializedArg: A #gchar
*
* Stability: Unstable
**/
WEBKIT_API void
-webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg);
+webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, const gchar* serializedArg);
/**
* webkit_dom_test_obj_options_object:
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp (176016 => 176017)
--- 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)
@@ -27,8 +27,8 @@
#include "ExceptionCode.h"
#include "ExceptionCodeDescription.h"
#include "JSMainThreadExecState.h"
+#include "SerializedScriptValue.h"
#include "WebKitDOMPrivate.h"
-#include "WebKitDOMSerializedScriptValuePrivate.h"
#include "WebKitDOMTestSerializedScriptValueInterfacePrivate.h"
#include "gobject/ConvertToUTF8String.h"
#include <wtf/GetPtr.h>
@@ -140,7 +140,7 @@
g_param_spec_object(
"value",
"TestSerializedScriptValueInterface:value",
- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:value",
+ "read-only gchar* TestSerializedScriptValueInterface:value",
WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
WEBKIT_PARAM_READABLE));
@@ -150,7 +150,7 @@
g_param_spec_object(
"readonly-value",
"TestSerializedScriptValueInterface:readonly-value",
- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:readonly-value",
+ "read-only gchar* TestSerializedScriptValueInterface:readonly-value",
WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
WEBKIT_PARAM_READABLE));
@@ -160,7 +160,7 @@
g_param_spec_object(
"cached-value",
"TestSerializedScriptValueInterface:cached-value",
- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-value",
+ "read-only gchar* TestSerializedScriptValueInterface:cached-value",
WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
WEBKIT_PARAM_READABLE));
@@ -170,7 +170,7 @@
g_param_spec_object(
"cached-readonly-value",
"TestSerializedScriptValueInterface:cached-readonly-value",
- "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-readonly-value",
+ "read-only gchar* TestSerializedScriptValueInterface:cached-readonly-value",
WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
WEBKIT_PARAM_READABLE));
@@ -182,14 +182,14 @@
new (priv) WebKitDOMTestSerializedScriptValueInterfacePrivate();
}
-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
+gchar* webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
{
#if ENABLE(Condition1) || ENABLE(Condition2)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->value());
- return WebKit::kit(gobjectResult.get());
+ gchar* result = convertToUTF8String(item->value()->toString());
+ return result;
#else
UNUSED_PARAM(self);
WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -198,15 +198,14 @@
#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
}
-void webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
+void webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value)
{
#if ENABLE(Condition1) || ENABLE(Condition2)
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
+ g_return_if_fail(value);
WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
- WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
- item->setValue(convertedValue);
+ item->setValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
#else
UNUSED_PARAM(self);
UNUSED_PARAM(value);
@@ -215,14 +214,14 @@
#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
}
-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
+gchar* webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
{
#if ENABLE(Condition1) || ENABLE(Condition2)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->readonlyValue());
- return WebKit::kit(gobjectResult.get());
+ gchar* result = convertToUTF8String(item->readonlyValue()->toString());
+ return result;
#else
UNUSED_PARAM(self);
WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -231,14 +230,14 @@
#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
}
-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
+gchar* webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
{
#if ENABLE(Condition1) || ENABLE(Condition2)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedValue());
- return WebKit::kit(gobjectResult.get());
+ gchar* result = convertToUTF8String(item->cachedValue()->toString());
+ return result;
#else
UNUSED_PARAM(self);
WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -247,15 +246,14 @@
#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
}
-void webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
+void webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value)
{
#if ENABLE(Condition1) || ENABLE(Condition2)
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
+ g_return_if_fail(value);
WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
- WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
- item->setCachedValue(convertedValue);
+ item->setCachedValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
#else
UNUSED_PARAM(self);
UNUSED_PARAM(value);
@@ -264,14 +262,14 @@
#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
}
-WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
+gchar* webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
{
#if ENABLE(Condition1) || ENABLE(Condition2)
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedReadonlyValue());
- return WebKit::kit(gobjectResult.get());
+ gchar* result = convertToUTF8String(item->cachedReadonlyValue()->toString());
+ return result;
#else
UNUSED_PARAM(self);
WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h (176016 => 176017)
--- 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)
@@ -51,64 +51,64 @@
* webkit_dom_test_serialized_script_value_interface_get_value:
* @self: A #WebKitDOMTestSerializedScriptValueInterface
*
- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
+ * Returns: A #gchar
*
* Stability: Unstable
**/
-WEBKIT_API WebKitDOMSerializedScriptValue*
+WEBKIT_API gchar*
webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self);
/**
* webkit_dom_test_serialized_script_value_interface_set_value:
* @self: A #WebKitDOMTestSerializedScriptValueInterface
- * @value: A #WebKitDOMSerializedScriptValue
+ * @value: A #gchar
*
* Stability: Unstable
**/
WEBKIT_API void
-webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value);
+webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value);
/**
* webkit_dom_test_serialized_script_value_interface_get_readonly_value:
* @self: A #WebKitDOMTestSerializedScriptValueInterface
*
- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
+ * Returns: A #gchar
*
* Stability: Unstable
**/
-WEBKIT_API WebKitDOMSerializedScriptValue*
+WEBKIT_API gchar*
webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self);
/**
* webkit_dom_test_serialized_script_value_interface_get_cached_value:
* @self: A #WebKitDOMTestSerializedScriptValueInterface
*
- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
+ * Returns: A #gchar
*
* Stability: Unstable
**/
-WEBKIT_API WebKitDOMSerializedScriptValue*
+WEBKIT_API gchar*
webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self);
/**
* webkit_dom_test_serialized_script_value_interface_set_cached_value:
* @self: A #WebKitDOMTestSerializedScriptValueInterface
- * @value: A #WebKitDOMSerializedScriptValue
+ * @value: A #gchar
*
* Stability: Unstable
**/
WEBKIT_API void
-webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value);
+webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value);
/**
* webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value:
* @self: A #WebKitDOMTestSerializedScriptValueInterface
*
- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
+ * Returns: A #gchar
*
* Stability: Unstable
**/
-WEBKIT_API WebKitDOMSerializedScriptValue*
+WEBKIT_API gchar*
webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self);
G_END_DECLS
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp (176016 => 176017)
--- 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)
@@ -27,9 +27,9 @@
#include "ExceptionCode.h"
#include "ExceptionCodeDescription.h"
#include "JSMainThreadExecState.h"
+#include "SerializedScriptValue.h"
#include "WebKitDOMPrivate.h"
#include "WebKitDOMSVGPointPrivate.h"
-#include "WebKitDOMSerializedScriptValuePrivate.h"
#include "WebKitDOMTestTypedefsPrivate.h"
#include "gobject/ConvertToUTF8String.h"
#include <wtf/GetPtr.h>
@@ -180,7 +180,7 @@
g_param_spec_object(
"immutable-serialized-script-value",
"TestTypedefs:immutable-serialized-script-value",
- "read-only WebKitDOMSerializedScriptValue* TestTypedefs:immutable-serialized-script-value",
+ "read-only gchar* TestTypedefs:immutable-serialized-script-value",
WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
WEBKIT_PARAM_READABLE));
@@ -302,23 +302,22 @@
item->setUnsignedLongLongAttr(value);
}
-WebKitDOMSerializedScriptValue* webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self)
+gchar* webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self)
{
WebCore::JSMainThreadNullState state;
g_return_val_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self), 0);
WebCore::TestTypedefs* item = WebKit::core(self);
- RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->immutableSerializedScriptValue());
- return WebKit::kit(gobjectResult.get());
+ gchar* result = convertToUTF8String(item->immutableSerializedScriptValue()->toString());
+ return result;
}
-void webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* value)
+void webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, const gchar* value)
{
WebCore::JSMainThreadNullState state;
g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
- g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
+ g_return_if_fail(value);
WebCore::TestTypedefs* item = WebKit::core(self);
- WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
- item->setImmutableSerializedScriptValue(convertedValue);
+ item->setImmutableSerializedScriptValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
}
glong webkit_dom_test_typedefs_get_attr_with_getter_exception(WebKitDOMTestTypedefs* self, GError** error)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h (176016 => 176017)
--- 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)
@@ -127,22 +127,22 @@
* webkit_dom_test_typedefs_get_immutable_serialized_script_value:
* @self: A #WebKitDOMTestTypedefs
*
- * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
+ * Returns: A #gchar
*
* Stability: Unstable
**/
-WEBKIT_API WebKitDOMSerializedScriptValue*
+WEBKIT_API gchar*
webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self);
/**
* webkit_dom_test_typedefs_set_immutable_serialized_script_value:
* @self: A #WebKitDOMTestTypedefs
- * @value: A #WebKitDOMSerializedScriptValue
+ * @value: A #gchar
*
* Stability: Unstable
**/
WEBKIT_API void
-webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* value);
+webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, const gchar* value);
/**
* webkit_dom_test_typedefs_get_attr_with_getter_exception:
