Attachment #122877 for bug #76517

View Details Raw Unified Return to Bug 76517

| Differences between



2012-01-17  Pablo Flouret  <pablof@motorola.com>

        Add [CallWith] support for attributes in JSC/V8 idl code generators.
        Part of https://bugs.webkit.org/show_bug.cgi?id=76035

        Reviewed by NOBODY (OOPS!).

        * bindings/scripts/CodeGeneratorJS.pm:
        (GenerateImplementation):
        (GenerateAttributeCallWith):
        * bindings/scripts/CodeGeneratorV8.pm:
        (GenerateNormalAttrGetter):
        (GenerateNormalAttrSetter):
        (GenerateAttributeCallWith):
        * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
        (WebDOMTestObj::withScriptStateAttribute):
        (WebDOMTestObj::setWithScriptStateAttribute):
        (WebDOMTestObj::withScriptExecutionContextAttribute):
        (WebDOMTestObj::setWithScriptExecutionContextAttribute):
        (WebDOMTestObj::withScriptStateAttributeRaises):
        (WebDOMTestObj::setWithScriptStateAttributeRaises):
        (WebDOMTestObj::withScriptExecutionContextAttributeRaises):
        (WebDOMTestObj::setWithScriptExecutionContextAttributeRaises):
        * bindings/scripts/test/CPP/WebDOMTestObj.h:
        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
        (webkit_dom_test_obj_get_with_script_state_attribute):
        (webkit_dom_test_obj_set_with_script_state_attribute):
        (webkit_dom_test_obj_get_with_script_execution_context_attribute):
        (webkit_dom_test_obj_set_with_script_execution_context_attribute):
        (webkit_dom_test_obj_get_with_script_state_attribute_raises):
        (webkit_dom_test_obj_set_with_script_state_attribute_raises):
        (webkit_dom_test_obj_get_with_script_execution_context_attribute_raises):
        (webkit_dom_test_obj_set_with_script_execution_context_attribute_raises):
        (webkit_dom_test_obj_set_property):
        (webkit_dom_test_obj_get_property):
        (webkit_dom_test_obj_class_init):
        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
        * bindings/scripts/test/JS/JSTestObj.cpp:
        (WebCore::jsTestObjWithScriptStateAttribute):
        (WebCore::jsTestObjWithScriptExecutionContextAttribute):
        (WebCore::jsTestObjWithScriptStateAttributeRaises):
        (WebCore::jsTestObjWithScriptExecutionContextAttributeRaises):
        (WebCore::setJSTestObjWithScriptStateAttribute):
        (WebCore::setJSTestObjWithScriptExecutionContextAttribute):
        (WebCore::setJSTestObjWithScriptStateAttributeRaises):
        (WebCore::setJSTestObjWithScriptExecutionContextAttributeRaises):
        * bindings/scripts/test/JS/JSTestObj.h:
        * bindings/scripts/test/ObjC/DOMTestObj.h:
        * bindings/scripts/test/ObjC/DOMTestObj.mm:
        (-[DOMTestObj withScriptStateAttribute]):
        (-[DOMTestObj setWithScriptStateAttribute:]):
        (-[DOMTestObj withScriptExecutionContextAttribute]):
        (-[DOMTestObj setWithScriptExecutionContextAttribute:]):
        (-[DOMTestObj withScriptStateAttributeRaises]):
        (-[DOMTestObj setWithScriptStateAttributeRaises:]):
        (-[DOMTestObj withScriptExecutionContextAttributeRaises]):
        (-[DOMTestObj setWithScriptExecutionContextAttributeRaises:]):
        * bindings/scripts/test/TestObj.idl:
        * bindings/scripts/test/V8/V8TestObj.cpp:
        (WebCore::TestObjInternal::withScriptStateAttributeAttrGetter):
        (WebCore::TestObjInternal::withScriptStateAttributeAttrSetter):
        (WebCore::TestObjInternal::withScriptExecutionContextAttributeAttrGetter):
        (WebCore::TestObjInternal::withScriptExecutionContextAttributeAttrSetter):
        (WebCore::TestObjInternal::withScriptStateAttributeRaisesAttrGetter):
        (WebCore::TestObjInternal::withScriptStateAttributeRaisesAttrSetter):
        (WebCore::TestObjInternal::withScriptExecutionContextAttributeRaisesAttrGetter):
        (WebCore::TestObjInternal::withScriptExecutionContextAttributeRaisesAttrSetter):

2012-01-16  Hajime Morrita  <morrita@chromium.org>

        [Internals] member varaibles should follow naming convention.

Lines 1764-1770 sub GenerateImplementation a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec1
- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm -5 / +51 lines
1764	# Once JSDOMWrappers have a back-pointer to the globalObject we can pass castedThis->globalObject()	1764	# Once JSDOMWrappers have a back-pointer to the globalObject we can pass castedThis->globalObject()
1765	push(@implContent, " return JS" . $constructorType . "::getConstructor(exec, castedThis);\n");	1765	push(@implContent, " return JS" . $constructorType . "::getConstructor(exec, castedThis);\n");
1766	} elsif (!@{$attribute->getterExceptions}) {	1766	} elsif (!@{$attribute->getterExceptions}) {
1767	push(@implContent, " UNUSED_PARAM(exec);\n");	1767	my $callWith = $attribute->signature->extendedAttributes->{"CallWith"};
		1768	my $callWithArg = "";
		1769
		1770	push(@implContent, " UNUSED_PARAM(exec);\n") if (!$callWith);
		1771
1768	my $cacheIndex = 0;	1772	my $cacheIndex = 0;
1769	if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {	1773	if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {
1770	$cacheIndex = $currentCachedAttribute;	1774	$cacheIndex = $currentCachedAttribute;
Lines 1773-1786 sub GenerateImplementation a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec2
1773	push(@implContent, " return cachedValue;\n");	1777	push(@implContent, " return cachedValue;\n");
1774	}	1778	}
1775		1779
		1780	if ($callWith) {
		1781	$callWithArg = GenerateAttributeCallWith($callWith, \@implContent);
		1782	}
		1783
1776	if ($svgListPropertyType) {	1784	if ($svgListPropertyType) {
1777	push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "castedThis->impl()->$implGetterFunctionName()", "castedThis") . ";\n");	1785	push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "castedThis->impl()->$implGetterFunctionName($callWithArg)", "castedThis") . ";\n");
1778	} elsif ($svgPropertyOrListPropertyType) {	1786	} elsif ($svgPropertyOrListPropertyType) {
1779	push(@implContent, " $svgPropertyOrListPropertyType& impl = castedThis->impl()->propertyReference();\n");	1787	push(@implContent, " $svgPropertyOrListPropertyType& impl = castedThis->impl()->propertyReference();\n");
1780	if ($svgPropertyOrListPropertyType eq "float") { # Special case for JSSVGNumber	1788	if ($svgPropertyOrListPropertyType eq "float") { # Special case for JSSVGNumber
1781	push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl", "castedThis") . ";\n");	1789	push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl", "castedThis") . ";\n");
1782	} else {	1790	} else {
1783	push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl.$implGetterFunctionName()", "castedThis") . ";\n");	1791	push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl.$implGetterFunctionName($callWithArg)", "castedThis") . ";\n");
		1792
1784	}	1793	}
1785	} else {	1794	} else {
1786	my ($functionName, @arguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);	1795	my ($functionName, @arguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);
Lines 1793-1798 sub GenerateImplementation a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec3
1793	$functionName = "impl->${functionName}";	1802	$functionName = "impl->${functionName}";
1794	}	1803	}
1795		1804
		1805	if ($callWith) {
		1806	unshift(@arguments, $callWithArg);
		1807	}
		1808
