Title: [147169] trunk/Source/WebCore
Revision
147169
Author
[email protected]
Date
2013-03-28 15:17:05 -0700 (Thu, 28 Mar 2013)

Log Message

REGRESSION(r147149): breaks binding test on Mac. (Requested by mlam_ on #webkit).
https://bugs.webkit.org/show_bug.cgi?id=113538

Patch by Arnaud Renevier <[email protected]> on 2013-03-28
Reviewed by Simon Fraser.

Run run-bindings-tests --reset-results to fix broken tests after
r147149.

* bindings/scripts/test/V8/V8TestInterface.cpp:
(WebCore::TestInterfaceV8Internal::supplementalNodeAttrSetter):
* bindings/scripts/test/V8/V8TestObj.cpp:
(WebCore::TestObjV8Internal::shortAttrAttrSetter):
(WebCore::TestObjV8Internal::unsignedShortAttrAttrSetter):
(WebCore::TestObjV8Internal::longAttrAttrSetter):
(WebCore::TestObjV8Internal::longLongAttrAttrSetter):
(WebCore::TestObjV8Internal::unsignedLongLongAttrAttrSetter):
(WebCore::TestObjV8Internal::testObjAttrAttrSetter):
(WebCore::TestObjV8Internal::XMLObjAttrAttrSetter):
(WebCore::TestObjV8Internal::createAttrSetter):
(WebCore::TestObjV8Internal::reflectedIntegralAttrAttrSetter):
(WebCore::TestObjV8Internal::reflectedUnsignedIntegralAttrAttrSetter):
(WebCore::TestObjV8Internal::reflectedBooleanAttrAttrSetter):
(WebCore::TestObjV8Internal::reflectedCustomIntegralAttrAttrSetter):
(WebCore::TestObjV8Internal::reflectedCustomBooleanAttrAttrSetter):
(WebCore::TestObjV8Internal::typedArrayAttrAttrSetter):
(WebCore::TestObjV8Internal::attrWithGetterExceptionAttrSetter):
(WebCore::TestObjV8Internal::attrWithSetterExceptionAttrSetter):
(WebCore::TestObjV8Internal::withScriptStateAttributeAttrSetter):
(WebCore::TestObjV8Internal::withScriptExecutionContextAttributeAttrSetter):
(WebCore::TestObjV8Internal::withScriptStateAttributeRaisesAttrSetter):
(WebCore::TestObjV8Internal::withScriptExecutionContextAttributeRaisesAttrSetter):
(WebCore::TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeAttrSetter):
(WebCore::TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeRaisesAttrSetter):
(WebCore::TestObjV8Internal::withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrSetter):
(WebCore::TestObjV8Internal::withScriptArgumentsAndCallStackAttributeAttrSetter):
(WebCore::TestObjV8Internal::conditionalAttr1AttrSetter):
(WebCore::TestObjV8Internal::conditionalAttr2AttrSetter):
(WebCore::TestObjV8Internal::conditionalAttr3AttrSetter):
(WebCore::TestObjV8Internal::anyAttributeAttrSetter):
(WebCore::TestObjV8Internal::enabledAtRuntimeAttr1AttrSetter):
(WebCore::TestObjV8Internal::enabledAtRuntimeAttr2AttrSetter):
(WebCore::TestObjV8Internal::enabledPerContextAttr1AttrSetter):
(WebCore::TestObjV8Internal::enabledPerContextAttr2AttrSetter):
(WebCore::TestObjV8Internal::floatArrayAttrSetter):
(WebCore::TestObjV8Internal::doubleArrayAttrSetter):
(WebCore::TestObjV8Internal::mutablePointAttrSetter):
(WebCore::TestObjV8Internal::immutablePointAttrSetter):
(WebCore::TestObjV8Internal::strawberryAttrSetter):
(WebCore::TestObjV8Internal::strictFloatAttrSetter):
(WebCore::TestObjV8Internal::idAttrSetter):
(WebCore::TestObjV8Internal::nullableLongSettableAttributeAttrSetter):
(WebCore::TestObjV8Internal::nullableStringValueAttrSetter):
(WebCore::TestObjV8Internal::perWorldAttributeAttrSetter):
(WebCore::TestObjV8Internal::perWorldAttributeAttrSetterForMainWorld):
* bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
(WebCore::TestSerializedScriptValueInterfaceV8Internal::valueAttrSetter):
(WebCore::TestSerializedScriptValueInterfaceV8Internal::cachedValueAttrSetter):
* bindings/scripts/test/V8/V8TestTypedefs.cpp:
(WebCore::TestTypedefsV8Internal::unsignedLongLongAttrAttrSetter):
(WebCore::TestTypedefsV8Internal::immutableSerializedScriptValueAttrSetter):
(WebCore::TestTypedefsV8Internal::attrWithGetterExceptionAttrSetter):
(WebCore::TestTypedefsV8Internal::attrWithSetterExceptionAttrSetter):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (147168 => 147169)


--- trunk/Source/WebCore/ChangeLog	2013-03-28 22:07:16 UTC (rev 147168)
+++ trunk/Source/WebCore/ChangeLog	2013-03-28 22:17:05 UTC (rev 147169)
@@ -1,3 +1,68 @@
+2013-03-28  Arnaud Renevier  <[email protected]>
+
+        REGRESSION(r147149): breaks binding test on Mac. (Requested by mlam_ on #webkit).
+        https://bugs.webkit.org/show_bug.cgi?id=113538
+
+        Reviewed by Simon Fraser.
+
+        Run run-bindings-tests --reset-results to fix broken tests after
+        r147149.
+
+        * bindings/scripts/test/V8/V8TestInterface.cpp:
+        (WebCore::TestInterfaceV8Internal::supplementalNodeAttrSetter):
+        * bindings/scripts/test/V8/V8TestObj.cpp:
+        (WebCore::TestObjV8Internal::shortAttrAttrSetter):
+        (WebCore::TestObjV8Internal::unsignedShortAttrAttrSetter):
+        (WebCore::TestObjV8Internal::longAttrAttrSetter):
+        (WebCore::TestObjV8Internal::longLongAttrAttrSetter):
+        (WebCore::TestObjV8Internal::unsignedLongLongAttrAttrSetter):
+        (WebCore::TestObjV8Internal::testObjAttrAttrSetter):
+        (WebCore::TestObjV8Internal::XMLObjAttrAttrSetter):
+        (WebCore::TestObjV8Internal::createAttrSetter):
+        (WebCore::TestObjV8Internal::reflectedIntegralAttrAttrSetter):
+        (WebCore::TestObjV8Internal::reflectedUnsignedIntegralAttrAttrSetter):
+        (WebCore::TestObjV8Internal::reflectedBooleanAttrAttrSetter):
+        (WebCore::TestObjV8Internal::reflectedCustomIntegralAttrAttrSetter):
+        (WebCore::TestObjV8Internal::reflectedCustomBooleanAttrAttrSetter):
+        (WebCore::TestObjV8Internal::typedArrayAttrAttrSetter):
+        (WebCore::TestObjV8Internal::attrWithGetterExceptionAttrSetter):
+        (WebCore::TestObjV8Internal::attrWithSetterExceptionAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptStateAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptExecutionContextAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptStateAttributeRaisesAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptExecutionContextAttributeRaisesAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptExecutionContextAndScriptStateAttributeRaisesAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::withScriptArgumentsAndCallStackAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::conditionalAttr1AttrSetter):
+        (WebCore::TestObjV8Internal::conditionalAttr2AttrSetter):
+        (WebCore::TestObjV8Internal::conditionalAttr3AttrSetter):
+        (WebCore::TestObjV8Internal::anyAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::enabledAtRuntimeAttr1AttrSetter):
+        (WebCore::TestObjV8Internal::enabledAtRuntimeAttr2AttrSetter):
+        (WebCore::TestObjV8Internal::enabledPerContextAttr1AttrSetter):
+        (WebCore::TestObjV8Internal::enabledPerContextAttr2AttrSetter):
+        (WebCore::TestObjV8Internal::floatArrayAttrSetter):
+        (WebCore::TestObjV8Internal::doubleArrayAttrSetter):
+        (WebCore::TestObjV8Internal::mutablePointAttrSetter):
+        (WebCore::TestObjV8Internal::immutablePointAttrSetter):
+        (WebCore::TestObjV8Internal::strawberryAttrSetter):
+        (WebCore::TestObjV8Internal::strictFloatAttrSetter):
+        (WebCore::TestObjV8Internal::idAttrSetter):
+        (WebCore::TestObjV8Internal::nullableLongSettableAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::nullableStringValueAttrSetter):
+        (WebCore::TestObjV8Internal::perWorldAttributeAttrSetter):
+        (WebCore::TestObjV8Internal::perWorldAttributeAttrSetterForMainWorld):
+        * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
+        (WebCore::TestSerializedScriptValueInterfaceV8Internal::valueAttrSetter):
+        (WebCore::TestSerializedScriptValueInterfaceV8Internal::cachedValueAttrSetter):
+        * bindings/scripts/test/V8/V8TestTypedefs.cpp:
+        (WebCore::TestTypedefsV8Internal::unsignedLongLongAttrAttrSetter):
+        (WebCore::TestTypedefsV8Internal::immutableSerializedScriptValueAttrSetter):
+        (WebCore::TestTypedefsV8Internal::attrWithGetterExceptionAttrSetter):
+        (WebCore::TestTypedefsV8Internal::attrWithSetterExceptionAttrSetter):
+
 2013-03-28  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r147130.

Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp (147168 => 147169)


--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp	2013-03-28 22:07:16 UTC (rev 147168)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp	2013-03-28 22:17:05 UTC (rev 147169)
@@ -234,7 +234,7 @@
 static void supplementalNodeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestInterface* imp = V8TestInterface::toNative(info.Holder());
-    Node* v = V8Node::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(Node*, v, V8Node::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8Node::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     TestSupplemental::setSupplementalNode(imp, WTF::getPtr(v));
     return;
 }

Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (147168 => 147169)


--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp	2013-03-28 22:07:16 UTC (rev 147168)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp	2013-03-28 22:17:05 UTC (rev 147169)
@@ -226,7 +226,7 @@
 static void shortAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setShortAttr(v);
     return;
 }
@@ -250,7 +250,7 @@
 static void unsignedShortAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toUInt32(value);
+    V8TRYCATCH_VOID(int, v, toUInt32(value));
     imp->setUnsignedShortAttr(v);
     return;
 }
