From 061d58bc0fa016cfeed744fd3e4663460635d69b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 23 Nov 2012 15:08:59 +0100 Subject: Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602) New snapshot that fixes various bugs Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a Reviewed-by: Simon Hausmann --- .../UIProcess/API/gtk/WebKitWebInspector.cpp | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp index b788f1771..378a1f4c0 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp @@ -47,14 +47,19 @@ enum { }; struct _WebKitWebInspectorPrivate { + ~_WebKitWebInspectorPrivate() + { + WKInspectorSetInspectorClientGtk(toAPI(webInspector.get()), 0); + } + RefPtr webInspector; CString inspectedURI; unsigned attachedHeight; }; -static guint signals[LAST_SIGNAL] = { 0, }; +WEBKIT_DEFINE_TYPE(WebKitWebInspector, webkit_web_inspector, G_TYPE_OBJECT) -G_DEFINE_TYPE(WebKitWebInspector, webkit_web_inspector, G_TYPE_OBJECT) +static guint signals[LAST_SIGNAL] = { 0, }; static void webkitWebInspectorGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec) { @@ -72,29 +77,11 @@ static void webkitWebInspectorGetProperty(GObject* object, guint propId, GValue* } } -static void webkitWebInspectorFinalize(GObject* object) -{ - WebKitWebInspectorPrivate* priv = WEBKIT_WEB_INSPECTOR(object)->priv; - WKInspectorSetInspectorClientGtk(toAPI(priv->webInspector.get()), 0); - priv->~WebKitWebInspectorPrivate(); - G_OBJECT_CLASS(webkit_web_inspector_parent_class)->finalize(object); -} - -static void webkit_web_inspector_init(WebKitWebInspector* inspector) -{ - WebKitWebInspectorPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(inspector, WEBKIT_TYPE_WEB_INSPECTOR, WebKitWebInspectorPrivate); - inspector->priv = priv; - new (priv) WebKitWebInspectorPrivate(); -} - static void webkit_web_inspector_class_init(WebKitWebInspectorClass* findClass) { GObjectClass* gObjectClass = G_OBJECT_CLASS(findClass); - gObjectClass->finalize = webkitWebInspectorFinalize; gObjectClass->get_property = webkitWebInspectorGetProperty; - g_type_class_add_private(findClass, sizeof(WebKitWebInspectorPrivate)); - /** * WebKitWebInspector:inspected-uri: * -- cgit v1.2.1