1796	my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, "${functionName}(" . join(", ", @arguments) . ")", "castedThis");	1809	my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, "${functionName}(" . join(", ", @arguments) . ")", "castedThis");
1797	push(@implContent, " $implClassName* impl = static_cast<$implClassName*>(castedThis->impl());\n");	1810	push(@implContent, " $implClassName* impl = static_cast<$implClassName*>(castedThis->impl());\n");
1798	if ($codeGenerator->IsSVGAnimatedType($type)) {	1811	if ($codeGenerator->IsSVGAnimatedType($type)) {
Lines 1807-1819 sub GenerateImplementation a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec4
1807	push(@implContent, " return result;\n");	1820	push(@implContent, " return result;\n");
1808		1821
1809	} else {	1822	} else {
		1823	my $callWith = $attribute->signature->extendedAttributes->{"CallWith"};
		1824	my @arguments = ("ec");
		1825
1810	push(@implContent, " ExceptionCode ec = 0;\n");	1826	push(@implContent, " ExceptionCode ec = 0;\n");
		1827
		1828	if ($callWith) {
		1829	unshift(@arguments, GenerateAttributeCallWith($callWith, \@implContent));
		1830	}
		1831
1811	if ($svgPropertyOrListPropertyType) {	1832	if ($svgPropertyOrListPropertyType) {
1812	push(@implContent, " $svgPropertyOrListPropertyType impl(*castedThis->impl());\n");	1833	push(@implContent, " $svgPropertyOrListPropertyType impl(*castedThis->impl());\n");
1813	push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl.$implGetterFunctionName(ec)", "castedThis") . ";\n");	1834	push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl.$implGetterFunctionName(" . join(", ", @arguments) . ")", "castedThis") . ";\n");
1814	} else {	1835	} else {
1815	push(@implContent, " $implClassName* impl = static_cast<$implClassName*>(castedThis->impl());\n");	1836	push(@implContent, " $implClassName* impl = static_cast<$implClassName*>(castedThis->impl());\n");
1816	push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl->$implGetterFunctionName(ec)", "castedThis") . ";\n");	1837	push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "impl->$implGetterFunctionName(" . join(", ", @arguments) . ")", "castedThis") . ";\n");
1817	}	1838	}
1818		1839
1819	push(@implContent, " setDOMException(exec, ec);\n");	1840	push(@implContent, " setDOMException(exec, ec);\n");
Lines 2009-2014 sub GenerateImplementation a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec5
2009	} else {	2030	} else {
2010	$functionName = "impl->${functionName}";	2031	$functionName = "impl->${functionName}";
2011	}	2032	}
		2033
		2034	my $callWith = $attribute->signature->extendedAttributes->{"CallWith"};
		2035	if ($callWith) {
		2036	unshift(@arguments, GenerateAttributeCallWith($callWith, \@implContent, 1));
		2037	}
		2038
2012	push(@arguments, "ec") if @{$attribute->setterExceptions};	2039	push(@arguments, "ec") if @{$attribute->setterExceptions};
2013	push(@implContent, " ${functionName}(" . join(", ", @arguments) . ");\n");	2040	push(@implContent, " ${functionName}(" . join(", ", @arguments) . ");\n");
2014	push(@implContent, " setDOMException(exec, ec);\n") if @{$attribute->setterExceptions};	2041	push(@implContent, " setDOMException(exec, ec);\n") if @{$attribute->setterExceptions};
Lines 2361-2366 sub GenerateImplementation a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec6
2361	push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;	2388	push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
2362	}	2389	}
2363		2390
		2391	sub GenerateAttributeCallWith
		2392	{
		2393	my $callWith = shift;
		2394	my $outputArray = shift;
		2395	my $returnVoid = shift;
		2396	my $callWithArg = "COMPILE_ASSERT(false)";
		2397
		2398	if ($callWith eq "ScriptState") {
		2399	$callWithArg = "exec";
		2400	} elsif ($callWith eq "ScriptExecutionContext") {
		2401	push(@$outputArray, " ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();\n");
		2402	push(@$outputArray, " if (!scriptContext)\n");
		2403	push(@$outputArray, " return" . ($returnVoid ? "" : " jsUndefined()") . ";\n");
		2404	$callWithArg = "scriptContext";
		2405	}
		2406
		2407	return $callWithArg;
		2408	}
		2409
2364	sub GenerateArgumentsCountCheck	2410	sub GenerateArgumentsCountCheck
2365	{	2411	{
2366	my $outputArray = shift;	2412	my $outputArray = shift;

Lines 899-906 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec1
- a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm +47 lines
899		899
900	my $returnType = GetTypeFromSignature($attribute->signature);	900	my $returnType = GetTypeFromSignature($attribute->signature);
901	my $getterString;	901	my $getterString;
		902	my $callWith = $attribute->signature->extendedAttributes->{"CallWith"} \|\| "";
		903
902	if ($getterStringUsesImp) {	904	if ($getterStringUsesImp) {
903	my ($functionName, @arguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);	905	my ($functionName, @arguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);
		906
		907	if ($callWith) {
		908	push(@arguments, GenerateAttributeCallWith($callWith, \@implContentDecls));
		909	}
		910
904	push(@arguments, "ec") if $useExceptions;	911	push(@arguments, "ec") if $useExceptions;
905	if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {	912	if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
906	my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};	913	my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
Lines 930-935 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec2
930	push(@implContentDecls, " $nativeType v = $getterString;\n");	937	push(@implContentDecls, " $nativeType v = $getterString;\n");
931	}	938	}
932	push(@implContentDecls, GenerateSetDOMException(" "));	939	push(@implContentDecls, GenerateSetDOMException(" "));
		940
		941	if ($callWith eq "ScriptState") {
		942	push(@implContentDecls, " if (state.hadException())\n");
		943	push(@implContentDecls, " return throwError(state.exception());\n");
		944	}
		945
933	$result = "v";	946	$result = "v";
934	$result .= ".release()" if (IsRefPtrType($returnType));	947	$result .= ".release()" if (IsRefPtrType($returnType));
935	} else {	948	} else {
Lines 1128-1133 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec3
1128	push(@implContentDecls, " ExceptionCode ec = 0;\n");	1141	push(@implContentDecls, " ExceptionCode ec = 0;\n");
1129	}	1142	}
1130		1143
		1144	my $callWith = $attribute->signature->extendedAttributes->{"CallWith"} \|\| "";
		1145
1131	if ($implClassName eq "SVGNumber") {	1146	if ($implClassName eq "SVGNumber") {
1132	push(@implContentDecls, " *imp = $result;\n");	1147	push(@implContentDecls, " *imp = $result;\n");
1133	} else {	1148	} else {
Lines 1152-1157 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec4
1152	push(@implContentDecls, ");\n");	1167	push(@implContentDecls, ");\n");
1153	} else {	1168	} else {
1154	my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);	1169	my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);
		1170
		1171	if ($callWith) {
		1172	push(@arguments, GenerateAttributeCallWith($callWith, \@implContentDecls, 1));
		1173	}
		1174
1155	push(@arguments, $result);	1175	push(@arguments, $result);
1156	push(@arguments, "ec") if $useExceptions;	1176	push(@arguments, "ec") if $useExceptions;
1157	if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {	1177	if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
Lines 1171-1176 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec5
1171	push(@implContentDecls, " V8Proxy::setDOMException(ec);\n");	1191	push(@implContentDecls, " V8Proxy::setDOMException(ec);\n");
1172	}	1192	}
1173		1193
		1194	if ($callWith eq "ScriptState") {
		1195	push(@implContentDecls, " if (state.hadException())\n");
		1196	push(@implContentDecls, " throwError(state.exception());\n");
		1197	}
		1198
1174	if ($svgNativeType) {	1199	if ($svgNativeType) {
1175	if ($useExceptions) {	1200	if ($useExceptions) {
1176	push(@implContentDecls, " if (!ec)\n");	1201	push(@implContentDecls, " if (!ec)\n");
Lines 1454-1459 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec6
1454	push(@implContentDecls, "#endif // ${conditionalString}\n\n") if $conditionalString;	1479	push(@implContentDecls, "#endif // ${conditionalString}\n\n") if $conditionalString;
1455	}	1480	}
1456		1481
		1482	sub GenerateAttributeCallWith
		1483	{
		1484	my $callWith = shift;
		1485	my $outputArray = shift;
		1486	my $returnVoid = shift;
		1487	my $callWithArg = "COMPILE_ASSERT(false)";
		1488
		1489	if ($callWith eq "ScriptState") {
		1490	push(@$outputArray, " ScriptState* state = ScriptState::current();\n");
		1491	push(@$outputArray, " if (!state)\n");
		1492	push(@$outputArray, " return" . ($returnVoid ? "" : " v8::Undefined()") . ";\n");
		1493	$callWithArg = "state";
		1494	} elsif ($callWith eq "ScriptExecutionContext") {
		1495	push(@$outputArray, " ScriptExecutionContext* scriptContext = getScriptExecutionContext();\n");
		1496	push(@$outputArray, " if (!scriptContext)\n");
		1497	push(@$outputArray, " return" . ($returnVoid ? "" : " v8::Undefined()") . ";\n");
		1498	$callWithArg = "scriptContext";
		1499	}
		1500
		1501	return $callWithArg;
		1502	}
		1503
1457	sub GenerateArgumentsCountCheck	1504	sub GenerateArgumentsCountCheck
1458	{	1505	{
1459	my $function = shift;	1506	my $function = shift;



    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
}

int WebDOMTestObj::withScriptStateAttribute() const
{
    if (!impl())
        return 0;

    return impl()->withScriptStateAttribute();
}

void WebDOMTestObj::setWithScriptStateAttribute(int newWithScriptStateAttribute)
{
    if (!impl())
        return;

    impl()->setWithScriptStateAttribute(newWithScriptStateAttribute);
}

WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAttribute() const
{
    if (!impl())
        return WebDOMTestObj();

    return toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAttribute()));
}

void WebDOMTestObj::setWithScriptExecutionContextAttribute(const WebDOMTestObj& newWithScriptExecutionContextAttribute)
{
    if (!impl())
        return;

    impl()->setWithScriptExecutionContextAttribute(toWebCore(newWithScriptExecutionContextAttribute));
}

WebDOMTestObj WebDOMTestObj::withScriptStateAttributeRaises() const
{
    if (!impl())
        return WebDOMTestObj();

    WebCore::ExceptionCode ec = 0;
    WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptStateAttributeRaises(ec)));
    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    return result;
}