@@ -274,7 +274,7 @@
 static void longAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setLongAttr(v);
     return;
 }
@@ -298,7 +298,7 @@
 static void longLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    long long v = toInt64(value);
+    V8TRYCATCH_VOID(long long, v, toInt64(value));
     imp->setLongLongAttr(v);
     return;
 }
@@ -322,7 +322,7 @@
 static void unsignedLongLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    unsigned long long v = toUInt64(value);
+    V8TRYCATCH_VOID(unsigned long long, v, toUInt64(value));
     imp->setUnsignedLongLongAttr(v);
     return;
 }
@@ -371,7 +371,7 @@
 static void testObjAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setTestObjAttr(WTF::getPtr(v));
     return;
 }
@@ -396,7 +396,7 @@
 static void XMLObjAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setXMLObjAttr(WTF::getPtr(v));
     return;
 }
@@ -420,7 +420,7 @@
 static void createAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    bool v = value->BooleanValue();
+    V8TRYCATCH_VOID(bool, v, value->BooleanValue());
     imp->setCreate(v);
     return;
 }
@@ -468,7 +468,7 @@
 static void reflectedIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, v);
     return;
 }
@@ -492,7 +492,7 @@
 static void reflectedUnsignedIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    unsigned v = toUInt32(value);
+    V8TRYCATCH_VOID(unsigned, v, toUInt32(value));
     imp->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, v);
     return;
 }
