Diff
Modified: trunk/Source/WebCore/ChangeLog (137092 => 137093)
--- trunk/Source/WebCore/ChangeLog 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/ChangeLog 2012-12-09 20:15:16 UTC (rev 137093)
@@ -1,3 +1,41 @@
+2012-12-09 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Use GObject casts instead of C++ cast for GObjects in DOM bindings
+ https://bugs.webkit.org/show_bug.cgi?id=104492
+
+ Reviewed by Martin Robinson.
+
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GenerateCFile):
+ * bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestNode.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp:
+ (WebKit::kit):
+ * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
+ (WebKit::kit):
+
2012-12-09 Pavel Feldman <[email protected]>
Web Inspector: do not treat object as equal to itself when logging to console
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2012-12-09 20:15:16 UTC (rev 137093)
@@ -1243,9 +1243,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<${className}*>(ret);
+ return WEBKIT_DOM_${clsCaps}(ret);
- return static_cast<${className}*>(g_object_new(WEBKIT_TYPE_DOM_${clsCaps}, "core-object", obj, NULL));
+ return wrap${interfaceName}(obj);
}
EOF
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -41,9 +41,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMFloat64Array*>(ret);
+ return WEBKIT_DOM_FLOAT64ARRAY(ret);
- return static_cast<WebKitDOMFloat64Array*>(g_object_new(WEBKIT_TYPE_DOM_FLOAT64ARRAY, "core-object", obj, NULL));
+ return wrapFloat64Array(obj);
}
WebCore::Float64Array* core(WebKitDOMFloat64Array* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -46,9 +46,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestActiveDOMObject*>(ret);
+ return WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(ret);
- return static_cast<WebKitDOMTestActiveDOMObject*>(g_object_new(WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, "core-object", obj, NULL));
+ return wrapTestActiveDOMObject(obj);
}
WebCore::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -55,9 +55,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestCallback*>(ret);
+ return WEBKIT_DOM_TEST_CALLBACK(ret);
- return static_cast<WebKitDOMTestCallback*>(g_object_new(WEBKIT_TYPE_DOM_TEST_CALLBACK, "core-object", obj, NULL));
+ return wrapTestCallback(obj);
}
WebCore::TestCallback* core(WebKitDOMTestCallback* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -45,9 +45,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestCustomNamedGetter*>(ret);
+ return WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(ret);
- return static_cast<WebKitDOMTestCustomNamedGetter*>(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, "core-object", obj, NULL));
+ return wrapTestCustomNamedGetter(obj);
}
WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -45,9 +45,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestEventConstructor*>(ret);
+ return WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(ret);
- return static_cast<WebKitDOMTestEventConstructor*>(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, "core-object", obj, NULL));
+ return wrapTestEventConstructor(obj);
}
WebCore::TestEventConstructor* core(WebKitDOMTestEventConstructor* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -49,9 +49,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestEventTarget*>(ret);
+ return WEBKIT_DOM_TEST_EVENT_TARGET(ret);
- return static_cast<WebKitDOMTestEventTarget*>(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, "core-object", obj, NULL));
+ return wrapTestEventTarget(obj);
}
WebCore::TestEventTarget* core(WebKitDOMTestEventTarget* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -45,9 +45,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestException*>(ret);
+ return WEBKIT_DOM_TEST_EXCEPTION(ret);
- return static_cast<WebKitDOMTestException*>(g_object_new(WEBKIT_TYPE_DOM_TEST_EXCEPTION, "core-object", obj, NULL));
+ return wrapTestException(obj);
}
WebCore::TestException* core(WebKitDOMTestException* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -52,9 +52,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestInterface*>(ret);
+ return WEBKIT_DOM_TEST_INTERFACE(ret);
- return static_cast<WebKitDOMTestInterface*>(g_object_new(WEBKIT_TYPE_DOM_TEST_INTERFACE, "core-object", obj, NULL));
+ return wrapTestInterface(obj);
}
WebCore::TestInterface* core(WebKitDOMTestInterface* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -45,9 +45,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestMediaQueryListListener*>(ret);
+ return WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(ret);
- return static_cast<WebKitDOMTestMediaQueryListListener*>(g_object_new(WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, "core-object", obj, NULL));
+ return wrapTestMediaQueryListListener(obj);
}
WebCore::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -45,9 +45,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestNamedConstructor*>(ret);
+ return WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(ret);
- return static_cast<WebKitDOMTestNamedConstructor*>(g_object_new(WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, "core-object", obj, NULL));
+ return wrapTestNamedConstructor(obj);
}
WebCore::TestNamedConstructor* core(WebKitDOMTestNamedConstructor* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -42,9 +42,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestNode*>(ret);
+ return WEBKIT_DOM_TEST_NODE(ret);
- return static_cast<WebKitDOMTestNode*>(g_object_new(WEBKIT_TYPE_DOM_TEST_NODE, "core-object", obj, NULL));
+ return wrapTestNode(obj);
}
WebCore::TestNode* core(WebKitDOMTestNode* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -58,9 +58,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestObj*>(ret);
+ return WEBKIT_DOM_TEST_OBJ(ret);
- return static_cast<WebKitDOMTestObj*>(g_object_new(WEBKIT_TYPE_DOM_TEST_OBJ, "core-object", obj, NULL));
+ return wrapTestObj(obj);
}
WebCore::TestObj* core(WebKitDOMTestObj* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -45,9 +45,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestOverloadedConstructors*>(ret);
+ return WEBKIT_DOM_TEST_OVERLOADED_CONSTRUCTORS(ret);
- return static_cast<WebKitDOMTestOverloadedConstructors*>(g_object_new(WEBKIT_TYPE_DOM_TEST_OVERLOADED_CONSTRUCTORS, "core-object", obj, NULL));
+ return wrapTestOverloadedConstructors(obj);
}
WebCore::TestOverloadedConstructors* core(WebKitDOMTestOverloadedConstructors* request)
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp (137092 => 137093)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp 2012-12-09 19:33:08 UTC (rev 137092)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp 2012-12-09 20:15:16 UTC (rev 137093)
@@ -52,9 +52,9 @@
return 0;
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestSerializedScriptValueInterface*>(ret);
+ return WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(ret);
- return static_cast<WebKitDOMTestSerializedScriptValueInterface*>(g_object_new(WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, "core-object", obj, NULL));
+ return wrapTestSerializedScriptValueInterface(obj);
}
WebCore::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptValueInterface* request)