void WebDOMTestObj::setWithScriptStateAttributeRaises(const WebDOMTestObj& newWithScriptStateAttributeRaises)
{
    if (!impl())
        return;

    WebCore::ExceptionCode ec = 0;
    impl()->setWithScriptStateAttributeRaises(toWebCore(newWithScriptStateAttributeRaises), ec);
    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
}

WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAttributeRaises() const
{
    if (!impl())
        return WebDOMTestObj();

    WebCore::ExceptionCode ec = 0;
    WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAttributeRaises(ec)));
    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    return result;
}

void WebDOMTestObj::setWithScriptExecutionContextAttributeRaises(const WebDOMTestObj& newWithScriptExecutionContextAttributeRaises)
{
    if (!impl())
        return;

    WebCore::ExceptionCode ec = 0;
    impl()->setWithScriptExecutionContextAttributeRaises(toWebCore(newWithScriptExecutionContextAttributeRaises), ec);
    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
}

WebDOMString WebDOMTestObj::scriptStringAttr() const
{
    if (!impl())

Lines 124-129 public: a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h_sec1
- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h +8 lines
124	void setStringAttrWithGetterException(const WebDOMString&);	124	void setStringAttrWithGetterException(const WebDOMString&);
125	WebDOMString stringAttrWithSetterException() const;	125	WebDOMString stringAttrWithSetterException() const;
126	void setStringAttrWithSetterException(const WebDOMString&);	126	void setStringAttrWithSetterException(const WebDOMString&);
		127	int withScriptStateAttribute() const;
		128	void setWithScriptStateAttribute(int);
		129	WebDOMTestObj withScriptExecutionContextAttribute() const;
		130	void setWithScriptExecutionContextAttribute(const WebDOMTestObj&);
		131	WebDOMTestObj withScriptStateAttributeRaises() const;
		132	void setWithScriptStateAttributeRaises(const WebDOMTestObj&);
		133	WebDOMTestObj withScriptExecutionContextAttributeRaises() const;
		134	void setWithScriptExecutionContextAttributeRaises(const WebDOMTestObj&);
127	WebDOMString scriptStringAttr() const;	135	WebDOMString scriptStringAttr() const;
128	#if ENABLE(Condition1)	136	#if ENABLE(Condition1)
129	int conditionalAttr1() const;	137	int conditionalAttr1() const;



    }
}

glong
webkit_dom_test_obj_get_with_script_state_attribute(WebKitDOMTestObj* self)
{
    g_return_val_if_fail(self, 0);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    glong res = item->withScriptStateAttribute();
    return res;
}

void
webkit_dom_test_obj_set_with_script_state_attribute(WebKitDOMTestObj* self, glong value)
{
    g_return_if_fail(self);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    item->setWithScriptStateAttribute(value);
}

WebKitDOMTestObj*
webkit_dom_test_obj_get_with_script_execution_context_attribute(WebKitDOMTestObj* self)
{
    g_return_val_if_fail(self, 0);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAttribute());
    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
    return res;
}

void
webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
{
    g_return_if_fail(self);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    g_return_if_fail(value);
    WebCore::TestObj * converted_value = NULL;
    if (value != NULL) {
        converted_value = WebKit::core(value);
        g_return_if_fail(converted_value);
    }
    item->setWithScriptExecutionContextAttribute(converted_value);
}

WebKitDOMTestObj*
webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error)
{
    g_return_val_if_fail(self, 0);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    WebCore::ExceptionCode ec = 0;
    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateAttributeRaises(ec));
    if (ec) {
        WebCore::ExceptionCodeDescription ecdesc(ec);
        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
    }
    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
    return res;
}

void
webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
{
    g_return_if_fail(self);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    g_return_if_fail(value);
    WebCore::TestObj * converted_value = NULL;
    if (value != NULL) {
        converted_value = WebKit::core(value);
        g_return_if_fail(converted_value);
    }
    WebCore::ExceptionCode ec = 0;
    item->setWithScriptStateAttributeRaises(converted_value, ec);
    if (ec) {
        WebCore::ExceptionCodeDescription ecdesc(ec);
        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
    }
}

WebKitDOMTestObj*
webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError **error)
{
    g_return_val_if_fail(self, 0);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    WebCore::ExceptionCode ec = 0;
    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAttributeRaises(ec));
    if (ec) {
        WebCore::ExceptionCodeDescription ecdesc(ec);
        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
    }
    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
    return res;
}

void
webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
{
    g_return_if_fail(self);
    WebCore::JSMainThreadNullState state;
    WebCore::TestObj * item = WebKit::core(self);
    g_return_if_fail(value);
    WebCore::TestObj * converted_value = NULL;
    if (value != NULL) {
        converted_value = WebKit::core(value);
        g_return_if_fail(converted_value);
    }
    WebCore::ExceptionCode ec = 0;
    item->setWithScriptExecutionContextAttributeRaises(converted_value, ec);
    if (ec) {
        WebCore::ExceptionCodeDescription ecdesc(ec);
        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
    }
}

gchar*
webkit_dom_test_obj_get_script_string_attr(WebKitDOMTestObj* self)
{

    PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
    PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
    PROP_CUSTOM_ATTR,
    PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
    PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES,
    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES,
    PROP_SCRIPT_STRING_ATTR,
#if ENABLE(Condition1)
    PROP_CONDITIONAL_ATTR1,

        coreSelf->setStringAttrWithSetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
        break;
    }
    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
    {
        coreSelf->setWithScriptStateAttribute((g_value_get_long(value)));
        break;
    }
#if ENABLE(Condition1)
    case PROP_CONDITIONAL_ATTR1:
    {

        g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
        break;
    }
    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
    {
        g_value_set_long(value, coreSelf->withScriptStateAttribute());
        break;
    }
    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE:
    {
        RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttribute();
        g_value_set_object(value, WebKit::kit(ptr.get()));
        break;
    }
    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()));
        break;
    }
    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()));
        break;
    }
    case PROP_SCRIPT_STRING_ATTR:
    {
        g_value_take_string(value, convertToUTF8String(coreSelf->scriptStringAttr()));

                                                           "", /* default */
                                                           WEBKIT_PARAM_READWRITE));
    g_object_class_install_property(gobjectClass,
                                    PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
                                    g_param_spec_long("with-script-state-attribute", /* name */
                                                           "test_obj_with-script-state-attribute", /* short description */
                                                           "read-write  glong TestObj.with-script-state-attribute", /* longer - could do with some extra doc stuff here */
                                                           G_MINLONG, /* min */
G_MAXLONG, /* max */
0, /* default */
                                                           WEBKIT_PARAM_READWRITE));
    g_object_class_install_property(gobjectClass,
                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
                                    g_param_spec_object("with-script-execution-context-attribute", /* name */
                                                           "test_obj_with-script-execution-context-attribute", /* short description */
                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-attribute", /* longer - could do with some extra doc stuff here */
                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
                                                           WEBKIT_PARAM_READWRITE));
    g_object_class_install_property(gobjectClass,
                                    PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES,
                                    g_param_spec_object("with-script-state-attribute-raises", /* name */
                                                           "test_obj_with-script-state-attribute-raises", /* short description */
                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-state-attribute-raises", /* longer - could do with some extra doc stuff here */
                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
                                                           WEBKIT_PARAM_READWRITE));
    g_object_class_install_property(gobjectClass,
                                    PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES,
                                    g_param_spec_object("with-script-execution-context-attribute-raises", /* name */
                                                           "test_obj_with-script-execution-context-attribute-raises", /* short description */
                                                           "read-write  WebKitDOMTestObj* TestObj.with-script-execution-context-attribute-raises", /* longer - could do with some extra doc stuff here */
                                                           WEBKIT_TYPE_DOM_TEST_OBJ, /* gobject type */
                                                           WEBKIT_PARAM_READWRITE));
    g_object_class_install_property(gobjectClass,
                                    PROP_SCRIPT_STRING_ATTR,
                                    g_param_spec_string("script-string-attr", /* name */
                                                           "test_obj_script-string-attr", /* short description */



webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error);

/**
 * webkit_dom_test_obj_get_with_script_state_attribute:
 * @self: A #WebKitDOMTestObj
 *
 * Returns:
 *
**/
WEBKIT_API glong
webkit_dom_test_obj_get_with_script_state_attribute(WebKitDOMTestObj* self);

/**
 * webkit_dom_test_obj_set_with_script_state_attribute:
 * @self: A #WebKitDOMTestObj
 * @value: A #glong
 *
 * Returns:
 *
**/
WEBKIT_API void
webkit_dom_test_obj_set_with_script_state_attribute(WebKitDOMTestObj* self, glong value);

/**
 * webkit_dom_test_obj_get_with_script_execution_context_attribute:
 * @self: A #WebKitDOMTestObj
 *
 * Returns: (transfer none):
 *
**/
WEBKIT_API WebKitDOMTestObj*
webkit_dom_test_obj_get_with_script_execution_context_attribute(WebKitDOMTestObj* self);

/**
 * webkit_dom_test_obj_set_with_script_execution_context_attribute:
 * @self: A #WebKitDOMTestObj
 * @value: A #WebKitDOMTestObj
 *
 * Returns: (transfer none):
 *
**/
WEBKIT_API void
webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value);