@@ -516,7 +516,7 @@
 static void reflectedBooleanAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    bool v = value->BooleanValue();
+    V8TRYCATCH_VOID(bool, v, value->BooleanValue());
     imp->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, v);
     return;
 }
@@ -588,7 +588,7 @@
 static void reflectedCustomIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, v);
     return;
 }
@@ -612,7 +612,7 @@
 static void reflectedCustomBooleanAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    bool v = value->BooleanValue();
+    V8TRYCATCH_VOID(bool, v, value->BooleanValue());
     imp->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, v);
     return;
 }
@@ -660,7 +660,7 @@
 static void typedArrayAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    Float32Array* v = V8Float32Array::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8Float32Array::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(Float32Array*, v, V8Float32Array::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8Float32Array::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setTypedArrayAttr(WTF::getPtr(v));
     return;
 }
@@ -688,7 +688,7 @@
 static void attrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setAttrWithGetterException(v);
     return;
 }
@@ -712,7 +712,7 @@
 static void attrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     ExceptionCode ec = 0;
     imp->setAttrWithSetterException(v, ec);
     if (UNLIKELY(ec))
@@ -808,7 +808,7 @@
 static void withScriptStateAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     ScriptState* currentState = ScriptState::current();
     if (!currentState)
         return;
@@ -839,7 +839,7 @@
 static void withScriptExecutionContextAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     ScriptExecutionContext* scriptContext = getScriptExecutionContext();
     imp->setWithScriptExecutionContextAttribute(scriptContext, WTF::getPtr(v));
     return;
