Changeset 176017 in webkit


Ignore:
Timestamp:
Nov 12, 2014 4:26:26 AM (9 years ago)
Author:
Carlos Garcia Campos
Message:

[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:
Location:
trunk/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r176016 r176017  
     12014-11-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Fix how SerializedScriptValue is exposed to GObject DOM bindings
     4        https://bugs.webkit.org/show_bug.cgi?id=138409
     5
     6        Reviewed by Philippe Normand.
     7
     8        It's currently exposed as a WebKitDOMSerializedScriptValue class
     9        that doesn't really exist. It should be handled as a string, that
     10        is used to create a SerializedScriptValue when coming from the
     11        API, and converted to a string again when returned to the API.
     12
     13        * bindings/scripts/CodeGeneratorGObject.pm:
     14        (GetGlibTypeName): Return gchar* as glib type of SerializedScriptValue.
     15        (IsGDOMClassType): Don't consider SerializedScriptValue as a GDOM class.
     16        (GenerateFunction): Handle SerializedScriptValue parameters and
     17        return values specially.
     18        * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
     19        (webkit_dom_test_callback_callback_with_serialized_script_value_param):
     20        * bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
     21        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
     22        (webkit_dom_test_obj_serialized_value):
     23        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
     24        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
     25        (webkit_dom_test_serialized_script_value_interface_class_init):
     26        (webkit_dom_test_serialized_script_value_interface_get_value):
     27        (webkit_dom_test_serialized_script_value_interface_set_value):
     28        (webkit_dom_test_serialized_script_value_interface_get_readonly_value):
     29        (webkit_dom_test_serialized_script_value_interface_get_cached_value):
     30        (webkit_dom_test_serialized_script_value_interface_set_cached_value):
     31        (webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value):
     32        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
     33        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
     34        (webkit_dom_test_typedefs_class_init):
     35        (webkit_dom_test_typedefs_get_immutable_serialized_script_value):
     36        (webkit_dom_test_typedefs_set_immutable_serialized_script_value):
     37        * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
     38
    1392014-11-12  Carlos Garcia Campos  <cgarcia@igalia.com>
    240

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm

    r171285 r176017  
    381381                 "DOMTimeStamp", "guint32",
    382382                 "CompareHow", "gushort",
     383                 "SerializedScriptValue", "gchar*",
    383384                 "float", "gfloat",
    384385                 "unrestricted float", "gfloat",
    … …  
    407408    my $type = shift;
    408409
    409     return 0 if $codeGenerator->IsNonPointerType($type) || $codeGenerator->IsStringType($type);
     410    return 0 if $codeGenerator->IsNonPointerType($type) || $codeGenerator->IsStringType($type) || $type eq "SerializedScriptValue";
    410411    return 1;
    411412}
    … …  
    990991            $paramName = "WTF::getPtr(" . $paramName . ")";
    991992        }
     993        if ($paramIDLType eq "SerializedScriptValue") {
     994            $implIncludes{"SerializedScriptValue.h"} = 1;
     995            $paramName = "WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(" . $paramName . "))";
     996        }
    992997        push(@callImplParams, $paramName);
    993998    }
    … …  
    11211126        } else {
    11221127            $assign = "${returnType} result = ";
     1128        }
     1129
     1130        if ($functionSigType eq "SerializedScriptValue") {
     1131            $assignPre = "convertToUTF8String(";
     1132            $assignPost = "->toString())";
    11231133        }
    11241134    }
    … …  
    11951205                $functionName = "item->${functionName}";
    11961206            }
    1197             $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
     1207            $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
    11981208        } elsif ($prefix eq "set_") {
    11991209            my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $function);
    … …  
    12041214                unshift(@arguments, "item");
    12051215                $functionName = "WebCore::${implementedBy}::${functionName}";
    1206                 $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
     1216                $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
    12071217            } else {
    12081218                $functionName = "item->${functionName}";
    1209                 $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . "${assignPost});\n";
     1219                $contentHead = "${assign}${assignPre}${functionName}(" . join(", ", @arguments) . ")${assignPost};\n";
    12101220            }
    12111221        } else {
    … …  
    12151225                $implIncludes{"${implementedBy}.h"} = 1;
    12161226                unshift(@arguments, "item");
    1217                 $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionImplementationName}(" . join(", ", @arguments) . "${assignPost});\n";
     1227                $contentHead = "${assign}${assignPre}WebCore::${implementedBy}::${functionImplementationName}(" . join(", ", @arguments) . ")${assignPost};\n";
    12181228            } else {
    1219                 $contentHead = "${assign}${assignPre}item->${functionImplementationName}(" . join(", ", @arguments) . "${assignPost});\n";
     1229                $contentHead = "${assign}${assignPre}item->${functionImplementationName}(" . join(", ", @arguments) . ")${assignPost};\n";
    12201230            }
    12211231        }

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp

    r171294 r176017  
    2828#include "ExceptionCodeDescription.h"
    2929#include "JSMainThreadExecState.h"
     30#include "SerializedScriptValue.h"
    3031#include "WebKitDOMDOMStringListPrivate.h"
    3132#include "WebKitDOMFloat32ArrayPrivate.h"
    3233#include "WebKitDOMPrivate.h"
    33 #include "WebKitDOMSerializedScriptValuePrivate.h"
    3434#include "WebKitDOMTestCallbackPrivate.h"
    3535#include "WebKitDOMTestNodePrivate.h"
    … …  
    146146}
    147147
    148 gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg)
    149 {
    150 #if ENABLE(SQL_DATABASE)
    151     WebCore::JSMainThreadNullState state;
    152     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
    153     g_return_val_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(srzParam), FALSE);
     148gboolean webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg)
     149{
     150#if ENABLE(SQL_DATABASE)
     151    WebCore::JSMainThreadNullState state;
     152    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_CALLBACK(self), FALSE);
     153    g_return_val_if_fail(srzParam, FALSE);
    154154    g_return_val_if_fail(strArg, FALSE);
    155155    WebCore::TestCallback* item = WebKit::core(self);
    156     WebCore::SerializedScriptValue* convertedSrzParam = WebKit::core(srzParam);
    157156    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
    158     gboolean result = item->callbackWithSerializedScriptValueParam(convertedSrzParam, convertedStrArg);
     157    gboolean result = item->callbackWithSerializedScriptValueParam(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(srzParam)), convertedStrArg);
    159158    return result;
    160159#else

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h

    r170422 r176017  
    7474 * webkit_dom_test_callback_callback_with_serialized_script_value_param:
    7575 * @self: A #WebKitDOMTestCallback
    76  * @srzParam: A #WebKitDOMSerializedScriptValue
     76 * @srzParam: A #gchar
    7777 * @strArg: A #gchar
    7878 *
    … …  
    8282**/
    8383WEBKIT_API gboolean
    84 webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, WebKitDOMSerializedScriptValue* srzParam, const gchar* strArg);
     84webkit_dom_test_callback_callback_with_serialized_script_value_param(WebKitDOMTestCallback* self, const gchar* srzParam, const gchar* strArg);
    8585
    8686/**

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp

    r171294 r176017  
    2929#include "HTMLNames.h"
    3030#include "JSMainThreadExecState.h"
     31#include "SerializedScriptValue.h"
    3132#include "WebKitDOMDictionaryPrivate.h"
    3233#include "WebKitDOMDocumentPrivate.h"
    … …  
    3435#include "WebKitDOMPrivate.h"
    3536#include "WebKitDOMSVGPointPrivate.h"
    36 #include "WebKitDOMSerializedScriptValuePrivate.h"
    3737#include "WebKitDOMTestEnumTypePrivate.h"
    3838#include "WebKitDOMTestNodePrivate.h"
    … …  
    11411141}
    11421142
    1143 void webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg)
    1144 {
    1145     WebCore::JSMainThreadNullState state;
    1146     g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
    1147     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(serializedArg));
    1148     WebCore::TestObj* item = WebKit::core(self);
    1149     WebCore::SerializedScriptValue* convertedSerializedArg = WebKit::core(serializedArg);
    1150     item->serializedValue(convertedSerializedArg);
     1143void webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, const gchar* serializedArg)
     1144{
     1145    WebCore::JSMainThreadNullState state;
     1146    g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
     1147    g_return_if_fail(serializedArg);
     1148    WebCore::TestObj* item = WebKit::core(self);
     1149    item->serializedValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(serializedArg)));
    11511150}
    11521151

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h

    r171181 r176017  
    263263 * webkit_dom_test_obj_serialized_value:
    264264 * @self: A #WebKitDOMTestObj
    265  * @serializedArg: A #WebKitDOMSerializedScriptValue
    266  *
    267  * Stability: Unstable
    268 **/
    269 WEBKIT_API void
    270 webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg);
     265 * @serializedArg: A #gchar
     266 *
     267 * Stability: Unstable
     268**/
     269WEBKIT_API void
     270webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, const gchar* serializedArg);
    271271
    272272/**

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp

    r171294 r176017  
    2828#include "ExceptionCodeDescription.h"
    2929#include "JSMainThreadExecState.h"
     30#include "SerializedScriptValue.h"
    3031#include "WebKitDOMPrivate.h"
    31 #include "WebKitDOMSerializedScriptValuePrivate.h"
    3232#include "WebKitDOMTestSerializedScriptValueInterfacePrivate.h"
    3333#include "gobject/ConvertToUTF8String.h"
    … …  
    141141            "value",
    142142            "TestSerializedScriptValueInterface:value",
    143             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:value",
     143            "read-only gchar* TestSerializedScriptValueInterface:value",
    144144            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
    145145            WEBKIT_PARAM_READABLE));
    … …  
    151151            "readonly-value",
    152152            "TestSerializedScriptValueInterface:readonly-value",
    153             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:readonly-value",
     153            "read-only gchar* TestSerializedScriptValueInterface:readonly-value",
    154154            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
    155155            WEBKIT_PARAM_READABLE));
    … …  
    161161            "cached-value",
    162162            "TestSerializedScriptValueInterface:cached-value",
    163             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-value",
     163            "read-only gchar* TestSerializedScriptValueInterface:cached-value",
    164164            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
    165165            WEBKIT_PARAM_READABLE));
    … …  
    171171            "cached-readonly-value",
    172172            "TestSerializedScriptValueInterface:cached-readonly-value",
    173             "read-only WebKitDOMSerializedScriptValue* TestSerializedScriptValueInterface:cached-readonly-value",
     173            "read-only gchar* TestSerializedScriptValueInterface:cached-readonly-value",
    174174            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
    175175            WEBKIT_PARAM_READABLE));
    … …  
    183183}
    184184
    185 WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
    186 {
    187 #if ENABLE(Condition1) || ENABLE(Condition2)
    188     WebCore::JSMainThreadNullState state;
    189     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
    190     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    191     RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->value());
    192     return WebKit::kit(gobjectResult.get());
    193 #else
    194     UNUSED_PARAM(self);
    195     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
    196     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
    197     return 0;
    198 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
    199 }
    200 
    201 void webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
     185gchar* webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self)
     186{
     187#if ENABLE(Condition1) || ENABLE(Condition2)
     188    WebCore::JSMainThreadNullState state;
     189    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
     190    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     191    gchar* result = convertToUTF8String(item->value()->toString());
     192    return result;
     193#else
     194    UNUSED_PARAM(self);
     195    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     196    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
     197    return 0;
     198#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
     199}
     200
     201void webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value)
    202202{
    203203#if ENABLE(Condition1) || ENABLE(Condition2)
    204204    WebCore::JSMainThreadNullState state;
    205205    g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
    206     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
    207     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    208     WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
    209     item->setValue(convertedValue);
     206    g_return_if_fail(value);
     207    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     208    item->setValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
    210209#else
    211210    UNUSED_PARAM(self);
    … …  
    216215}
    217216
    218 WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
    219 {
    220 #if ENABLE(Condition1) || ENABLE(Condition2)
    221     WebCore::JSMainThreadNullState state;
    222     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
    223     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    224     RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->readonlyValue());
    225     return WebKit::kit(gobjectResult.get());
    226 #else
    227     UNUSED_PARAM(self);
    228     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
    229     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
    230     return 0;
    231 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
    232 }
    233 
    234 WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
    235 {
    236 #if ENABLE(Condition1) || ENABLE(Condition2)
    237     WebCore::JSMainThreadNullState state;
    238     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
    239     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    240     RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedValue());
    241     return WebKit::kit(gobjectResult.get());
    242 #else
    243     UNUSED_PARAM(self);
    244     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
    245     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
    246     return 0;
    247 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
    248 }
    249 
    250 void webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value)
     217gchar* webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
     218{
     219#if ENABLE(Condition1) || ENABLE(Condition2)
     220    WebCore::JSMainThreadNullState state;
     221    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
     222    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     223    gchar* result = convertToUTF8String(item->readonlyValue()->toString());
     224    return result;
     225#else
     226    UNUSED_PARAM(self);
     227    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     228    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
     229    return 0;
     230#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
     231}
     232
     233gchar* webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self)
     234{
     235#if ENABLE(Condition1) || ENABLE(Condition2)
     236    WebCore::JSMainThreadNullState state;
     237    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
     238    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     239    gchar* result = convertToUTF8String(item->cachedValue()->toString());
     240    return result;
     241#else
     242    UNUSED_PARAM(self);
     243    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     244    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
     245    return 0;
     246#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
     247}
     248
     249void webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value)
    251250{
    252251#if ENABLE(Condition1) || ENABLE(Condition2)
    253252    WebCore::JSMainThreadNullState state;
    254253    g_return_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self));
    255     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
    256     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    257     WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
    258     item->setCachedValue(convertedValue);
     254    g_return_if_fail(value);
     255    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     256    item->setCachedValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
    259257#else
    260258    UNUSED_PARAM(self);
    … …  
    265263}
    266264
    267 WebKitDOMSerializedScriptValue* webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
    268 {
    269 #if ENABLE(Condition1) || ENABLE(Condition2)
    270     WebCore::JSMainThreadNullState state;
    271     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
    272     WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
    273     RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedReadonlyValue());
    274     return WebKit::kit(gobjectResult.get());
    275 #else
    276     UNUSED_PARAM(self);
    277     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
    278     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
    279     return 0;
    280 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
    281 }
    282 
     265gchar* webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self)
     266{
     267#if ENABLE(Condition1) || ENABLE(Condition2)
     268    WebCore::JSMainThreadNullState state;
     269    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(self), 0);
     270    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     271    gchar* result = convertToUTF8String(item->cachedReadonlyValue()->toString());
     272    return result;
     273#else
     274    UNUSED_PARAM(self);
     275    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     276    WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
     277    return 0;
     278#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
     279}
     280

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h

    r170422 r176017  
    5252 * @self: A #WebKitDOMTestSerializedScriptValueInterface
    5353 *
    54  * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
     54 * Returns: A #gchar
    5555 *
    5656 * Stability: Unstable
    5757**/
    58 WEBKIT_API WebKitDOMSerializedScriptValue*
     58WEBKIT_API gchar*
    5959webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSerializedScriptValueInterface* self);
    6060
    … …  
    6262 * webkit_dom_test_serialized_script_value_interface_set_value:
    6363 * @self: A #WebKitDOMTestSerializedScriptValueInterface
    64  * @value: A #WebKitDOMSerializedScriptValue
     64 * @value: A #gchar
    6565 *
    6666 * Stability: Unstable
    6767**/
    6868WEBKIT_API void
    69 webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value);
     69webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value);
    7070
    7171/**
    … …  
    7373 * @self: A #WebKitDOMTestSerializedScriptValueInterface
    7474 *
    75  * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
     75 * Returns: A #gchar
    7676 *
    7777 * Stability: Unstable
    7878**/
    79 WEBKIT_API WebKitDOMSerializedScriptValue*
     79WEBKIT_API gchar*
    8080webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self);
    8181
    … …  
    8484 * @self: A #WebKitDOMTestSerializedScriptValueInterface
    8585 *
    86  * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
     86 * Returns: A #gchar
    8787 *
    8888 * Stability: Unstable
    8989**/
    90 WEBKIT_API WebKitDOMSerializedScriptValue*
     90WEBKIT_API gchar*
    9191webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTestSerializedScriptValueInterface* self);
    9292
    … …  
    9494 * webkit_dom_test_serialized_script_value_interface_set_cached_value:
    9595 * @self: A #WebKitDOMTestSerializedScriptValueInterface
    96  * @value: A #WebKitDOMSerializedScriptValue
     96 * @value: A #gchar
    9797 *
    9898 * Stability: Unstable
    9999**/
    100100WEBKIT_API void
    101 webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* value);
     101webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTestSerializedScriptValueInterface* self, const gchar* value);
    102102
    103103/**
    … …  
    105105 * @self: A #WebKitDOMTestSerializedScriptValueInterface
    106106 *
    107  * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
     107 * Returns: A #gchar
    108108 *
    109109 * Stability: Unstable
    110110**/
    111 WEBKIT_API WebKitDOMSerializedScriptValue*
     111WEBKIT_API gchar*
    112112webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebKitDOMTestSerializedScriptValueInterface* self);
    113113

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp

    r171294 r176017  
    2828#include "ExceptionCodeDescription.h"
    2929#include "JSMainThreadExecState.h"
     30#include "SerializedScriptValue.h"
    3031#include "WebKitDOMPrivate.h"
    3132#include "WebKitDOMSVGPointPrivate.h"
    32 #include "WebKitDOMSerializedScriptValuePrivate.h"
    3333#include "WebKitDOMTestTypedefsPrivate.h"
    3434#include "gobject/ConvertToUTF8String.h"
    … …  
    181181            "immutable-serialized-script-value",
    182182            "TestTypedefs:immutable-serialized-script-value",
    183             "read-only WebKitDOMSerializedScriptValue* TestTypedefs:immutable-serialized-script-value",
     183            "read-only gchar* TestTypedefs:immutable-serialized-script-value",
    184184            WEBKIT_DOM_TYPE_SERIALIZED_SCRIPT_VALUE,
    185185            WEBKIT_PARAM_READABLE));
    … …  
    303303}
    304304
    305 WebKitDOMSerializedScriptValue* webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self)
    306 {
    307     WebCore::JSMainThreadNullState state;
    308     g_return_val_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self), 0);
    309     WebCore::TestTypedefs* item = WebKit::core(self);
    310     RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->immutableSerializedScriptValue());
    311     return WebKit::kit(gobjectResult.get());
    312 }
    313 
    314 void webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* value)
    315 {
    316     WebCore::JSMainThreadNullState state;
    317     g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
    318     g_return_if_fail(WEBKIT_DOM_IS_SERIALIZED_SCRIPT_VALUE(value));
    319     WebCore::TestTypedefs* item = WebKit::core(self);
    320     WebCore::SerializedScriptValue* convertedValue = WebKit::core(value);
    321     item->setImmutableSerializedScriptValue(convertedValue);
     305gchar* webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self)
     306{
     307    WebCore::JSMainThreadNullState state;
     308    g_return_val_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self), 0);
     309    WebCore::TestTypedefs* item = WebKit::core(self);
     310    gchar* result = convertToUTF8String(item->immutableSerializedScriptValue()->toString());
     311    return result;
     312}
     313
     314void webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, const gchar* value)
     315{
     316    WebCore::JSMainThreadNullState state;
     317    g_return_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self));
     318    g_return_if_fail(value);
     319    WebCore::TestTypedefs* item = WebKit::core(self);
     320    item->setImmutableSerializedScriptValue(WebCore::SerializedScriptValue::create(WTF::String::fromUTF8(value)));
    322321}
    323322

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h

    r171181 r176017  
    128128 * @self: A #WebKitDOMTestTypedefs
    129129 *
    130  * Returns: (transfer none): A #WebKitDOMSerializedScriptValue
    131  *
    132  * Stability: Unstable
    133 **/
    134 WEBKIT_API WebKitDOMSerializedScriptValue*
     130 * Returns: A #gchar
     131 *
     132 * Stability: Unstable
     133**/
     134WEBKIT_API gchar*
    135135webkit_dom_test_typedefs_get_immutable_serialized_script_value(WebKitDOMTestTypedefs* self);
    136136
    … …  
    138138 * webkit_dom_test_typedefs_set_immutable_serialized_script_value:
    139139 * @self: A #WebKitDOMTestTypedefs
    140  * @value: A #WebKitDOMSerializedScriptValue
    141  *
    142  * Stability: Unstable
    143 **/
    144 WEBKIT_API void
    145 webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, WebKitDOMSerializedScriptValue* value);
     140 * @value: A #gchar
     141 *
     142 * Stability: Unstable
     143**/
     144WEBKIT_API void
     145webkit_dom_test_typedefs_set_immutable_serialized_script_value(WebKitDOMTestTypedefs* self, const gchar* value);
    146146
    147147/**
Note: See TracChangeset for help on using the changeset viewer.