/**
 * webkit_dom_test_obj_get_with_script_state_attribute_raises:
 * @self: A #WebKitDOMTestObj
 * @error: #GError
 *
 * Returns: (transfer none):
 *
**/
WEBKIT_API WebKitDOMTestObj*
webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error);

/**
 * webkit_dom_test_obj_set_with_script_state_attribute_raises:
 * @self: A #WebKitDOMTestObj
 * @value: A #WebKitDOMTestObj
 * @error: #GError
 *
 * Returns: (transfer none):
 *
**/
WEBKIT_API void
webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);

/**
 * webkit_dom_test_obj_get_with_script_execution_context_attribute_raises:
 * @self: A #WebKitDOMTestObj
 * @error: #GError
 *
 * Returns: (transfer none):
 *
**/
WEBKIT_API WebKitDOMTestObj*
webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError **error);

/**
 * webkit_dom_test_obj_set_with_script_execution_context_attribute_raises:
 * @self: A #WebKitDOMTestObj
 * @value: A #WebKitDOMTestObj
 * @error: #GError
 *
 * Returns: (transfer none):
 *
**/
WEBKIT_API void
webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);

/**
 * webkit_dom_test_obj_get_script_string_attr:
 * @self: A #WebKitDOMTestObj
 *

Lines 107-112 static const HashTableValue JSTestObjTableValues[] = a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp -1 / +93 lines
107	{ "stringAttrWithGetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithGetterException), (intptr_t)setJSTestObjStringAttrWithGetterException, NoIntrinsic },	107	{ "stringAttrWithGetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithGetterException), (intptr_t)setJSTestObjStringAttrWithGetterException, NoIntrinsic },
108	{ "stringAttrWithSetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithSetterException), (intptr_t)setJSTestObjStringAttrWithSetterException, NoIntrinsic },	108	{ "stringAttrWithSetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithSetterException), (intptr_t)setJSTestObjStringAttrWithSetterException, NoIntrinsic },
109	{ "customAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjCustomAttr), (intptr_t)setJSTestObjCustomAttr, NoIntrinsic },	109	{ "customAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjCustomAttr), (intptr_t)setJSTestObjCustomAttr, NoIntrinsic },
		110	{ "withScriptStateAttribute", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptStateAttribute), (intptr_t)setJSTestObjWithScriptStateAttribute, NoIntrinsic },
		111	{ "withScriptExecutionContextAttribute", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptExecutionContextAttribute), (intptr_t)setJSTestObjWithScriptExecutionContextAttribute, NoIntrinsic },
		112	{ "withScriptStateAttributeRaises", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptStateAttributeRaises), (intptr_t)setJSTestObjWithScriptStateAttributeRaises, NoIntrinsic },
		113	{ "withScriptExecutionContextAttributeRaises", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjWithScriptExecutionContextAttributeRaises), (intptr_t)setJSTestObjWithScriptExecutionContextAttributeRaises, NoIntrinsic },
110	{ "scriptStringAttr", DontDelete \| ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjScriptStringAttr), (intptr_t)0, NoIntrinsic },	114	{ "scriptStringAttr", DontDelete \| ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjScriptStringAttr), (intptr_t)0, NoIntrinsic },
111	#if ENABLE(Condition1)	115	#if ENABLE(Condition1)
112	{ "conditionalAttr1", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjConditionalAttr1), (intptr_t)setJSTestObjConditionalAttr1, NoIntrinsic },	116	{ "conditionalAttr1", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjConditionalAttr1), (intptr_t)setJSTestObjConditionalAttr1, NoIntrinsic },
Lines 139-145 static const HashTableValue JSTestObjTableValues[] = a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp_sec2
139	{ 0, 0, 0, 0, NoIntrinsic }	143	{ 0, 0, 0, 0, NoIntrinsic }
140	};	144	};
141		145
142	static const HashTable JSTestObjTable = { 136, 127, JSTestObjTableValues, 0 };	146	static const HashTable JSTestObjTable = { 137, 127, JSTestObjTableValues, 0 };
143	/* Hash table for constructor */	147	/* Hash table for constructor */
144		148
145	static const HashTableValue JSTestObjConstructorTableValues[] =	149	static const HashTableValue JSTestObjConstructorTableValues[] =
Lines 631-636 JSValue jsTestObjCustomAttr(ExecState* exec, JSValue slotBase, const Identifier& a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp_sec3
631	}	635	}
632		636
633		637
		638	JSValue jsTestObjWithScriptStateAttribute(ExecState* exec, JSValue slotBase, const Identifier&)
		639	{
		640	JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
		641	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		642	JSValue result = jsNumber(impl->withScriptStateAttribute(exec));
		643	return result;
		644	}
		645
		646
		647	JSValue jsTestObjWithScriptExecutionContextAttribute(ExecState* exec, JSValue slotBase, const Identifier&)
		648	{
		649	JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
		650	ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
		651	if (!scriptContext)
		652	return jsUndefined();
		653	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		654	JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl->withScriptExecutionContextAttribute(scriptContext)));
		655	return result;
		656	}
		657
		658
		659	JSValue jsTestObjWithScriptStateAttributeRaises(ExecState* exec, JSValue slotBase, const Identifier&)
		660	{
		661	JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
		662	ExceptionCode ec = 0;
		663	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		664	JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl->withScriptStateAttributeRaises(exec, ec)));
		665	setDOMException(exec, ec);
		666	return result;
		667	}
		668
		669
		670	JSValue jsTestObjWithScriptExecutionContextAttributeRaises(ExecState* exec, JSValue slotBase, const Identifier&)
		671	{
		672	JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
		673	ExceptionCode ec = 0;
		674	ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
		675	if (!scriptContext)
		676	return jsUndefined();
		677	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		678	JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(impl->withScriptExecutionContextAttributeRaises(scriptContext, ec)));
		679	setDOMException(exec, ec);
		680	return result;
		681	}
		682
		683
634	JSValue jsTestObjScriptStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)	684	JSValue jsTestObjScriptStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
635	{	685	{
636	JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));	686	JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
Lines 1017-1022 void setJSTestObjCustomAttr(ExecState* exec, JSObject* thisObject, JSValue value a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp_sec4
1017	}	1067	}
1018		1068
1019		1069
		1070	void setJSTestObjWithScriptStateAttribute(ExecState* exec, JSObject* thisObject, JSValue value)
		1071	{
		1072	JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
		1073	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		1074	impl->setWithScriptStateAttribute(exec, value.toInt32(exec));
		1075	}
		1076
		1077
		1078	void setJSTestObjWithScriptExecutionContextAttribute(ExecState* exec, JSObject* thisObject, JSValue value)
		1079	{
		1080	JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
		1081	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		1082	ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
		1083	if (!scriptContext)
		1084	return;
		1085	impl->setWithScriptExecutionContextAttribute(scriptContext, toTestObj(value));
		1086	}
		1087
		1088
		1089	void setJSTestObjWithScriptStateAttributeRaises(ExecState* exec, JSObject* thisObject, JSValue value)
		1090	{
		1091	JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
		1092	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		1093	ExceptionCode ec = 0;
		1094	impl->setWithScriptStateAttributeRaises(exec, toTestObj(value), ec);
		1095	setDOMException(exec, ec);
		1096	}
		1097
		1098
		1099	void setJSTestObjWithScriptExecutionContextAttributeRaises(ExecState* exec, JSObject* thisObject, JSValue value)
		1100	{
		1101	JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
		1102	TestObj* impl = static_cast<TestObj*>(castedThis->impl());
		1103	ExceptionCode ec = 0;
		1104	ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
		1105	if (!scriptContext)
		1106	return;
		1107	impl->setWithScriptExecutionContextAttributeRaises(scriptContext, toTestObj(value), ec);
		1108	setDOMException(exec, ec);
		1109	}
		1110
		1111
1020	#if ENABLE(Condition1)	1112	#if ENABLE(Condition1)
1021	void setJSTestObjConditionalAttr1(ExecState* exec, JSObject* thisObject, JSValue value)	1113	void setJSTestObjConditionalAttr1(ExecState* exec, JSObject* thisObject, JSValue value)
1022	{	1114	{

Lines 249-254 JSC::JSValue jsTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::JSValu a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h +8 lines
249	void setJSTestObjStringAttrWithSetterException(JSC::ExecState, JSC::JSObject, JSC::JSValue);	249	void setJSTestObjStringAttrWithSetterException(JSC::ExecState, JSC::JSObject, JSC::JSValue);
250	JSC::JSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	250	JSC::JSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
251	void setJSTestObjCustomAttr(JSC::ExecState, JSC::JSObject, JSC::JSValue);	251	void setJSTestObjCustomAttr(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		252	JSC::JSValue jsTestObjWithScriptStateAttribute(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
		253	void setJSTestObjWithScriptStateAttribute(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		254	JSC::JSValue jsTestObjWithScriptExecutionContextAttribute(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
		255	void setJSTestObjWithScriptExecutionContextAttribute(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		256	JSC::JSValue jsTestObjWithScriptStateAttributeRaises(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
		257	void setJSTestObjWithScriptStateAttributeRaises(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		258	JSC::JSValue jsTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
		259	void setJSTestObjWithScriptExecutionContextAttributeRaises(JSC::ExecState, JSC::JSObject, JSC::JSValue);
252	JSC::JSValue jsTestObjScriptStringAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	260	JSC::JSValue jsTestObjScriptStringAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
253	JSC::JSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	261	JSC::JSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
254	void setJSTestObjConditionalAttr1(JSC::ExecState, JSC::JSObject, JSC::JSValue);	262	void setJSTestObjConditionalAttr1(JSC::ExecState, JSC::JSObject, JSC::JSValue);

Lines 119-124 enum { a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h_sec1
- a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h +8 lines
119	- (void)setStringAttrWithSetterException:(NSString *)newStringAttrWithSetterException;	119	- (void)setStringAttrWithSetterException:(NSString *)newStringAttrWithSetterException;
120	- (int)customAttr;	120	- (int)customAttr;
121	- (void)setCustomAttr:(int)newCustomAttr;	121	- (void)setCustomAttr:(int)newCustomAttr;
		122	- (int)withScriptStateAttribute;
		123	- (void)setWithScriptStateAttribute:(int)newWithScriptStateAttribute;
		124	- (DOMTestObj *)withScriptExecutionContextAttribute;
		125	- (void)setWithScriptExecutionContextAttribute:(DOMTestObj *)newWithScriptExecutionContextAttribute;
		126	- (DOMTestObj *)withScriptStateAttributeRaises;
		127	- (void)setWithScriptStateAttributeRaises:(DOMTestObj *)newWithScriptStateAttributeRaises;
		128	- (DOMTestObj *)withScriptExecutionContextAttributeRaises;
		129	- (void)setWithScriptExecutionContextAttributeRaises:(DOMTestObj *)newWithScriptExecutionContextAttributeRaises;
122	- (NSString *)scriptStringAttr;	130	- (NSString *)scriptStringAttr;
123	#if ENABLE(Condition1)	131	#if ENABLE(Condition1)
124	- (int)conditionalAttr1;	132	- (int)conditionalAttr1;



    IMPL->setCustomAttr(newCustomAttr);
}

- (int)withScriptStateAttribute
{
    WebCore::JSMainThreadNullState state;
    return IMPL->withScriptStateAttribute();
}

- (void)setWithScriptStateAttribute:(int)newWithScriptStateAttribute
{
    WebCore::JSMainThreadNullState state;
    IMPL->setWithScriptStateAttribute(newWithScriptStateAttribute);
}

- (DOMTestObj *)withScriptExecutionContextAttribute
{
    WebCore::JSMainThreadNullState state;
    return kit(WTF::getPtr(IMPL->withScriptExecutionContextAttribute()));
}

- (void)setWithScriptExecutionContextAttribute:(DOMTestObj *)newWithScriptExecutionContextAttribute
{
    WebCore::JSMainThreadNullState state;
    ASSERT(newWithScriptExecutionContextAttribute);

    IMPL->setWithScriptExecutionContextAttribute(core(newWithScriptExecutionContextAttribute));
}

- (DOMTestObj *)withScriptStateAttributeRaises
{
    WebCore::JSMainThreadNullState state;
    WebCore::ExceptionCode ec = 0;
    DOMTestObj *result = kit(WTF::getPtr(IMPL->withScriptStateAttributeRaises(ec)));
    WebCore::raiseOnDOMError(ec);
    return result;
}

- (void)setWithScriptStateAttributeRaises:(DOMTestObj *)newWithScriptStateAttributeRaises
{
    WebCore::JSMainThreadNullState state;
    ASSERT(newWithScriptStateAttributeRaises);

    WebCore::ExceptionCode ec = 0;
    IMPL->setWithScriptStateAttributeRaises(core(newWithScriptStateAttributeRaises), ec);
    WebCore::raiseOnDOMError(ec);
}

- (DOMTestObj *)withScriptExecutionContextAttributeRaises
{
    WebCore::JSMainThreadNullState state;
    WebCore::ExceptionCode ec = 0;
    DOMTestObj *result = kit(WTF::getPtr(IMPL->withScriptExecutionContextAttributeRaises(ec)));
    WebCore::raiseOnDOMError(ec);
    return result;
}

- (void)setWithScriptExecutionContextAttributeRaises:(DOMTestObj *)newWithScriptExecutionContextAttributeRaises
{
    WebCore::JSMainThreadNullState state;
    ASSERT(newWithScriptExecutionContextAttributeRaises);

    WebCore::ExceptionCode ec = 0;
    IMPL->setWithScriptExecutionContextAttributeRaises(core(newWithScriptExecutionContextAttributeRaises), ec);
    WebCore::raiseOnDOMError(ec);
}

- (NSString *)scriptStringAttr
{
    WebCore::JSMainThreadNullState state;

Lines 109-114 module test { a/Source/WebCore/bindings/scripts/test/TestObj.idl_sec1
- a/Source/WebCore/bindings/scripts/test/TestObj.idl +7 lines
109	raises(DOMException);	109	raises(DOMException);
110	[CallWith=ScriptExecutionContext] void withScriptExecutionContext();	110	[CallWith=ScriptExecutionContext] void withScriptExecutionContext();
111		111
		112	attribute [CallWith=ScriptState] long withScriptStateAttribute;
		113	attribute [CallWith=ScriptExecutionContext] TestObj withScriptExecutionContextAttribute;
		114	attribute [CallWith=ScriptState] TestObj withScriptStateAttributeRaises
		115	getter raises(DOMException);
		116	attribute [CallWith=ScriptExecutionContext] TestObj withScriptExecutionContextAttributeRaises
		117	getter raises(DOMException);
		118
112	// 'Optional' extended attribute	119	// 'Optional' extended attribute
113	void methodWithOptionalArg(in [Optional] long opt);	120	void methodWithOptionalArg(in [Optional] long opt);
114	void methodWithNonOptionalArgAndOptionalArg(in long nonOpt, in [Optional] long opt);	121	void methodWithNonOptionalArgAndOptionalArg(in long nonOpt, in [Optional] long opt);



    return;
}

static v8::Handle<v8::Value> withScriptStateAttributeAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptStateAttribute._get");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    ScriptState* state = ScriptState::current();
    if (!state)
        return v8::Undefined();
    return v8::Integer::New(imp->withScriptStateAttribute(state));
}

static void withScriptStateAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptStateAttribute._set");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    int v = toInt32(value);
    ScriptState* state = ScriptState::current();
    if (!state)
        return;
    imp->setWithScriptStateAttribute(state, v);
    if (state.hadException())
        throwError(state.exception());
    return;
}

static v8::Handle<v8::Value> withScriptExecutionContextAttributeAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptExecutionContextAttribute._get");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    ScriptExecutionContext* scriptContext = getScriptExecutionContext();
    if (!scriptContext)
        return v8::Undefined();
    return toV8(imp->withScriptExecutionContextAttribute(scriptContext));
}

static void withScriptExecutionContextAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptExecutionContextAttribute._set");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    TestObj* v = V8TestObj::HasInstance(value) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
    ScriptExecutionContext* scriptContext = getScriptExecutionContext();
    if (!scriptContext)
        return;
    imp->setWithScriptExecutionContextAttribute(scriptContext, WTF::getPtr(v));
    return;
}

static v8::Handle<v8::Value> withScriptStateAttributeRaisesAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptStateAttributeRaises._get");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    ExceptionCode ec = 0;
    ScriptState* state = ScriptState::current();
    if (!state)
        return v8::Undefined();
    RefPtr<TestObj> v = imp->withScriptStateAttributeRaises(state, ec);
    if (UNLIKELY(ec)) {
        V8Proxy::setDOMException(ec);
        return v8::Handle<v8::Value>();
    }
    if (state.hadException())
        return throwError(state.exception());
    return toV8(v.release());
}

static void withScriptStateAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptStateAttributeRaises._set");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    TestObj* v = V8TestObj::HasInstance(value) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
    ExceptionCode ec = 0;
    ScriptState* state = ScriptState::current();
    if (!state)
        return;
    imp->setWithScriptStateAttributeRaises(state, WTF::getPtr(v), ec);
    if (UNLIKELY(ec))
        V8Proxy::setDOMException(ec);
    if (state.hadException())
        throwError(state.exception());
    return;
}

static v8::Handle<v8::Value> withScriptExecutionContextAttributeRaisesAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptExecutionContextAttributeRaises._get");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    ExceptionCode ec = 0;
    ScriptExecutionContext* scriptContext = getScriptExecutionContext();
    if (!scriptContext)
        return v8::Undefined();
    RefPtr<TestObj> v = imp->withScriptExecutionContextAttributeRaises(scriptContext, ec);
    if (UNLIKELY(ec)) {
        V8Proxy::setDOMException(ec);
        return v8::Handle<v8::Value>();
    }
    return toV8(v.release());
}

static void withScriptExecutionContextAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.withScriptExecutionContextAttributeRaises._set");
    TestObj* imp = V8TestObj::toNative(info.Holder());
    TestObj* v = V8TestObj::HasInstance(value) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
    ExceptionCode ec = 0;
    ScriptExecutionContext* scriptContext = getScriptExecutionContext();
    if (!scriptContext)
        return;
    imp->setWithScriptExecutionContextAttributeRaises(scriptContext, WTF::getPtr(v), ec);
    if (UNLIKELY(ec))
        V8Proxy::setDOMException(ec);
    return;
}

static v8::Handle<v8::Value> scriptStringAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
{
    INC_STATS("DOM.TestObj.scriptStringAttr._get");

    {"stringAttrWithSetterException", TestObjInternal::stringAttrWithSetterExceptionAttrGetter, TestObjInternal::stringAttrWithSetterExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    // Attribute 'customAttr' (Type: 'attribute' ExtAttr: 'Custom')
    {"customAttr", V8TestObj::customAttrAccessorGetter, V8TestObj::customAttrAccessorSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    // Attribute 'withScriptStateAttribute' (Type: 'attribute' ExtAttr: 'CallWith')
    {"withScriptStateAttribute", TestObjInternal::withScriptStateAttributeAttrGetter, TestObjInternal::withScriptStateAttributeAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    // Attribute 'withScriptExecutionContextAttribute' (Type: 'attribute' ExtAttr: 'CallWith')
    {"withScriptExecutionContextAttribute", TestObjInternal::withScriptExecutionContextAttributeAttrGetter, TestObjInternal::withScriptExecutionContextAttributeAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    // Attribute 'withScriptStateAttributeRaises' (Type: 'attribute' ExtAttr: 'CallWith')
    {"withScriptStateAttributeRaises", TestObjInternal::withScriptStateAttributeRaisesAttrGetter, TestObjInternal::withScriptStateAttributeRaisesAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    // Attribute 'withScriptExecutionContextAttributeRaises' (Type: 'attribute' ExtAttr: 'CallWith')
    {"withScriptExecutionContextAttributeRaises", TestObjInternal::withScriptExecutionContextAttributeRaisesAttrGetter, TestObjInternal::withScriptExecutionContextAttributeRaisesAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    // Attribute 'scriptStringAttr' (Type: 'readonly attribute' ExtAttr: 'ConvertScriptString')
    {"scriptStringAttr", TestObjInternal::scriptStringAttrAttrGetter, 0, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
#if ENABLE(Condition1)

Return to Bug 76517

Lines 519-524 void WebDOMTestObj::setStringAttrWithSetterException(const WebDOMString& newStri a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp_sec1
- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp +74 lines
519	webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));	519	webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
520	}	520	}
521		521
		522	int WebDOMTestObj::withScriptStateAttribute() const
		523	{
		524	if (!impl())
		525	return 0;
		526
		527	return impl()->withScriptStateAttribute();
		528	}
		529
		530	void WebDOMTestObj::setWithScriptStateAttribute(int newWithScriptStateAttribute)
		531	{
		532	if (!impl())
		533	return;
		534
		535	impl()->setWithScriptStateAttribute(newWithScriptStateAttribute);
		536	}
		537
		538	WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAttribute() const
		539	{
		540	if (!impl())
		541	return WebDOMTestObj();
		542
		543	return toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAttribute()));
		544	}
		545
		546	void WebDOMTestObj::setWithScriptExecutionContextAttribute(const WebDOMTestObj& newWithScriptExecutionContextAttribute)
		547	{
		548	if (!impl())
		549	return;
		550
		551	impl()->setWithScriptExecutionContextAttribute(toWebCore(newWithScriptExecutionContextAttribute));
		552	}
		553
		554	WebDOMTestObj WebDOMTestObj::withScriptStateAttributeRaises() const
		555	{
		556	if (!impl())
		557	return WebDOMTestObj();
		558
		559	WebCore::ExceptionCode ec = 0;
		560	WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptStateAttributeRaises(ec)));
		561	webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
		562	return result;
		563	}
		564
		565	void WebDOMTestObj::setWithScriptStateAttributeRaises(const WebDOMTestObj& newWithScriptStateAttributeRaises)
		566	{
		567	if (!impl())
		568	return;
		569
		570	WebCore::ExceptionCode ec = 0;
		571	impl()->setWithScriptStateAttributeRaises(toWebCore(newWithScriptStateAttributeRaises), ec);
		572	webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
		573	}
		574
		575	WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAttributeRaises() const
		576	{
		577	if (!impl())
		578	return WebDOMTestObj();
		579
		580	WebCore::ExceptionCode ec = 0;
		581	WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAttributeRaises(ec)));
		582	webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
		583	return result;
		584	}
		585
586	void WebDOMTestObj::setWithScriptExecutionContextAttributeRaises(const WebDOMTestObj& newWithScriptExecutionContextAttributeRaises)
587	{
588	if (!impl())
589	return;
590
591	WebCore::ExceptionCode ec = 0;
592	impl()->setWithScriptExecutionContextAttributeRaises(toWebCore(newWithScriptExecutionContextAttributeRaises), ec);
593	webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
594	}
595
522	WebDOMString WebDOMTestObj::scriptStringAttr() const	596	WebDOMString WebDOMTestObj::scriptStringAttr() const
523	{	597	{
524	if (!impl())	598	if (!impl())

Lines 974-979 WEBKIT_API void a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h_sec1
- a/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h +88 lines
974	webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error);	974	webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error);
975		975
976	/**	976	/**
		977	* webkit_dom_test_obj_get_with_script_state_attribute:
		978	* @self: A #WebKitDOMTestObj
		979	*
		980	* Returns:
		981	*
		982	**/
		983	WEBKIT_API glong
		984	webkit_dom_test_obj_get_with_script_state_attribute(WebKitDOMTestObj* self);
		985
		986	/**
		987	* webkit_dom_test_obj_set_with_script_state_attribute:
		988	* @self: A #WebKitDOMTestObj
		989	* @value: A #glong
		990	*
		991	* Returns:
		992	*
		993	**/
		994	WEBKIT_API void
		995	webkit_dom_test_obj_set_with_script_state_attribute(WebKitDOMTestObj* self, glong value);
		996
		997	/**
		998	* webkit_dom_test_obj_get_with_script_execution_context_attribute:
		999	* @self: A #WebKitDOMTestObj
		1000	*
		1001	* Returns: (transfer none):
		1002	*
		1003	**/
		1004	WEBKIT_API WebKitDOMTestObj*
		1005	webkit_dom_test_obj_get_with_script_execution_context_attribute(WebKitDOMTestObj* self);
		1006
		1007	/**
		1008	* webkit_dom_test_obj_set_with_script_execution_context_attribute:
		1009	* @self: A #WebKitDOMTestObj
		1010	* @value: A #WebKitDOMTestObj
		1011	*
		1012	* Returns: (transfer none):
		1013	*
		1014	**/
		1015	WEBKIT_API void
		1016	webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value);
		1017
		1018	/**
		1019	* webkit_dom_test_obj_get_with_script_state_attribute_raises:
		1020	* @self: A #WebKitDOMTestObj
		1021	* @error: #GError
		1022	*
		1023	* Returns: (transfer none):
		1024	*
		1025	**/
		1026	WEBKIT_API WebKitDOMTestObj*
		1027	webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error);
		1028
		1029	/**
		1030	* webkit_dom_test_obj_set_with_script_state_attribute_raises:
		1031	* @self: A #WebKitDOMTestObj
		1032	* @value: A #WebKitDOMTestObj
		1033	* @error: #GError
		1034	*
		1035	* Returns: (transfer none):
		1036	*
		1037	**/
		1038	WEBKIT_API void
		1039	webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
		1040
1041	/**
1042	* webkit_dom_test_obj_get_with_script_execution_context_attribute_raises:
1043	* @self: A #WebKitDOMTestObj
1044	* @error: #GError
1045	*
1046	* Returns: (transfer none):
1047	*
1048	**/
1049	WEBKIT_API WebKitDOMTestObj*
1050	webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError **error);
1051
1052	/**
1053	* webkit_dom_test_obj_set_with_script_execution_context_attribute_raises:
1054	* @self: A #WebKitDOMTestObj
1055	* @value: A #WebKitDOMTestObj
1056	* @error: #GError
1057	*
1058	* Returns: (transfer none):
1059	*
1060	**/
1061	WEBKIT_API void
1062	webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
1063
1064	/**
977	* webkit_dom_test_obj_get_script_string_attr:	1065	* webkit_dom_test_obj_get_script_string_attr:
978	* @self: A #WebKitDOMTestObj	1066	* @self: A #WebKitDOMTestObj
979	*	1067	*

Lines 514-519 static void stringAttrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, a/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp_sec1
- a/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp +120 lines
514	return;	514	return;
515	}	515	}
516		516
		517	static v8::Handle<v8::Value> withScriptStateAttributeAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
		518	{
		519	INC_STATS("DOM.TestObj.withScriptStateAttribute._get");
		520	TestObj* imp = V8TestObj::toNative(info.Holder());
		521	ScriptState* state = ScriptState::current();
		522	if (!state)
		523	return v8::Undefined();
		524	return v8::Integer::New(imp->withScriptStateAttribute(state));
		525	}
		526
		527	static void withScriptStateAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
		528	{
		529	INC_STATS("DOM.TestObj.withScriptStateAttribute._set");
		530	TestObj* imp = V8TestObj::toNative(info.Holder());
		531	int v = toInt32(value);
		532	ScriptState* state = ScriptState::current();
		533	if (!state)
		534	return;
		535	imp->setWithScriptStateAttribute(state, v);
		536	if (state.hadException())
		537	throwError(state.exception());
		538	return;
		539	}
		540
		541	static v8::Handle<v8::Value> withScriptExecutionContextAttributeAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
		542	{
		543	INC_STATS("DOM.TestObj.withScriptExecutionContextAttribute._get");
		544	TestObj* imp = V8TestObj::toNative(info.Holder());
		545	ScriptExecutionContext* scriptContext = getScriptExecutionContext();
		546	if (!scriptContext)
		547	return v8::Undefined();
		548	return toV8(imp->withScriptExecutionContextAttribute(scriptContext));
		549	}
		550
		551	static void withScriptExecutionContextAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
		552	{
		553	INC_STATS("DOM.TestObj.withScriptExecutionContextAttribute._set");
		554	TestObj* imp = V8TestObj::toNative(info.Holder());
		555	TestObj* v = V8TestObj::HasInstance(value) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
		556	ScriptExecutionContext* scriptContext = getScriptExecutionContext();
		557	if (!scriptContext)
		558	return;
		559	imp->setWithScriptExecutionContextAttribute(scriptContext, WTF::getPtr(v));
		560	return;
		561	}
		562
		563	static v8::Handle<v8::Value> withScriptStateAttributeRaisesAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
		564	{
		565	INC_STATS("DOM.TestObj.withScriptStateAttributeRaises._get");
		566	TestObj* imp = V8TestObj::toNative(info.Holder());
		567	ExceptionCode ec = 0;
		568	ScriptState* state = ScriptState::current();
		569	if (!state)
		570	return v8::Undefined();
		571	RefPtr<TestObj> v = imp->withScriptStateAttributeRaises(state, ec);
		572	if (UNLIKELY(ec)) {
		573	V8Proxy::setDOMException(ec);
		574	return v8::Handle<v8::Value>();
		575	}
		576	if (state.hadException())
		577	return throwError(state.exception());
		578	return toV8(v.release());
		579	}
		580
581	static void withScriptStateAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
582	{
583	INC_STATS("DOM.TestObj.withScriptStateAttributeRaises._set");
584	TestObj* imp = V8TestObj::toNative(info.Holder());
585	TestObj* v = V8TestObj::HasInstance(value) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
586	ExceptionCode ec = 0;
587	ScriptState* state = ScriptState::current();
588	if (!state)
589	return;
590	imp->setWithScriptStateAttributeRaises(state, WTF::getPtr(v), ec);
591	if (UNLIKELY(ec))
592	V8Proxy::setDOMException(ec);
593	if (state.hadException())
594	throwError(state.exception());
595	return;
596	}
597
598	static v8::Handle<v8::Value> withScriptExecutionContextAttributeRaisesAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
599	{
600	INC_STATS("DOM.TestObj.withScriptExecutionContextAttributeRaises._get");
601	TestObj* imp = V8TestObj::toNative(info.Holder());
602	ExceptionCode ec = 0;
603	ScriptExecutionContext* scriptContext = getScriptExecutionContext();
604	if (!scriptContext)
605	return v8::Undefined();
606	RefPtr<TestObj> v = imp->withScriptExecutionContextAttributeRaises(scriptContext, ec);
607	if (UNLIKELY(ec)) {
608	V8Proxy::setDOMException(ec);
609	return v8::Handle<v8::Value>();
610	}
611	return toV8(v.release());
612	}
613
614	static void withScriptExecutionContextAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
615	{
616	INC_STATS("DOM.TestObj.withScriptExecutionContextAttributeRaises._set");
617	TestObj* imp = V8TestObj::toNative(info.Holder());
618	TestObj* v = V8TestObj::HasInstance(value) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
619	ExceptionCode ec = 0;
620	ScriptExecutionContext* scriptContext = getScriptExecutionContext();
621	if (!scriptContext)
622	return;
623	imp->setWithScriptExecutionContextAttributeRaises(scriptContext, WTF::getPtr(v), ec);
624	if (UNLIKELY(ec))
625	V8Proxy::setDOMException(ec);
626	return;
627	}
628
517	static v8::Handle<v8::Value> scriptStringAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)	629	static v8::Handle<v8::Value> scriptStringAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
518	{	630	{
519	INC_STATS("DOM.TestObj.scriptStringAttr._get");	631	INC_STATS("DOM.TestObj.scriptStringAttr._get");
Lines 1522-1527 static const BatchedAttribute TestObjAttrs[] = { a/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp_sec2
1522	{"stringAttrWithSetterException", TestObjInternal::stringAttrWithSetterExceptionAttrGetter, TestObjInternal::stringAttrWithSetterExceptionAttrSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},	1634	{"stringAttrWithSetterException", TestObjInternal::stringAttrWithSetterExceptionAttrGetter, TestObjInternal::stringAttrWithSetterExceptionAttrSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},
1523	// Attribute 'customAttr' (Type: 'attribute' ExtAttr: 'Custom')	1635	// Attribute 'customAttr' (Type: 'attribute' ExtAttr: 'Custom')
1524	{"customAttr", V8TestObj::customAttrAccessorGetter, V8TestObj::customAttrAccessorSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},	1636	{"customAttr", V8TestObj::customAttrAccessorGetter, V8TestObj::customAttrAccessorSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},
		1637	// Attribute 'withScriptStateAttribute' (Type: 'attribute' ExtAttr: 'CallWith')
		1638	{"withScriptStateAttribute", TestObjInternal::withScriptStateAttributeAttrGetter, TestObjInternal::withScriptStateAttributeAttrSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},
		1639	// Attribute 'withScriptExecutionContextAttribute' (Type: 'attribute' ExtAttr: 'CallWith')
		1640	{"withScriptExecutionContextAttribute", TestObjInternal::withScriptExecutionContextAttributeAttrGetter, TestObjInternal::withScriptExecutionContextAttributeAttrSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},
		1641	// Attribute 'withScriptStateAttributeRaises' (Type: 'attribute' ExtAttr: 'CallWith')
		1642	{"withScriptStateAttributeRaises", TestObjInternal::withScriptStateAttributeRaisesAttrGetter, TestObjInternal::withScriptStateAttributeRaisesAttrSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},
		1643	// Attribute 'withScriptExecutionContextAttributeRaises' (Type: 'attribute' ExtAttr: 'CallWith')
		1644	{"withScriptExecutionContextAttributeRaises", TestObjInternal::withScriptExecutionContextAttributeRaisesAttrGetter, TestObjInternal::withScriptExecutionContextAttributeRaisesAttrSetter, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},
1525	// Attribute 'scriptStringAttr' (Type: 'readonly attribute' ExtAttr: 'ConvertScriptString')	1645	// Attribute 'scriptStringAttr' (Type: 'readonly attribute' ExtAttr: 'ConvertScriptString')
1526	{"scriptStringAttr", TestObjInternal::scriptStringAttrAttrGetter, 0, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},	1646	{"scriptStringAttr", TestObjInternal::scriptStringAttrAttrGetter, 0, 0 /* no data /, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 / on instance */},
1527	#if ENABLE(Condition1)	1647	#if ENABLE(Condition1)

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +68 lines
		1	2012-01-17 Pablo Flouret <pablof@motorola.com>
		2
		3	Add [CallWith] support for attributes in JSC/V8 idl code generators.
		4	Part of https://bugs.webkit.org/show_bug.cgi?id=76035
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* bindings/scripts/CodeGeneratorJS.pm:
		9	(GenerateImplementation):
		10	(GenerateAttributeCallWith):
		11	* bindings/scripts/CodeGeneratorV8.pm:
		12	(GenerateNormalAttrGetter):
		13	(GenerateNormalAttrSetter):
		14	(GenerateAttributeCallWith):
		15	* bindings/scripts/test/CPP/WebDOMTestObj.cpp:
		16	(WebDOMTestObj::withScriptStateAttribute):
		17	(WebDOMTestObj::setWithScriptStateAttribute):
		18	(WebDOMTestObj::withScriptExecutionContextAttribute):
		19	(WebDOMTestObj::setWithScriptExecutionContextAttribute):
		20	(WebDOMTestObj::withScriptStateAttributeRaises):
		21	(WebDOMTestObj::setWithScriptStateAttributeRaises):
		22	(WebDOMTestObj::withScriptExecutionContextAttributeRaises):
		23	(WebDOMTestObj::setWithScriptExecutionContextAttributeRaises):
		24	* bindings/scripts/test/CPP/WebDOMTestObj.h:
		25	* bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
		26	(webkit_dom_test_obj_get_with_script_state_attribute):
		27	(webkit_dom_test_obj_set_with_script_state_attribute):
		28	(webkit_dom_test_obj_get_with_script_execution_context_attribute):
		29	(webkit_dom_test_obj_set_with_script_execution_context_attribute):
		30	(webkit_dom_test_obj_get_with_script_state_attribute_raises):
		31	(webkit_dom_test_obj_set_with_script_state_attribute_raises):
		32	(webkit_dom_test_obj_get_with_script_execution_context_attribute_raises):
		33	(webkit_dom_test_obj_set_with_script_execution_context_attribute_raises):
		34	(webkit_dom_test_obj_set_property):
		35	(webkit_dom_test_obj_get_property):
		36	(webkit_dom_test_obj_class_init):
		37	* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
		38	* bindings/scripts/test/JS/JSTestObj.cpp:
		39	(WebCore::jsTestObjWithScriptStateAttribute):
		40	(WebCore::jsTestObjWithScriptExecutionContextAttribute):
		41	(WebCore::jsTestObjWithScriptStateAttributeRaises):
		42	(WebCore::jsTestObjWithScriptExecutionContextAttributeRaises):
		43	(WebCore::setJSTestObjWithScriptStateAttribute):
		44	(WebCore::setJSTestObjWithScriptExecutionContextAttribute):
		45	(WebCore::setJSTestObjWithScriptStateAttributeRaises):
		46	(WebCore::setJSTestObjWithScriptExecutionContextAttributeRaises):
		47	* bindings/scripts/test/JS/JSTestObj.h:
		48	* bindings/scripts/test/ObjC/DOMTestObj.h:
		49	* bindings/scripts/test/ObjC/DOMTestObj.mm:
		50	(-[DOMTestObj withScriptStateAttribute]):
		51	(-[DOMTestObj setWithScriptStateAttribute:]):
		52	(-[DOMTestObj withScriptExecutionContextAttribute]):
		53	(-[DOMTestObj setWithScriptExecutionContextAttribute:]):
		54	(-[DOMTestObj withScriptStateAttributeRaises]):
		55	(-[DOMTestObj setWithScriptStateAttributeRaises:]):
		56	(-[DOMTestObj withScriptExecutionContextAttributeRaises]):
		57	(-[DOMTestObj setWithScriptExecutionContextAttributeRaises:]):
		58	* bindings/scripts/test/TestObj.idl:
		59	* bindings/scripts/test/V8/V8TestObj.cpp:
		60	(WebCore::TestObjInternal::withScriptStateAttributeAttrGetter):
		61	(WebCore::TestObjInternal::withScriptStateAttributeAttrSetter):
		62	(WebCore::TestObjInternal::withScriptExecutionContextAttributeAttrGetter):
		63	(WebCore::TestObjInternal::withScriptExecutionContextAttributeAttrSetter):
		64	(WebCore::TestObjInternal::withScriptStateAttributeRaisesAttrGetter):