@@ -874,7 +874,7 @@
 static void withScriptStateAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     ScriptState* currentState = ScriptState::current();
     if (!currentState)
         return;
@@ -909,7 +909,7 @@
 static void withScriptExecutionContextAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     ScriptExecutionContext* scriptContext = getScriptExecutionContext();
     imp->setWithScriptExecutionContextAttributeRaises(scriptContext, WTF::getPtr(v));
     return;
@@ -939,7 +939,7 @@
 static void withScriptExecutionContextAndScriptStateAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     ScriptState* currentState = ScriptState::current();
     if (!currentState)
         return;
@@ -981,7 +981,7 @@
 static void withScriptExecutionContextAndScriptStateAttributeRaisesAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     ScriptState* currentState = ScriptState::current();
     if (!currentState)
         return;
@@ -1017,7 +1017,7 @@
 static void withScriptExecutionContextAndScriptStateWithSpacesAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     ScriptState* currentState = ScriptState::current();
     if (!currentState)
         return;
@@ -1048,7 +1048,7 @@
 static void withScriptArgumentsAndCallStackAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setWithScriptArgumentsAndCallStackAttribute(WTF::getPtr(v));
     return;
 }
@@ -1178,7 +1178,7 @@
 static void conditionalAttr1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setConditionalAttr1(v);
     return;
 }
@@ -1218,7 +1218,7 @@
 static void conditionalAttr2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setConditionalAttr2(v);
     return;
 }
@@ -1258,7 +1258,7 @@
 static void conditionalAttr3AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setConditionalAttr3(v);
     return;
 }
@@ -1310,7 +1310,7 @@
 static void anyAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    ScriptValue v = ScriptValue(value);
+    V8TRYCATCH_VOID(ScriptValue, v, ScriptValue(value));
     imp->setAnyAttribute(WTF::getPtr(v));
     return;
 }
@@ -1334,7 +1334,7 @@
 static void enabledAtRuntimeAttr1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setEnabledAtRuntimeAttr1(v);
     return;
 }
@@ -1358,7 +1358,7 @@
 static void enabledAtRuntimeAttr2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setEnabledAtRuntimeAttr2(v);
     return;
 }
@@ -1382,7 +1382,7 @@
 static void enabledPerContextAttr1AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setEnabledPerContextAttr1(v);
     return;
 }
@@ -1406,7 +1406,7 @@
 static void enabledPerContextAttr2AttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setEnabledPerContextAttr2(v);
     return;
 }
@@ -1430,7 +1430,7 @@
 static void floatArrayAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    Vector<float> v = toNativeArray<float>(value);
+    V8TRYCATCH_VOID(Vector<float>, v, toNativeArray<float>(value));
     imp->setFloatArray(v);
     return;
 }
@@ -1454,7 +1454,7 @@
 static void doubleArrayAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    Vector<double> v = toNativeArray<double>(value);
+    V8TRYCATCH_VOID(Vector<double>, v, toNativeArray<double>(value));
     imp->setDoubleArray(v);
     return;
 }
@@ -1492,7 +1492,7 @@
 static void mutablePointAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    RefPtr<SVGPropertyTearOff<FloatPoint> > v = V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(RefPtr<SVGPropertyTearOff<FloatPoint> >, v, V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setMutablePoint(WTF::getPtr(v));
     return;
 }
