<!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>[170567] 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/170567">170567</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-28 02:06:09 -0700 (Sat, 28 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Use public getter/setter in GObject DOM bindings properties implementation.
https://bugs.webkit.org/show_bug.cgi?id=134390.
Patch by Juan A. Suarez Romero <jasuarez@igalia.com> and Carlos Garcia Campos <cgarcia@igalia.com> on 2014-06-28
Reviewed by Carlos Garcia Campos.
The current GObject DOM bindings generator is duplicating code when
implementing the get/set_property methods and the public
getters/setters, instead of making one invoking the other.
This commit changes this behaviour so the code is not duplicated,
making it easier to maintain.
No new tests needed.
* bindings/scripts/CodeGeneratorGObject.pm:
(GenerateProperty):
(GenerateProperties):
(WriteData):
(GetCoreObject): Deleted.
* bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
(webkit_dom_test_active_dom_object_get_property):
* bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
(webkit_dom_test_event_constructor_get_property):
* bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
(webkit_dom_test_exception_get_property):
* bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
(webkit_dom_test_interface_set_property):
(webkit_dom_test_interface_get_property):
* bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp:
(webkit_dom_test_nondeterministic_set_property):
(webkit_dom_test_nondeterministic_get_property):
* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
(webkit_dom_test_obj_set_property):
(webkit_dom_test_obj_get_property):
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
(webkit_dom_test_serialized_script_value_interface_get_property):
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
(webkit_dom_test_typedefs_set_property):
(webkit_dom_test_typedefs_get_property):
* bindings/scripts/test/GObject/WebKitDOMattribute.cpp:
(webkit_dom_test_exception_get_property):
(webkit_dom_attribute_get_property):</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="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestEventConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestExceptioncpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestNondeterministiccpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMattributecpp">trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMattribute.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/ChangeLog 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-06-28 Juan A. Suarez Romero <jasuarez@igalia.com> and Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Use public getter/setter in GObject DOM bindings properties implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=134390.
+
+ Reviewed by Carlos Garcia Campos.
+
+ The current GObject DOM bindings generator is duplicating code when
+ implementing the get/set_property methods and the public
+ getters/setters, instead of making one invoking the other.
+
+ This commit changes this behaviour so the code is not duplicated,
+ making it easier to maintain.
+
+ No new tests needed.
+
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GenerateProperty):
+ (GenerateProperties):
+ (WriteData):
+ (GetCoreObject): Deleted.
+ * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
+ (webkit_dom_test_active_dom_object_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
+ (webkit_dom_test_event_constructor_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
+ (webkit_dom_test_exception_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
+ (webkit_dom_test_interface_set_property):
+ (webkit_dom_test_interface_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp:
+ (webkit_dom_test_nondeterministic_set_property):
+ (webkit_dom_test_nondeterministic_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (webkit_dom_test_obj_set_property):
+ (webkit_dom_test_obj_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
+ (webkit_dom_test_serialized_script_value_interface_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
+ (webkit_dom_test_typedefs_set_property):
+ (webkit_dom_test_typedefs_get_property):
+ * bindings/scripts/test/GObject/WebKitDOMattribute.cpp:
+ (webkit_dom_test_exception_get_property):
+ (webkit_dom_attribute_get_property):
+
</ins><span class="cx"> 2014-06-28 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Elements with rounded corners and overflow:hidden do not properly clip their content
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -196,12 +196,6 @@
</span><span class="cx"> return "WebKitDOM$name";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetCoreObject {
- my ($interfaceName, $name, $parameter) = @_;
-
- return "WebCore::${interfaceName}* $name = WebKit::core($parameter);";
-}
-
</del><span class="cx"> sub SkipAttribute {
</span><span class="cx"> my $attribute = shift;
</span><span class="cx">
</span><span class="lines">@@ -494,19 +488,13 @@
</span><span class="cx"> my @writeableProperties = @{shift @_};
</span><span class="cx"> my $parentNode = shift;
</span><span class="cx">
</span><del>- my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
- my @conditionalWarn = GenerateConditionalWarning($attribute->signature, 8);
- my $parentConditionalString = $codeGenerator->GenerateConditionalString($parentNode);
- my @parentConditionalWarn = GenerateConditionalWarning($parentNode, 8);
- my $camelPropName = $attribute->signature->name;
- my $setPropNameFunction = $codeGenerator->WK_ucfirst($camelPropName);
- my $getPropNameFunction = $codeGenerator->WK_lcfirst($camelPropName);
</del><span class="cx"> my $hasGetterException = $attribute->signature->extendedAttributes->{"GetterRaisesException"};
</span><span class="cx"> my $hasSetterException = $attribute->signature->extendedAttributes->{"SetterRaisesException"};
</span><span class="cx">
</span><del>- my $propName = decamelize($camelPropName);
</del><ins>+ my $decamelizeInterfaceName = decamelize($interfaceName);
+ my $propName = decamelize($attribute->signature->name);
+ my $propFunctionName = GetFunctionSignatureName($interfaceName, $attribute);
</ins><span class="cx"> my $propNameCaps = uc($propName);
</span><del>- $propName =~ s/_/-/g;
</del><span class="cx"> my ${propEnum} = "PROP_${propNameCaps}";
</span><span class="cx"> push(@cBodyProperties, " ${propEnum},\n");
</span><span class="cx">
</span><span class="lines">@@ -527,71 +515,32 @@
</span><span class="cx"> $mutableString = "read-write";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- my $convertFunction = "";
- if ($gtype eq "string") {
- $convertFunction = "WTF::String::fromUTF8";
- }
</del><ins>+ my @getterArguments = ();
+ push(@getterArguments, "self");
+ push(@getterArguments, "nullptr") if $hasGetterException;
</ins><span class="cx">
</span><del>- my ($getterFunctionName, @getterArguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);
- my ($setterFunctionName, @setterArguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);
</del><ins>+ my @setterArguments = ();
+ push(@setterArguments, "self, g_value_get_$gtype(value)");
+ push(@setterArguments, "nullptr") if $hasSetterException;
</ins><span class="cx">
</span><del>- if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
- my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
- $implIncludes{"${implementedBy}.h"} = 1;
- push(@setterArguments, "${convertFunction}(g_value_get_$gtype(value))");
- unshift(@getterArguments, "coreSelf");
- unshift(@setterArguments, "coreSelf");
- $getterFunctionName = "WebCore::${implementedBy}::$getterFunctionName";
- $setterFunctionName = "WebCore::${implementedBy}::$setterFunctionName";
- } else {
- push(@setterArguments, "${convertFunction}(g_value_get_$gtype(value))");
- $getterFunctionName = "coreSelf->$getterFunctionName";
- $setterFunctionName = "coreSelf->$setterFunctionName";
- }
- push(@getterArguments, "isNull") if $attribute->signature->isNullable;
- push(@getterArguments, "ec") if $hasGetterException;
- push(@setterArguments, "ec") if $hasSetterException;
-
</del><span class="cx"> if (grep {$_ eq $attribute} @writeableProperties) {
</span><del>- push(@txtSetProps, " case ${propEnum}: {\n");
- push(@txtSetProps, "#if ${parentConditionalString}\n") if $parentConditionalString;
- push(@txtSetProps, "#if ${conditionalString}\n") if $conditionalString;
- push(@txtSetProps, " WebCore::ExceptionCode ec = 0;\n") if $hasSetterException;
- push(@txtSetProps, " ${setterFunctionName}(" . join(", ", @setterArguments) . ");\n");
- push(@txtSetProps, "#else\n") if $conditionalString;
- push(@txtSetProps, @conditionalWarn) if scalar(@conditionalWarn);
- push(@txtSetProps, "#endif /* ${conditionalString} */\n") if $conditionalString;
- push(@txtSetProps, "#else\n") if $parentConditionalString;
- push(@txtSetProps, @parentConditionalWarn) if scalar(@parentConditionalWarn);
- push(@txtSetProps, "#endif /* ${parentConditionalString} */\n") if $parentConditionalString;
- push(@txtSetProps, " break;\n }\n");
</del><ins>+ push(@txtSetProps, " case ${propEnum}:\n");
+ push(@txtSetProps, " webkit_dom_${decamelizeInterfaceName}_set_" . $propFunctionName . "(" . join(", ", @setterArguments) . ");\n");
+ push(@txtSetProps, " break;\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- push(@txtGetProps, " case ${propEnum}: {\n");
- push(@txtGetProps, "#if ${parentConditionalString}\n") if $parentConditionalString;
- push(@txtGetProps, "#if ${conditionalString}\n") if $conditionalString;
- push(@txtGetProps, " bool isNull = false;\n") if $attribute->signature->isNullable;
- push(@txtGetProps, " WebCore::ExceptionCode ec = 0;\n") if $hasGetterException;
</del><ins>+ push(@txtGetProps, " case ${propEnum}:\n");
</ins><span class="cx">
</span><span class="cx"> # FIXME: Should we return a default value when isNull == true?
</span><span class="cx">
</span><span class="cx"> my $postConvertFunction = "";
</span><span class="cx"> if ($gtype eq "string") {
</span><del>- push(@txtGetProps, " g_value_take_string(value, convertToUTF8String(${getterFunctionName}(" . join(", ", @getterArguments) . ")));\n");
- } elsif ($gtype eq "object") {
- push(@txtGetProps, " RefPtr<WebCore::${propType}> ptr = ${getterFunctionName}(" . join(", ", @getterArguments) . ");\n");
- push(@txtGetProps, " g_value_set_object(value, WebKit::kit(ptr.get()));\n");
</del><ins>+ push(@txtGetProps, " g_value_take_string(value, webkit_dom_${decamelizeInterfaceName}_get_" . $propFunctionName . "(" . join(", ", @getterArguments) . "));\n");
</ins><span class="cx"> } else {
</span><del>- push(@txtGetProps, " g_value_set_$gtype(value, ${convertFunction}${getterFunctionName}(" . join(", ", @getterArguments) . ")${postConvertFunction});\n");
</del><ins>+ push(@txtGetProps, " g_value_set_$gtype(value, webkit_dom_${decamelizeInterfaceName}_get_" . $propFunctionName . "(" . join(", ", @getterArguments) . "));\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- push(@txtGetProps, "#else\n") if $conditionalString;
- push(@txtGetProps, @conditionalWarn) if scalar(@conditionalWarn);
- push(@txtGetProps, "#endif /* ${conditionalString} */\n") if $conditionalString;
- push(@txtGetProps, "#else\n") if $parentConditionalString;
- push(@txtGetProps, @parentConditionalWarn) if scalar(@parentConditionalWarn);
- push(@txtGetProps, "#endif /* ${parentConditionalString} */\n") if $parentConditionalString;
- push(@txtGetProps, " break;\n }\n");
</del><ins>+ push(@txtGetProps, " break;\n");
</ins><span class="cx">
</span><span class="cx"> my %parameterSpecOptions = ("int" => [ "G_MININT", "G_MAXINT", "0" ],
</span><span class="cx"> "int8" => [ "G_MININT8", "G_MAXINT8", "0" ],
</span><span class="lines">@@ -612,6 +561,7 @@
</span><span class="cx">
</span><span class="cx"> my $extraParameters = join(", ", @{$parameterSpecOptions{$gtype}});
</span><span class="cx"> my $glibTypeName = GetGlibTypeName($propType);
</span><ins>+ $propName =~ s/_/-/g;
</ins><span class="cx"> my $txtInstallProp = << "EOF";
</span><span class="cx"> g_object_class_install_property(
</span><span class="cx"> gobjectClass,
</span><span class="lines">@@ -650,7 +600,6 @@
</span><span class="cx"> my $numProperties = scalar @readableProperties;
</span><span class="cx">
</span><span class="cx"> # Properties
</span><del>- my $privFunction = GetCoreObject($interfaceName, "coreSelf", "self");
</del><span class="cx"> if ($numProperties > 0) {
</span><span class="cx"> $implContent = << "EOF";
</span><span class="cx"> enum {
</span><span class="lines">@@ -660,30 +609,14 @@
</span><span class="cx">
</span><span class="cx"> push(@txtGetProps, "static void ${lowerCaseIfaceName}_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)\n");
</span><span class="cx"> push(@txtGetProps, "{\n");
</span><del>- push(@txtGetProps, " WebCore::JSMainThreadNullState state;\n");
- push(@txtGetProps, "${conditionGuardStart}\n") if $conditionalString;
</del><span class="cx"> push(@txtGetProps, " ${className}* self = WEBKIT_DOM_${clsCaps}(object);\n");
</span><del>- push(@txtGetProps, " ${privFunction}\n");
- if ($conditionalString) {
- push(@txtGetProps, "#else\n");
- push(@txtGetProps, " UNUSED_PARAM(value);\n");
- push(@txtGetProps, "${conditionGuardEnd}\n");
- }
</del><span class="cx"> push(@txtGetProps, "\n");
</span><span class="cx"> push(@txtGetProps, " switch (propertyId) {\n");
</span><span class="cx">
</span><span class="cx"> if (scalar @writeableProperties > 0) {
</span><span class="cx"> push(@txtSetProps, "static void ${lowerCaseIfaceName}_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)\n");
</span><span class="cx"> push(@txtSetProps, "{\n");
</span><del>- push(@txtSetProps, " WebCore::JSMainThreadNullState state;\n");
- push(@txtSetProps, "${conditionGuardStart}\n") if $conditionalString;
</del><span class="cx"> push(@txtSetProps, " ${className}* self = WEBKIT_DOM_${clsCaps}(object);\n");
</span><del>- push(@txtSetProps, " ${privFunction}\n");
- if ($conditionalString) {
- push(@txtSetProps, "#else\n");
- push(@txtSetProps, " UNUSED_PARAM(value);\n");
- push(@txtSetProps, "${conditionGuardEnd}\n");
- }
</del><span class="cx"> push(@txtSetProps, "\n");
</span><span class="cx"> push(@txtSetProps, " switch (propertyId) {\n");
</span><span class="cx"> }
</span><span class="lines">@@ -1750,6 +1683,9 @@
</span><span class="cx"> # Remove the implementation header from the list of included files.
</span><span class="cx"> %includesCopy = %implIncludes;
</span><span class="cx"> print IMPL map { "#include \"$_\"\n" } sort keys(%includesCopy);
</span><ins>+ if ($isStableClass and scalar(@hBodyUnstable)) {
+ print IMPL "#include \"${className}Unstable.h\"\n";
+ }
</ins><span class="cx">
</span><span class="cx"> print IMPL "#include <wtf/GetPtr.h>\n";
</span><span class="cx"> print IMPL "#include <wtf/RefPtr.h>\n\n";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -84,15 +84,12 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_active_dom_object_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestActiveDOMObject* self = WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(object);
</span><del>- WebCore::TestActiveDOMObject* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_EXCITING_ATTR: {
- g_value_set_long(value, coreSelf->excitingAttr());
</del><ins>+ case PROP_EXCITING_ATTR:
+ g_value_set_long(value, webkit_dom_test_active_dom_object_get_exciting_attr(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestEventConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -84,19 +84,15 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_event_constructor_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestEventConstructor* self = WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(object);
</span><del>- WebCore::TestEventConstructor* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_ATTR1: {
- g_value_take_string(value, convertToUTF8String(coreSelf->attr1()));
</del><ins>+ case PROP_ATTR1:
+ g_value_take_string(value, webkit_dom_test_event_constructor_get_attr1(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR2: {
- g_value_take_string(value, convertToUTF8String(coreSelf->attr2()));
</del><ins>+ case PROP_ATTR2:
+ g_value_take_string(value, webkit_dom_test_event_constructor_get_attr2(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestExceptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -83,15 +83,12 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_exception_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestException* self = WEBKIT_DOM_TEST_EXCEPTION(object);
</span><del>- WebCore::TestException* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_NAME: {
- g_value_take_string(value, convertToUTF8String(coreSelf->name()));
</del><ins>+ case PROP_NAME:
+ g_value_take_string(value, webkit_dom_test_exception_get_name(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -97,43 +97,15 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_interface_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
-#if ENABLE(Condition1) || ENABLE(Condition2)
</del><span class="cx"> WebKitDOMTestInterface* self = WEBKIT_DOM_TEST_INTERFACE(object);
</span><del>- WebCore::TestInterface* coreSelf = WebKit::core(self);
-#else
- UNUSED_PARAM(value);
-#endif // ENABLE(Condition1) || ENABLE(Condition2)
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_IMPLEMENTS_STR2: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition22) || ENABLE(Condition23)
- coreSelf->setImplementsStr2(WTF::String::fromUTF8(g_value_get_string(value)));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition22")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition23")
-#endif /* ENABLE(Condition22) || ENABLE(Condition23) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_IMPLEMENTS_STR2:
+ webkit_dom_test_interface_set_implements_str2(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_SUPPLEMENTAL_STR2: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition11) || ENABLE(Condition12)
- WebCore::TestSupplemental::setSupplementalStr2(coreSelf, WTF::String::fromUTF8(g_value_get_string(value)));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_SUPPLEMENTAL_STR2:
+ webkit_dom_test_interface_set_supplemental_str2(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span><span class="lines">@@ -142,101 +114,27 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
-#if ENABLE(Condition1) || ENABLE(Condition2)
</del><span class="cx"> WebKitDOMTestInterface* self = WEBKIT_DOM_TEST_INTERFACE(object);
</span><del>- WebCore::TestInterface* coreSelf = WebKit::core(self);
-#else
- UNUSED_PARAM(value);
-#endif // ENABLE(Condition1) || ENABLE(Condition2)
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_IMPLEMENTS_STR1: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition22) || ENABLE(Condition23)
- g_value_take_string(value, convertToUTF8String(coreSelf->implementsStr1()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition22")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition23")
-#endif /* ENABLE(Condition22) || ENABLE(Condition23) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_IMPLEMENTS_STR1:
+ g_value_take_string(value, webkit_dom_test_interface_get_implements_str1(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_IMPLEMENTS_STR2: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition22) || ENABLE(Condition23)
- g_value_take_string(value, convertToUTF8String(coreSelf->implementsStr2()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition22")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition23")
-#endif /* ENABLE(Condition22) || ENABLE(Condition23) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_IMPLEMENTS_STR2:
+ g_value_take_string(value, webkit_dom_test_interface_get_implements_str2(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_IMPLEMENTS_NODE: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition22) || ENABLE(Condition23)
- RefPtr<WebCore::Node> ptr = coreSelf->implementsNode();
- g_value_set_object(value, WebKit::kit(ptr.get()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition22")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition23")
-#endif /* ENABLE(Condition22) || ENABLE(Condition23) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_IMPLEMENTS_NODE:
+ g_value_set_object(value, webkit_dom_test_interface_get_implements_node(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_SUPPLEMENTAL_STR1: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition11) || ENABLE(Condition12)
- g_value_take_string(value, convertToUTF8String(WebCore::TestSupplemental::supplementalStr1(coreSelf)));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_SUPPLEMENTAL_STR1:
+ g_value_take_string(value, webkit_dom_test_interface_get_supplemental_str1(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_SUPPLEMENTAL_STR2: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition11) || ENABLE(Condition12)
- g_value_take_string(value, convertToUTF8String(WebCore::TestSupplemental::supplementalStr2(coreSelf)));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_SUPPLEMENTAL_STR2:
+ g_value_take_string(value, webkit_dom_test_interface_get_supplemental_str2(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_SUPPLEMENTAL_NODE: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
-#if ENABLE(Condition11) || ENABLE(Condition12)
- RefPtr<WebCore::Node> ptr = WebCore::TestSupplemental::supplementalNode(coreSelf);
- g_value_set_object(value, WebKit::kit(ptr.get()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-#endif /* ENABLE(Condition11) || ENABLE(Condition12) */
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_SUPPLEMENTAL_NODE:
+ g_value_set_object(value, webkit_dom_test_interface_get_supplemental_node(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestNondeterministiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNondeterministic.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -87,28 +87,21 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_nondeterministic_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestNondeterministic* self = WEBKIT_DOM_TEST_NONDETERMINISTIC(object);
</span><del>- WebCore::TestNondeterministic* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_NONDETERMINISTIC_WRITEABLE_ATTR: {
- coreSelf->setNondeterministicWriteableAttr(WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_NONDETERMINISTIC_WRITEABLE_ATTR:
+ webkit_dom_test_nondeterministic_set_nondeterministic_writeable_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NONDETERMINISTIC_EXCEPTION_ATTR: {
- coreSelf->setNondeterministicExceptionAttr(WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_NONDETERMINISTIC_EXCEPTION_ATTR:
+ webkit_dom_test_nondeterministic_set_nondeterministic_exception_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NONDETERMINISTIC_GETTER_EXCEPTION_ATTR: {
- coreSelf->setNondeterministicGetterExceptionAttr(WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_NONDETERMINISTIC_GETTER_EXCEPTION_ATTR:
+ webkit_dom_test_nondeterministic_set_nondeterministic_getter_exception_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NONDETERMINISTIC_SETTER_EXCEPTION_ATTR: {
- WebCore::ExceptionCode ec = 0;
- coreSelf->setNondeterministicSetterExceptionAttr(WTF::String::fromUTF8(g_value_get_string(value)), ec);
</del><ins>+ case PROP_NONDETERMINISTIC_SETTER_EXCEPTION_ATTR:
+ webkit_dom_test_nondeterministic_set_nondeterministic_setter_exception_attr(self, g_value_get_string(value), nullptr);
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span><span class="lines">@@ -117,32 +110,24 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_nondeterministic_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestNondeterministic* self = WEBKIT_DOM_TEST_NONDETERMINISTIC(object);
</span><del>- WebCore::TestNondeterministic* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_NONDETERMINISTIC_READONLY_ATTR: {
- g_value_set_long(value, coreSelf->nondeterministicReadonlyAttr());
</del><ins>+ case PROP_NONDETERMINISTIC_READONLY_ATTR:
+ g_value_set_long(value, webkit_dom_test_nondeterministic_get_nondeterministic_readonly_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NONDETERMINISTIC_WRITEABLE_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->nondeterministicWriteableAttr()));
</del><ins>+ case PROP_NONDETERMINISTIC_WRITEABLE_ATTR:
+ g_value_take_string(value, webkit_dom_test_nondeterministic_get_nondeterministic_writeable_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NONDETERMINISTIC_EXCEPTION_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->nondeterministicExceptionAttr()));
</del><ins>+ case PROP_NONDETERMINISTIC_EXCEPTION_ATTR:
+ g_value_take_string(value, webkit_dom_test_nondeterministic_get_nondeterministic_exception_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NONDETERMINISTIC_GETTER_EXCEPTION_ATTR: {
- WebCore::ExceptionCode ec = 0;
- g_value_take_string(value, convertToUTF8String(coreSelf->nondeterministicGetterExceptionAttr(ec)));
</del><ins>+ case PROP_NONDETERMINISTIC_GETTER_EXCEPTION_ATTR:
+ g_value_take_string(value, webkit_dom_test_nondeterministic_get_nondeterministic_getter_exception_attr(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NONDETERMINISTIC_SETTER_EXCEPTION_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->nondeterministicSetterExceptionAttr()));
</del><ins>+ case PROP_NONDETERMINISTIC_SETTER_EXCEPTION_ATTR:
+ g_value_take_string(value, webkit_dom_test_nondeterministic_get_nondeterministic_setter_exception_attr(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -146,155 +146,102 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_obj_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
</span><del>- WebCore::TestObj* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_BYTE_ATTR: {
- coreSelf->setByteAttr((g_value_get_int8(value)));
</del><ins>+ case PROP_BYTE_ATTR:
+ webkit_dom_test_obj_set_byte_attr(self, g_value_get_int8(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_OCTET_ATTR: {
- coreSelf->setOctetAttr((g_value_get_uint8(value)));
</del><ins>+ case PROP_OCTET_ATTR:
+ webkit_dom_test_obj_set_octet_attr(self, g_value_get_uint8(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_SHORT_ATTR: {
- coreSelf->setShortAttr((g_value_get_int(value)));
</del><ins>+ case PROP_SHORT_ATTR:
+ webkit_dom_test_obj_set_short_attr(self, g_value_get_int(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_UNSIGNED_SHORT_ATTR: {
- coreSelf->setUnsignedShortAttr((g_value_get_uint(value)));
</del><ins>+ case PROP_UNSIGNED_SHORT_ATTR:
+ webkit_dom_test_obj_set_unsigned_short_attr(self, g_value_get_uint(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_LONG_ATTR: {
- coreSelf->setLongAttr((g_value_get_long(value)));
</del><ins>+ case PROP_LONG_ATTR:
+ webkit_dom_test_obj_set_long_attr(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_LONG_LONG_ATTR: {
- coreSelf->setLongLongAttr((g_value_get_int64(value)));
</del><ins>+ case PROP_LONG_LONG_ATTR:
+ webkit_dom_test_obj_set_long_long_attr(self, g_value_get_int64(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_UNSIGNED_LONG_LONG_ATTR: {
- coreSelf->setUnsignedLongLongAttr((g_value_get_uint64(value)));
</del><ins>+ case PROP_UNSIGNED_LONG_LONG_ATTR:
+ webkit_dom_test_obj_set_unsigned_long_long_attr(self, g_value_get_uint64(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR: {
- coreSelf->setStringAttr(WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_STRING_ATTR:
+ webkit_dom_test_obj_set_string_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CREATE: {
- coreSelf->setCreate((g_value_get_boolean(value)));
</del><ins>+ case PROP_CREATE:
+ webkit_dom_test_obj_set_create(self, g_value_get_boolean(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_STRING_ATTR: {
- coreSelf->setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedstringattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_REFLECTED_STRING_ATTR:
+ webkit_dom_test_obj_set_reflected_string_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_INTEGRAL_ATTR: {
- coreSelf->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, (g_value_get_long(value)));
</del><ins>+ case PROP_REFLECTED_INTEGRAL_ATTR:
+ webkit_dom_test_obj_set_reflected_integral_attr(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR: {
- coreSelf->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, (g_value_get_ulong(value)));
</del><ins>+ case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR:
+ webkit_dom_test_obj_set_reflected_unsigned_integral_attr(self, g_value_get_ulong(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_BOOLEAN_ATTR: {
- coreSelf->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, (g_value_get_boolean(value)));
</del><ins>+ case PROP_REFLECTED_BOOLEAN_ATTR:
+ webkit_dom_test_obj_set_reflected_boolean_attr(self, g_value_get_boolean(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_URL_ATTR: {
- coreSelf->setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedurlattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_REFLECTED_URL_ATTR:
+ webkit_dom_test_obj_set_reflected_url_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_STRING_ATTR: {
- coreSelf->setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentStringAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_REFLECTED_STRING_ATTR:
+ webkit_dom_test_obj_set_reflected_string_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR: {
- coreSelf->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, (g_value_get_long(value)));
</del><ins>+ case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
+ webkit_dom_test_obj_set_reflected_custom_integral_attr(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR: {
- coreSelf->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, (g_value_get_boolean(value)));
</del><ins>+ case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
+ webkit_dom_test_obj_set_reflected_custom_boolean_attr(self, g_value_get_boolean(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_CUSTOM_URL_ATTR: {
- coreSelf->setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentURLAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_REFLECTED_CUSTOM_URL_ATTR:
+ webkit_dom_test_obj_set_reflected_custom_url_attr(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_GETTER_EXCEPTION: {
- coreSelf->setAttrWithGetterException((g_value_get_long(value)));
</del><ins>+ case PROP_ATTR_WITH_GETTER_EXCEPTION:
+ webkit_dom_test_obj_set_attr_with_getter_exception(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_SETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
</del><ins>+ case PROP_ATTR_WITH_SETTER_EXCEPTION:
+ webkit_dom_test_obj_set_attr_with_setter_exception(self, g_value_get_long(value), nullptr);
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
- coreSelf->setStringAttrWithGetterException(WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
+ webkit_dom_test_obj_set_string_attr_with_getter_exception(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- coreSelf->setStringAttrWithSetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
</del><ins>+ case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
+ webkit_dom_test_obj_set_string_attr_with_setter_exception(self, g_value_get_string(value), nullptr);
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_STATE_ATTRIBUTE: {
- coreSelf->setWithScriptStateAttribute((g_value_get_long(value)));
</del><ins>+ case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
+ webkit_dom_test_obj_set_with_script_state_attribute(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CONDITIONAL_ATTR1: {
-#if ENABLE(Condition1)
- coreSelf->setConditionalAttr1((g_value_get_long(value)));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-#endif /* ENABLE(Condition1) */
</del><ins>+ case PROP_CONDITIONAL_ATTR1:
+ webkit_dom_test_obj_set_conditional_attr1(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CONDITIONAL_ATTR2: {
-#if ENABLE(Condition1) && ENABLE(Condition2)
- coreSelf->setConditionalAttr2((g_value_get_long(value)));
-#else
-#if !ENABLE(Condition1)
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-#endif
-#if !ENABLE(Condition2)
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif
-#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
</del><ins>+ case PROP_CONDITIONAL_ATTR2:
+ webkit_dom_test_obj_set_conditional_attr2(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CONDITIONAL_ATTR3: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
- coreSelf->setConditionalAttr3((g_value_get_long(value)));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_CONDITIONAL_ATTR3:
+ webkit_dom_test_obj_set_conditional_attr3(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRAWBERRY: {
- coreSelf->setBlueberry((g_value_get_long(value)));
</del><ins>+ case PROP_STRAWBERRY:
+ webkit_dom_test_obj_set_strawberry(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRICT_FLOAT: {
- coreSelf->setStrictFloat((g_value_get_float(value)));
</del><ins>+ case PROP_STRICT_FLOAT:
+ webkit_dom_test_obj_set_strict_float(self, g_value_get_float(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ID: {
- coreSelf->setId((g_value_get_long(value)));
</del><ins>+ case PROP_ID:
+ webkit_dom_test_obj_set_id(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_LONG_SETTABLE_ATTRIBUTE: {
- coreSelf->setNullableLongSettableAttribute((g_value_get_long(value)));
</del><ins>+ case PROP_NULLABLE_LONG_SETTABLE_ATTRIBUTE:
+ webkit_dom_test_obj_set_nullable_long_settable_attribute(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_STRING_VALUE: {
- coreSelf->setNullableStringValue((g_value_get_long(value)));
</del><ins>+ case PROP_NULLABLE_STRING_VALUE:
+ webkit_dom_test_obj_set_nullable_string_value(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span><span class="lines">@@ -303,275 +250,174 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_obj_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
</span><del>- WebCore::TestObj* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_READ_ONLY_LONG_ATTR: {
- g_value_set_long(value, coreSelf->readOnlyLongAttr());
</del><ins>+ case PROP_READ_ONLY_LONG_ATTR:
+ g_value_set_long(value, webkit_dom_test_obj_get_read_only_long_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_READ_ONLY_STRING_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->readOnlyStringAttr()));
</del><ins>+ case PROP_READ_ONLY_STRING_ATTR:
+ g_value_take_string(value, webkit_dom_test_obj_get_read_only_string_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_READ_ONLY_TEST_OBJ_ATTR: {
- RefPtr<WebCore::TestObj> ptr = coreSelf->readOnlyTestObjAttr();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_READ_ONLY_TEST_OBJ_ATTR:
+ g_value_set_object(value, webkit_dom_test_obj_get_read_only_test_obj_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_BYTE_ATTR: {
- g_value_set_int8(value, coreSelf->byteAttr());
</del><ins>+ case PROP_BYTE_ATTR:
+ g_value_set_int8(value, webkit_dom_test_obj_get_byte_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_OCTET_ATTR: {
- g_value_set_uint8(value, coreSelf->octetAttr());
</del><ins>+ case PROP_OCTET_ATTR:
+ g_value_set_uint8(value, webkit_dom_test_obj_get_octet_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_SHORT_ATTR: {
- g_value_set_int(value, coreSelf->shortAttr());
</del><ins>+ case PROP_SHORT_ATTR:
+ g_value_set_int(value, webkit_dom_test_obj_get_short_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_UNSIGNED_SHORT_ATTR: {
- g_value_set_uint(value, coreSelf->unsignedShortAttr());
</del><ins>+ case PROP_UNSIGNED_SHORT_ATTR:
+ g_value_set_uint(value, webkit_dom_test_obj_get_unsigned_short_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_LONG_ATTR: {
- g_value_set_long(value, coreSelf->longAttr());
</del><ins>+ case PROP_LONG_ATTR:
+ g_value_set_long(value, webkit_dom_test_obj_get_long_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_LONG_LONG_ATTR: {
- g_value_set_int64(value, coreSelf->longLongAttr());
</del><ins>+ case PROP_LONG_LONG_ATTR:
+ g_value_set_int64(value, webkit_dom_test_obj_get_long_long_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_UNSIGNED_LONG_LONG_ATTR: {
- g_value_set_uint64(value, coreSelf->unsignedLongLongAttr());
</del><ins>+ case PROP_UNSIGNED_LONG_LONG_ATTR:
+ g_value_set_uint64(value, webkit_dom_test_obj_get_unsigned_long_long_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->stringAttr()));
</del><ins>+ case PROP_STRING_ATTR:
+ g_value_take_string(value, webkit_dom_test_obj_get_string_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_TEST_OBJ_ATTR: {
- RefPtr<WebCore::TestObj> ptr = coreSelf->testObjAttr();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_TEST_OBJ_ATTR:
+ g_value_set_object(value, webkit_dom_test_obj_get_test_obj_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_XML_OBJ_ATTR: {
- RefPtr<WebCore::TestObj> ptr = coreSelf->xmlObjAttr();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_XML_OBJ_ATTR:
+ g_value_set_object(value, webkit_dom_test_obj_get_xml_obj_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CREATE: {
- g_value_set_boolean(value, coreSelf->isCreate());
</del><ins>+ case PROP_CREATE:
+ g_value_set_boolean(value, webkit_dom_test_obj_get_create(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_STRING_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->fastGetAttribute(WebCore::HTMLNames::reflectedstringattrAttr)));
</del><ins>+ case PROP_REFLECTED_STRING_ATTR:
+ g_value_take_string(value, webkit_dom_test_obj_get_reflected_string_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_INTEGRAL_ATTR: {
- g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr));
</del><ins>+ case PROP_REFLECTED_INTEGRAL_ATTR:
+ g_value_set_long(value, webkit_dom_test_obj_get_reflected_integral_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR: {
- g_value_set_ulong(value, coreSelf->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr));
</del><ins>+ case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR:
+ g_value_set_ulong(value, webkit_dom_test_obj_get_reflected_unsigned_integral_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_BOOLEAN_ATTR: {
- g_value_set_boolean(value, coreSelf->fastHasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));
</del><ins>+ case PROP_REFLECTED_BOOLEAN_ATTR:
+ g_value_set_boolean(value, webkit_dom_test_obj_get_reflected_boolean_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_URL_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr)));
</del><ins>+ case PROP_REFLECTED_URL_ATTR:
+ g_value_take_string(value, webkit_dom_test_obj_get_reflected_url_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_STRING_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->fastGetAttribute(WebCore::HTMLNames::customContentStringAttrAttr)));
</del><ins>+ case PROP_REFLECTED_STRING_ATTR:
+ g_value_take_string(value, webkit_dom_test_obj_get_reflected_string_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR: {
- g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr));
</del><ins>+ case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
+ g_value_set_long(value, webkit_dom_test_obj_get_reflected_custom_integral_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR: {
- g_value_set_boolean(value, coreSelf->fastHasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));
</del><ins>+ case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
+ g_value_set_boolean(value, webkit_dom_test_obj_get_reflected_custom_boolean_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REFLECTED_CUSTOM_URL_ATTR: {
- g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr)));
</del><ins>+ case PROP_REFLECTED_CUSTOM_URL_ATTR:
+ g_value_take_string(value, webkit_dom_test_obj_get_reflected_custom_url_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_GETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- g_value_set_long(value, coreSelf->attrWithGetterException(ec));
</del><ins>+ case PROP_ATTR_WITH_GETTER_EXCEPTION:
+ g_value_set_long(value, webkit_dom_test_obj_get_attr_with_getter_exception(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_SETTER_EXCEPTION: {
- g_value_set_long(value, coreSelf->attrWithSetterException());
</del><ins>+ case PROP_ATTR_WITH_SETTER_EXCEPTION:
+ g_value_set_long(value, webkit_dom_test_obj_get_attr_with_setter_exception(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithGetterException(ec)));
</del><ins>+ case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
+ g_value_take_string(value, webkit_dom_test_obj_get_string_attr_with_getter_exception(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
- g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
</del><ins>+ case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
+ g_value_take_string(value, webkit_dom_test_obj_get_string_attr_with_setter_exception(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_STATE_ATTRIBUTE: {
- g_value_set_long(value, coreSelf->withScriptStateAttribute());
</del><ins>+ case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
+ g_value_set_long(value, webkit_dom_test_obj_get_with_script_state_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE: {
- RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttribute();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE:
+ g_value_set_object(value, webkit_dom_test_obj_get_with_script_execution_context_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES: {
- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptStateAttributeRaises(ec);
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES:
+ g_value_set_object(value, webkit_dom_test_obj_get_with_script_state_attribute_raises(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES: {
- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttributeRaises(ec);
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES:
+ g_value_set_object(value, webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE: {
- RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttribute();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE:
+ g_value_set_object(value, webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES: {
- WebCore::ExceptionCode ec = 0;
- RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttributeRaises(ec);
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES:
+ g_value_set_object(value, webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE: {
- RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateWithSpacesAttribute();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE:
+ g_value_set_object(value, webkit_dom_test_obj_get_with_script_execution_context_and_script_state_with_spaces_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE: {
- RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptArgumentsAndCallStackAttribute();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE:
+ g_value_set_object(value, webkit_dom_test_obj_get_with_script_arguments_and_call_stack_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CONDITIONAL_ATTR1: {
-#if ENABLE(Condition1)
- g_value_set_long(value, coreSelf->conditionalAttr1());
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-#endif /* ENABLE(Condition1) */
</del><ins>+ case PROP_CONDITIONAL_ATTR1:
+ g_value_set_long(value, webkit_dom_test_obj_get_conditional_attr1(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CONDITIONAL_ATTR2: {
-#if ENABLE(Condition1) && ENABLE(Condition2)
- g_value_set_long(value, coreSelf->conditionalAttr2());
-#else
-#if !ENABLE(Condition1)
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-#endif
-#if !ENABLE(Condition2)
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif
-#endif /* ENABLE(Condition1) && ENABLE(Condition2) */
</del><ins>+ case PROP_CONDITIONAL_ATTR2:
+ g_value_set_long(value, webkit_dom_test_obj_get_conditional_attr2(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CONDITIONAL_ATTR3: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
- g_value_set_long(value, coreSelf->conditionalAttr3());
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_CONDITIONAL_ATTR3:
+ g_value_set_long(value, webkit_dom_test_obj_get_conditional_attr3(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ANY_ATTRIBUTE: {
- RefPtr<WebCore::any> ptr = coreSelf->anyAttribute();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_ANY_ATTRIBUTE:
+ g_value_set_object(value, webkit_dom_test_obj_get_any_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CONTENT_DOCUMENT: {
- RefPtr<WebCore::Document> ptr = coreSelf->contentDocument();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_CONTENT_DOCUMENT:
+ g_value_set_object(value, webkit_dom_test_obj_get_content_document(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_MUTABLE_POINT: {
- RefPtr<WebCore::SVGPoint> ptr = coreSelf->mutablePoint();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_MUTABLE_POINT:
+ g_value_set_object(value, webkit_dom_test_obj_get_mutable_point(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_IMMUTABLE_POINT: {
- RefPtr<WebCore::SVGPoint> ptr = coreSelf->immutablePoint();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_IMMUTABLE_POINT:
+ g_value_set_object(value, webkit_dom_test_obj_get_immutable_point(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRAWBERRY: {
- g_value_set_long(value, coreSelf->blueberry());
</del><ins>+ case PROP_STRAWBERRY:
+ g_value_set_long(value, webkit_dom_test_obj_get_strawberry(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRICT_FLOAT: {
- g_value_set_float(value, coreSelf->strictFloat());
</del><ins>+ case PROP_STRICT_FLOAT:
+ g_value_set_float(value, webkit_dom_test_obj_get_strict_float(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_DESCRIPTION: {
- g_value_set_long(value, coreSelf->description());
</del><ins>+ case PROP_DESCRIPTION:
+ g_value_set_long(value, webkit_dom_test_obj_get_description(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ID: {
- g_value_set_long(value, coreSelf->id());
</del><ins>+ case PROP_ID:
+ g_value_set_long(value, webkit_dom_test_obj_get_id(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_HASH: {
- g_value_take_string(value, convertToUTF8String(coreSelf->hash()));
</del><ins>+ case PROP_HASH:
+ g_value_take_string(value, webkit_dom_test_obj_get_hash(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_REPLACEABLE_ATTRIBUTE: {
- g_value_set_long(value, coreSelf->replaceableAttribute());
</del><ins>+ case PROP_REPLACEABLE_ATTRIBUTE:
+ g_value_set_long(value, webkit_dom_test_obj_get_replaceable_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_DOUBLE_ATTRIBUTE: {
- bool isNull = false;
- g_value_set_double(value, coreSelf->nullableDoubleAttribute(isNull));
</del><ins>+ case PROP_NULLABLE_DOUBLE_ATTRIBUTE:
+ g_value_set_double(value, webkit_dom_test_obj_get_nullable_double_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_LONG_ATTRIBUTE: {
- bool isNull = false;
- g_value_set_long(value, coreSelf->nullableLongAttribute(isNull));
</del><ins>+ case PROP_NULLABLE_LONG_ATTRIBUTE:
+ g_value_set_long(value, webkit_dom_test_obj_get_nullable_long_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_BOOLEAN_ATTRIBUTE: {
- bool isNull = false;
- g_value_set_boolean(value, coreSelf->nullableBooleanAttribute(isNull));
</del><ins>+ case PROP_NULLABLE_BOOLEAN_ATTRIBUTE:
+ g_value_set_boolean(value, webkit_dom_test_obj_get_nullable_boolean_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_STRING_ATTRIBUTE: {
- bool isNull = false;
- g_value_take_string(value, convertToUTF8String(coreSelf->nullableStringAttribute(isNull)));
</del><ins>+ case PROP_NULLABLE_STRING_ATTRIBUTE:
+ g_value_take_string(value, webkit_dom_test_obj_get_nullable_string_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_LONG_SETTABLE_ATTRIBUTE: {
- bool isNull = false;
- g_value_set_long(value, coreSelf->nullableLongSettableAttribute(isNull));
</del><ins>+ case PROP_NULLABLE_LONG_SETTABLE_ATTRIBUTE:
+ g_value_set_long(value, webkit_dom_test_obj_get_nullable_long_settable_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_NULLABLE_STRING_VALUE: {
- bool isNull = false;
- WebCore::ExceptionCode ec = 0;
- g_value_set_long(value, coreSelf->nullableStringValue(isNull, ec));
</del><ins>+ case PROP_NULLABLE_STRING_VALUE:
+ g_value_set_long(value, webkit_dom_test_obj_get_nullable_string_value(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTRIBUTE: {
- g_value_take_string(value, convertToUTF8String(coreSelf->attribute()));
</del><ins>+ case PROP_ATTRIBUTE:
+ g_value_take_string(value, webkit_dom_test_obj_get_attribute(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -93,55 +93,21 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_serialized_script_value_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
-#if ENABLE(Condition1) || ENABLE(Condition2)
</del><span class="cx"> WebKitDOMTestSerializedScriptValueInterface* self = WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(object);
</span><del>- WebCore::TestSerializedScriptValueInterface* coreSelf = WebKit::core(self);
-#else
- UNUSED_PARAM(value);
-#endif // ENABLE(Condition1) || ENABLE(Condition2)
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_VALUE: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
- RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->value();
- g_value_set_object(value, WebKit::kit(ptr.get()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_VALUE:
+ g_value_set_object(value, webkit_dom_test_serialized_script_value_interface_get_value(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_READONLY_VALUE: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
- RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->readonlyValue();
- g_value_set_object(value, WebKit::kit(ptr.get()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_READONLY_VALUE:
+ g_value_set_object(value, webkit_dom_test_serialized_script_value_interface_get_readonly_value(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CACHED_VALUE: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
- RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->cachedValue();
- g_value_set_object(value, WebKit::kit(ptr.get()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_CACHED_VALUE:
+ g_value_set_object(value, webkit_dom_test_serialized_script_value_interface_get_cached_value(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_CACHED_READONLY_VALUE: {
-#if ENABLE(Condition1) || ENABLE(Condition2)
- RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->cachedReadonlyValue();
- g_value_set_object(value, WebKit::kit(ptr.get()));
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-#endif /* ENABLE(Condition1) || ENABLE(Condition2) */
</del><ins>+ case PROP_CACHED_READONLY_VALUE:
+ g_value_set_object(value, webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -92,33 +92,24 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_typedefs_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestTypedefs* self = WEBKIT_DOM_TEST_TYPEDEFS(object);
</span><del>- WebCore::TestTypedefs* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_UNSIGNED_LONG_LONG_ATTR: {
- coreSelf->setUnsignedLongLongAttr((g_value_get_uint64(value)));
</del><ins>+ case PROP_UNSIGNED_LONG_LONG_ATTR:
+ webkit_dom_test_typedefs_set_unsigned_long_long_attr(self, g_value_get_uint64(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_GETTER_EXCEPTION: {
- coreSelf->setAttrWithGetterException((g_value_get_long(value)));
</del><ins>+ case PROP_ATTR_WITH_GETTER_EXCEPTION:
+ webkit_dom_test_typedefs_set_attr_with_getter_exception(self, g_value_get_long(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_SETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
</del><ins>+ case PROP_ATTR_WITH_SETTER_EXCEPTION:
+ webkit_dom_test_typedefs_set_attr_with_setter_exception(self, g_value_get_long(value), nullptr);
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
- coreSelf->setStringAttrWithGetterException(WTF::String::fromUTF8(g_value_get_string(value)));
</del><ins>+ case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
+ webkit_dom_test_typedefs_set_string_attr_with_getter_exception(self, g_value_get_string(value));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- coreSelf->setStringAttrWithSetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
</del><ins>+ case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
+ webkit_dom_test_typedefs_set_string_attr_with_setter_exception(self, g_value_get_string(value), nullptr);
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span><span class="lines">@@ -127,38 +118,27 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_typedefs_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestTypedefs* self = WEBKIT_DOM_TEST_TYPEDEFS(object);
</span><del>- WebCore::TestTypedefs* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_UNSIGNED_LONG_LONG_ATTR: {
- g_value_set_uint64(value, coreSelf->unsignedLongLongAttr());
</del><ins>+ case PROP_UNSIGNED_LONG_LONG_ATTR:
+ g_value_set_uint64(value, webkit_dom_test_typedefs_get_unsigned_long_long_attr(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_IMMUTABLE_SERIALIZED_SCRIPT_VALUE: {
- RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->immutableSerializedScriptValue();
- g_value_set_object(value, WebKit::kit(ptr.get()));
</del><ins>+ case PROP_IMMUTABLE_SERIALIZED_SCRIPT_VALUE:
+ g_value_set_object(value, webkit_dom_test_typedefs_get_immutable_serialized_script_value(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_GETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- g_value_set_long(value, coreSelf->attrWithGetterException(ec));
</del><ins>+ case PROP_ATTR_WITH_GETTER_EXCEPTION:
+ g_value_set_long(value, webkit_dom_test_typedefs_get_attr_with_getter_exception(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_ATTR_WITH_SETTER_EXCEPTION: {
- g_value_set_long(value, coreSelf->attrWithSetterException());
</del><ins>+ case PROP_ATTR_WITH_SETTER_EXCEPTION:
+ g_value_set_long(value, webkit_dom_test_typedefs_get_attr_with_setter_exception(self));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
- WebCore::ExceptionCode ec = 0;
- g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithGetterException(ec)));
</del><ins>+ case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
+ g_value_take_string(value, webkit_dom_test_typedefs_get_string_attr_with_getter_exception(self, nullptr));
</ins><span class="cx"> break;
</span><del>- }
- case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
- g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
</del><ins>+ case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
+ g_value_take_string(value, webkit_dom_test_typedefs_get_string_attr_with_setter_exception(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestGObjectWebKitDOMattributecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMattribute.cpp (170566 => 170567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMattribute.cpp 2014-06-28 08:44:54 UTC (rev 170566)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMattribute.cpp 2014-06-28 09:06:09 UTC (rev 170567)
</span><span class="lines">@@ -83,15 +83,12 @@
</span><span class="cx">
</span><span class="cx"> static void webkit_dom_test_exception_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMTestException* self = WEBKIT_DOM_TEST_EXCEPTION(object);
</span><del>- WebCore::TestException* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_NAME: {
- g_value_take_string(value, convertToUTF8String(coreSelf->name()));
</del><ins>+ case PROP_NAME:
+ g_value_take_string(value, webkit_dom_test_exception_get_name(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span><span class="lines">@@ -99,15 +96,12 @@
</span><span class="cx"> }
</span><span class="cx"> static void webkit_dom_attribute_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
</span><span class="cx"> {
</span><del>- WebCore::JSMainThreadNullState state;
</del><span class="cx"> WebKitDOMattribute* self = WEBKIT_DOM_ATTRIBUTE(object);
</span><del>- WebCore::attribute* coreSelf = WebKit::core(self);
</del><span class="cx">
</span><span class="cx"> switch (propertyId) {
</span><del>- case PROP_READONLY: {
- g_value_take_string(value, convertToUTF8String(coreSelf->readonly()));
</del><ins>+ case PROP_READONLY:
+ g_value_take_string(value, webkit_dom_attribute_get_readonly(self));
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>