65	(WebCore::TestObjInternal::withScriptStateAttributeRaisesAttrSetter):
66	(WebCore::TestObjInternal::withScriptExecutionContextAttributeRaisesAttrGetter):
67	(WebCore::TestObjInternal::withScriptExecutionContextAttributeRaisesAttrSetter):
68
1	2012-01-16 Hajime Morrita <morrita@chromium.org>	69	2012-01-16 Hajime Morrita <morrita@chromium.org>
2		70
3	[Internals] member varaibles should follow naming convention.	71	[Internals] member varaibles should follow naming convention.

Lines 436-441 a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm_sec1
- a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm +64 lines
436	IMPL->setCustomAttr(newCustomAttr);	436	IMPL->setCustomAttr(newCustomAttr);
437	}	437	}
438		438
		439	- (int)withScriptStateAttribute
		440	{
		441	WebCore::JSMainThreadNullState state;
		442	return IMPL->withScriptStateAttribute();
		443	}
		444
		445	- (void)setWithScriptStateAttribute:(int)newWithScriptStateAttribute
		446	{
		447	WebCore::JSMainThreadNullState state;
		448	IMPL->setWithScriptStateAttribute(newWithScriptStateAttribute);
		449	}
		450
		451	- (DOMTestObj *)withScriptExecutionContextAttribute
		452	{
		453	WebCore::JSMainThreadNullState state;
		454	return kit(WTF::getPtr(IMPL->withScriptExecutionContextAttribute()));
		455	}
		456
		457	- (void)setWithScriptExecutionContextAttribute:(DOMTestObj *)newWithScriptExecutionContextAttribute
		458	{
		459	WebCore::JSMainThreadNullState state;
		460	ASSERT(newWithScriptExecutionContextAttribute);
		461
		462	IMPL->setWithScriptExecutionContextAttribute(core(newWithScriptExecutionContextAttribute));
		463	}
		464
		465	- (DOMTestObj *)withScriptStateAttributeRaises
		466	{
		467	WebCore::JSMainThreadNullState state;
		468	WebCore::ExceptionCode ec = 0;
		469	DOMTestObj *result = kit(WTF::getPtr(IMPL->withScriptStateAttributeRaises(ec)));
		470	WebCore::raiseOnDOMError(ec);
		471	return result;
		472	}
		473
		474	- (void)setWithScriptStateAttributeRaises:(DOMTestObj *)newWithScriptStateAttributeRaises
		475	{
		476	WebCore::JSMainThreadNullState state;
		477	ASSERT(newWithScriptStateAttributeRaises);
		478
		479	WebCore::ExceptionCode ec = 0;
		480	IMPL->setWithScriptStateAttributeRaises(core(newWithScriptStateAttributeRaises), ec);
		481	WebCore::raiseOnDOMError(ec);
		482	}
		483
		484	- (DOMTestObj *)withScriptExecutionContextAttributeRaises
		485	{
		486	WebCore::JSMainThreadNullState state;
		487	WebCore::ExceptionCode ec = 0;
		488	DOMTestObj *result = kit(WTF::getPtr(IMPL->withScriptExecutionContextAttributeRaises(ec)));
		489	WebCore::raiseOnDOMError(ec);
		490	return result;
		491	}
		492
		493	- (void)setWithScriptExecutionContextAttributeRaises:(DOMTestObj *)newWithScriptExecutionContextAttributeRaises
		494	{
		495	WebCore::JSMainThreadNullState state;
		496	ASSERT(newWithScriptExecutionContextAttributeRaises);
		497
		498	WebCore::ExceptionCode ec = 0;
		499	IMPL->setWithScriptExecutionContextAttributeRaises(core(newWithScriptExecutionContextAttributeRaises), ec);
		500	WebCore::raiseOnDOMError(ec);
		501	}
		502
439	- (NSString *)scriptStringAttr	503	- (NSString *)scriptStringAttr
440	{	504	{
441	WebCore::JSMainThreadNullState state;	505	WebCore::JSMainThreadNullState state;