@@ -1516,7 +1516,7 @@
 static void immutablePointAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    RefPtr<SVGPropertyTearOff<FloatPoint> > v = V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(RefPtr<SVGPropertyTearOff<FloatPoint> >, v, V8SVGPoint::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8SVGPoint::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setImmutablePoint(WTF::getPtr(v));
     return;
 }
@@ -1540,7 +1540,7 @@
 static void strawberryAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setBlueberry(v);
     return;
 }
@@ -1564,7 +1564,7 @@
 static void strictFloatAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    float v = static_cast<float>(value->NumberValue());
+    V8TRYCATCH_VOID(float, v, static_cast<float>(value->NumberValue()));
     imp->setStrictFloat(v);
     return;
 }
@@ -1599,7 +1599,7 @@
 static void idAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setId(v);
     return;
 }
@@ -1709,7 +1709,7 @@
 static void nullableLongSettableAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setNullableLongSettableAttribute(v);
     return;
 }
@@ -1740,7 +1740,7 @@
 static void nullableStringValueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setNullableStringValue(v);
     return;
 }
@@ -1811,7 +1811,7 @@
 static void perWorldAttributeAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setPerWorldAttribute(WTF::getPtr(v));
     return;
 }
@@ -1824,7 +1824,7 @@
 static void perWorldAttributeAttrSetterForMainWorld(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestObj* imp = V8TestObj::toNative(info.Holder());
-    TestObj* v = V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0;
+    V8TRYCATCH_VOID(TestObj*, v, V8TestObj::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate())) ? V8TestObj::toNative(v8::Handle<v8::Object>::Cast(value)) : 0);
     imp->setPerWorldAttribute(WTF::getPtr(v));
     return;
 }

Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (147168 => 147169)


--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp	2013-03-28 22:07:16 UTC (rev 147168)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp	2013-03-28 22:17:05 UTC (rev 147169)
@@ -89,7 +89,7 @@
 static void valueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestSerializedScriptValueInterface* imp = V8TestSerializedScriptValueInterface::toNative(info.Holder());
-    RefPtr<SerializedScriptValue> v = SerializedScriptValue::create(value, info.GetIsolate());
+    V8TRYCATCH_VOID(RefPtr<SerializedScriptValue>, v, SerializedScriptValue::create(value, info.GetIsolate()));
     imp->setValue(WTF::getPtr(v));
     return;
 }
@@ -131,7 +131,7 @@
 static void cachedValueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestSerializedScriptValueInterface* imp = V8TestSerializedScriptValueInterface::toNative(info.Holder());
-    RefPtr<SerializedScriptValue> v = SerializedScriptValue::create(value, info.GetIsolate());
+    V8TRYCATCH_VOID(RefPtr<SerializedScriptValue>, v, SerializedScriptValue::create(value, info.GetIsolate()));
     imp->setCachedValue(WTF::getPtr(v));
     info.Holder()->DeleteHiddenValue(v8::String::NewSymbol("cachedValue")); // Invalidate the cached value.
     return;

Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.cpp (147168 => 147169)


--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.cpp	2013-03-28 22:07:16 UTC (rev 147168)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestTypedefs.cpp	2013-03-28 22:17:05 UTC (rev 147169)
@@ -94,7 +94,7 @@
 static void unsignedLongLongAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
-    unsigned long long v = toUInt64(value);
+    V8TRYCATCH_VOID(unsigned long long, v, toUInt64(value));
     imp->setUnsignedLongLongAttr(v);
     return;
 }
@@ -118,7 +118,7 @@
 static void immutableSerializedScriptValueAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
-    RefPtr<SerializedScriptValue> v = SerializedScriptValue::create(value, info.GetIsolate());
+    V8TRYCATCH_VOID(RefPtr<SerializedScriptValue>, v, SerializedScriptValue::create(value, info.GetIsolate()));
     imp->setImmutableSerializedScriptValue(WTF::getPtr(v));
     return;
 }
@@ -146,7 +146,7 @@
 static void attrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     imp->setAttrWithGetterException(v);
     return;
 }
@@ -170,7 +170,7 @@
 static void attrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     TestTypedefs* imp = V8TestTypedefs::toNative(info.Holder());
-    int v = toInt32(value);
+    V8TRYCATCH_VOID(int, v, toInt32(value));
     ExceptionCode ec = 0;
     imp->setAttrWithSetterException(v, ec);
     if (UNLIKELY(ec))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to