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 <simon.hausmann@digia.com>

1 files changed, 2 insertions, 16 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp
index 0901d8079..deef50c55 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp
@@ -43,8 +43,6 @@ using namespace WebCore;
  * the navigation was triggered by a mouse event.
  */
 
-G_DEFINE_TYPE(WebKitNavigationPolicyDecision, webkit_navigation_policy_decision, WEBKIT_TYPE_POLICY_DECISION)
-
 struct _WebKitNavigationPolicyDecisionPrivate {
     WebKitNavigationType navigationType;
     unsigned modifiers;
@@ -53,6 +51,8 @@ struct _WebKitNavigationPolicyDecisionPrivate {
     CString frameName;
 };
 
+WEBKIT_DEFINE_TYPE(WebKitNavigationPolicyDecision, webkit_navigation_policy_decision, WEBKIT_TYPE_POLICY_DECISION)
+
 enum {
     PROP_0,
     PROP_NAVIGATION_TYPE,
@@ -62,18 +62,6 @@ enum {
     PROP_FRAME_NAME,
 };
 
-static void webkit_navigation_policy_decision_init(WebKitNavigationPolicyDecision* decision)
-{
-    decision->priv = G_TYPE_INSTANCE_GET_PRIVATE(decision, WEBKIT_TYPE_NAVIGATION_POLICY_DECISION, WebKitNavigationPolicyDecisionPrivate);
-    new (decision->priv) WebKitNavigationPolicyDecisionPrivate();
-}
-
-static void webkitNavigationPolicyDecisionFinalize(GObject* object)
-{
-    WEBKIT_NAVIGATION_POLICY_DECISION(object)->priv->~WebKitNavigationPolicyDecisionPrivate();
-    G_OBJECT_CLASS(webkit_navigation_policy_decision_parent_class)->finalize(object);
-}
-
 static void webkitNavigationPolicyDecisionGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
 {
     WebKitNavigationPolicyDecision* decision = WEBKIT_NAVIGATION_POLICY_DECISION(object);
@@ -102,9 +90,7 @@ static void webkitNavigationPolicyDecisionGetProperty(GObject* object, guint pro
 static void webkit_navigation_policy_decision_class_init(WebKitNavigationPolicyDecisionClass* decisionClass)
 {
     GObjectClass* objectClass = G_OBJECT_CLASS(decisionClass);
-    objectClass->finalize = webkitNavigationPolicyDecisionFinalize;
     objectClass->get_property = webkitNavigationPolicyDecisionGetProperty;
-    g_type_class_add_private(decisionClass, sizeof(WebKitNavigationPolicyDecisionPrivate));
 
     /**
      * WebKitNavigationPolicyDecision:navigation-type: