Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (203950 => 203951)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-07-31 00:29:19 UTC (rev 203950)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2016-07-31 00:46:03 UTC (rev 203951)
@@ -115,7 +115,6 @@
PROP_ATTR_WITH_SETTER_EXCEPTION_WITH_MESSAGE,
PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
- PROP_STRICT_TYPE_CHECKING_ATTRIBUTE,
PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
PROP_WITH_CALL_WITH_AND_SETTER_CALL_WITH_ATTRIBUTE,
PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE,
@@ -133,7 +132,6 @@
PROP_MUTABLE_POINT,
PROP_IMMUTABLE_POINT,
PROP_STRAWBERRY,
- PROP_STRICT_FLOAT,
PROP_DESCRIPTION,
PROP_ID,
PROP_HASH,
@@ -261,9 +259,6 @@
case PROP_STRAWBERRY:
webkit_dom_test_obj_set_strawberry(self, g_value_get_long(value));
break;
- case PROP_STRICT_FLOAT:
- webkit_dom_test_obj_set_strict_float(self, g_value_get_float(value));
- break;
case PROP_ID:
webkit_dom_test_obj_set_id(self, g_value_get_long(value));
break;
@@ -395,9 +390,6 @@
case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
g_value_take_string(value, webkit_dom_test_obj_get_string_attr_with_setter_exception(self));
break;
- case PROP_STRICT_TYPE_CHECKING_ATTRIBUTE:
- g_value_set_object(value, webkit_dom_test_obj_get_strict_type_checking_attribute(self));
- break;
case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
g_value_set_long(value, webkit_dom_test_obj_get_with_script_state_attribute(self));
break;
@@ -449,9 +441,6 @@
case PROP_STRAWBERRY:
g_value_set_long(value, webkit_dom_test_obj_get_strawberry(self));
break;
- case PROP_STRICT_FLOAT:
- g_value_set_float(value, webkit_dom_test_obj_get_strict_float(self));
- break;
case PROP_DESCRIPTION:
g_value_set_long(value, webkit_dom_test_obj_get_description(self));
break;
@@ -882,16 +871,6 @@
g_object_class_install_property(
gobjectClass,
- PROP_STRICT_TYPE_CHECKING_ATTRIBUTE,
- g_param_spec_object(
- "strict-type-checking-attribute",
- "TestObj:strict-type-checking-attribute",
- "read-only WebKitDOMTestObj* TestObj:strict-type-checking-attribute",
- WEBKIT_DOM_TYPE_TEST_OBJ,
- WEBKIT_PARAM_READABLE));
-
- g_object_class_install_property(
- gobjectClass,
PROP_WITH_SCRIPT_STATE_ATTRIBUTE,
g_param_spec_long(
"with-script-state-attribute",
@@ -1062,16 +1041,6 @@
g_object_class_install_property(
gobjectClass,
- PROP_STRICT_FLOAT,
- g_param_spec_float(
- "strict-float",
- "TestObj:strict-float",
- "read-write gfloat TestObj:strict-float",
- -G_MAXFLOAT, G_MAXFLOAT, 0,
- WEBKIT_PARAM_READWRITE));
-
- g_object_class_install_property(
- gobjectClass,
PROP_DESCRIPTION,
g_param_spec_long(
"description",
@@ -2722,25 +2691,6 @@
}
}
-WebKitDOMTestObj* webkit_dom_test_obj_get_strict_type_checking_attribute(WebKitDOMTestObj* self)
-{
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), 0);
- WebCore::TestObj* item = WebKit::core(self);
- RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->strictTypeCheckingAttribute());
- return WebKit::kit(gobjectResult.get());
-}
-
-void webkit_dom_test_obj_set_strict_type_checking_attribute(WebKitDOMTestObj* self, WebKitDOMTestObj* value)
-{
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(value));
- WebCore::TestObj* item = WebKit::core(self);
- WebCore::TestObj* convertedValue = WebKit::core(value);
- item->setStrictTypeCheckingAttribute(convertedValue);
-}
-
glong webkit_dom_test_obj_get_with_script_state_attribute(WebKitDOMTestObj* self)
{
WebCore::JSMainThreadNullState state;
@@ -3013,23 +2963,6 @@
item->setBlueberry(value);
}
-gfloat webkit_dom_test_obj_get_strict_float(WebKitDOMTestObj* self)
-{
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), 0);
- WebCore::TestObj* item = WebKit::core(self);
- gfloat result = item->strictFloat();
- return result;
-}
-
-void webkit_dom_test_obj_set_strict_float(WebKitDOMTestObj* self, gfloat value)
-{
- WebCore::JSMainThreadNullState state;
- g_return_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self));
- WebCore::TestObj* item = WebKit::core(self);
- item->setStrictFloat(value);
-}
-
glong webkit_dom_test_obj_get_description(WebKitDOMTestObj* self)
{
WebCore::JSMainThreadNullState state;
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (203950 => 203951)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-07-31 00:29:19 UTC (rev 203950)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-07-31 00:46:03 UTC (rev 203951)
@@ -790,8 +790,6 @@
bool setJSTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
-JSC::EncodedJSValue jsTestObjStrictTypeCheckingAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
-bool setJSTestObjStrictTypeCheckingAttribute(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjCustomAttr(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjOnfoo(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
@@ -851,8 +849,6 @@
bool setJSTestObjImmutablePoint(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjStrawberry(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjStrawberry(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
-JSC::EncodedJSValue jsTestObjStrictFloat(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
-bool setJSTestObjStrictFloat(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
JSC::EncodedJSValue jsTestObjDescription(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
JSC::EncodedJSValue jsTestObjId(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
bool setJSTestObjId(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
@@ -1089,7 +1085,6 @@
{ "attrWithSetterExceptionWithMessage", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttrWithSetterExceptionWithMessage), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjAttrWithSetterExceptionWithMessage) } },
{ "stringAttrWithGetterException", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithGetterException), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjStringAttrWithGetterException) } },
{ "stringAttrWithSetterException", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithSetterException), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjStringAttrWithSetterException) } },
- { "strictTypeCheckingAttribute", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStrictTypeCheckingAttribute), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjStrictTypeCheckingAttribute) } },
{ "customAttr", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjCustomAttr), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjCustomAttr) } },
#if ENABLE(Condition4)
{ "jsBuiltinAttribute", Accessor | Builtin, NoIntrinsic, { (intptr_t)static_cast<BuiltinGenerator>(testObjJsBuiltinAttributeCodeGenerator), (intptr_t) (setTestObjJsBuiltinAttributeCodeGenerator) } },
@@ -1134,7 +1129,6 @@
{ "mutablePoint", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjMutablePoint), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjMutablePoint) } },
{ "immutablePoint", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjImmutablePoint), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjImmutablePoint) } },
{ "strawberry", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStrawberry), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjStrawberry) } },
- { "strictFloat", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStrictFloat), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjStrictFloat) } },
{ "description", ReadOnly | CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjDescription), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
{ "id", CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjId), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(setJSTestObjId) } },
{ "hash", ReadOnly | CustomAccessor, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjHash), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
@@ -2010,21 +2004,6 @@
}
-EncodedJSValue jsTestObjStrictTypeCheckingAttribute(ExecState* state, EncodedJSValue thisValue, PropertyName)
-{
- UNUSED_PARAM(state);
- UNUSED_PARAM(thisValue);
- JSValue decodedThisValue = JSValue::decode(thisValue);
- auto* castedThis = jsDynamicCast<JSTestObj*>(decodedThisValue);
- if (UNLIKELY(!castedThis)) {
- return throwGetterTypeError(*state, "TestObject", "strictTypeCheckingAttribute");
- }
- auto& impl = castedThis->wrapped();
- JSValue result = toJS(state, castedThis->globalObject(), impl.strictTypeCheckingAttribute());
- return JSValue::encode(result);
-}
-
-
EncodedJSValue jsTestObjCustomAttr(ExecState* state, EncodedJSValue thisValue, PropertyName)
{
UNUSED_PARAM(state);
@@ -2428,21 +2407,6 @@
}
-EncodedJSValue jsTestObjStrictFloat(ExecState* state, EncodedJSValue thisValue, PropertyName)
-{
- UNUSED_PARAM(state);
- UNUSED_PARAM(thisValue);
- JSValue decodedThisValue = JSValue::decode(thisValue);
- auto* castedThis = jsDynamicCast<JSTestObj*>(decodedThisValue);
- if (UNLIKELY(!castedThis)) {
- return throwGetterTypeError(*state, "TestObject", "strictFloat");
- }
- auto& impl = castedThis->wrapped();
- JSValue result = jsNumber(impl.strictFloat());
- return JSValue::encode(result);
-}
-
-
EncodedJSValue jsTestObjDescription(ExecState* state, EncodedJSValue thisValue, PropertyName)
{
UNUSED_PARAM(state);
@@ -3317,28 +3281,6 @@
}
-bool setJSTestObjStrictTypeCheckingAttribute(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
-{
- JSValue value = JSValue::decode(encodedValue);
- UNUSED_PARAM(thisValue);
- JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
- if (UNLIKELY(!castedThis)) {
- return throwSetterTypeError(*state, "TestObject", "strictTypeCheckingAttribute");
- }
- auto& impl = castedThis->wrapped();
- TestObj* nativeValue = nullptr;
- if (!value.isUndefinedOrNull()) {
- nativeValue = JSTestObj::toWrapped(value);
- if (UNLIKELY(!nativeValue)) {
- throwAttributeTypeError(*state, "TestObject", "strictTypeCheckingAttribute", "TestObj");
- return false;
- }
- }
- impl.setStrictTypeCheckingAttribute(WTFMove(nativeValue));
- return true;
-}
-
-
bool setJSTestObjCustomAttr(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
{
JSValue value = JSValue::decode(encodedValue);
@@ -3738,23 +3680,6 @@
}
-bool setJSTestObjStrictFloat(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
-{
- JSValue value = JSValue::decode(encodedValue);
- UNUSED_PARAM(thisValue);
- JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
- if (UNLIKELY(!castedThis)) {
- return throwSetterTypeError(*state, "TestObject", "strictFloat");
- }
- auto& impl = castedThis->wrapped();
- auto nativeValue = convert<float>(*state, value, ShouldAllowNonFinite::Yes);
- if (UNLIKELY(state->hadException()))
- return false;
- impl.setStrictFloat(WTFMove(nativeValue));
- return true;
-}
-
-
bool setJSTestObjId(ExecState* state, EncodedJSValue thisValue, EncodedJSValue encodedValue)
{
JSValue value = JSValue::decode(encodedValue);
