2009-03-01 Jan Michael Alonzo <jmalonzo@webkit.org>

[WebKit-https.git] / WebKit / gtk / webkit / webkitwebhistoryitem.cpp

diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
index 8cdaa906431daac76429c3b8166982db30938979..2b0394c10f1fa542150bd6d8600454efab9a6e82 100644 (file)
--- a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
+++ b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2008 Jan Michael C. Alonzo
+ * Copyright (C) 2008, 2009 Jan Michael C. Alonzo

  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public


@@ -53,7 +53,7 @@ using namespace WebKit;
 extern "C" {
 
 struct _WebKitWebHistoryItemPrivate {
 extern "C" {
 
 struct _WebKitWebHistoryItemPrivate {

-    WTF::RefPtr<WebCore::HistoryItem> historyItem;
+    WebCore::HistoryItem* historyItem;

 
     WebCore::CString title;
     WebCore::CString alternateTitle;
 
     WebCore::CString title;
     WebCore::CString alternateTitle;


@@ -270,21 +270,9 @@ static void webkit_web_history_item_get_property(GObject* object, guint prop_id,
 }
 
 /* Helper function to create a new WebHistoryItem instance when needed */
 }
 
 /* Helper function to create a new WebHistoryItem instance when needed */

-WebKitWebHistoryItem* webkit_web_history_item_new_with_core_item(WebCore::HistoryItem* item)
+WebKitWebHistoryItem* webkit_web_history_item_new_with_core_item(PassRefPtr<WebCore::HistoryItem> historyItem)

 {
 {

-    WebKitWebHistoryItem* webHistoryItem = kit(item);
-
-    if (webHistoryItem)
-        g_object_ref(webHistoryItem);
-    else {
-        webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
-        WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
-
-        priv->historyItem = item;
-        webkit_history_item_add(webHistoryItem, priv->historyItem.get());
-    }
-
-    return webHistoryItem;
+    return kit(historyItem);

 }
 
 
 }
 
 


@@ -300,8 +288,9 @@ WebKitWebHistoryItem* webkit_web_history_item_new()
     WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
     WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
 
     WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
     WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
 

-    priv->historyItem = WebCore::HistoryItem::create();
-    webkit_history_item_add(webHistoryItem, priv->historyItem.get());
+    RefPtr<WebCore::HistoryItem> item = WebCore::HistoryItem::create();
+    priv->historyItem = item.release().releaseRef();
+    webkit_history_item_add(webHistoryItem, priv->historyItem);

 
     return webHistoryItem;
 }
 
     return webHistoryItem;
 }


@@ -323,8 +312,9 @@ WebKitWebHistoryItem* webkit_web_history_item_new_with_data(const gchar* uri, co
     WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
     WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
 
     WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
     WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
 

-    priv->historyItem = WebCore::HistoryItem::create(historyUri, historyTitle, 0);
-    webkit_history_item_add(webHistoryItem, priv->historyItem.get());
+    RefPtr<WebCore::HistoryItem> item = WebCore::HistoryItem::create(historyUri, historyTitle, 0);
+    priv->historyItem = item.release().releaseRef();
+    webkit_history_item_add(webHistoryItem, priv->historyItem);

 
     return webHistoryItem;
 }
 
     return webHistoryItem;
 }


@@ -452,6 +442,51 @@ gdouble webkit_web_history_item_get_last_visited_time(WebKitWebHistoryItem* webH
     return item->lastVisitedTime();
 }
 
     return item->lastVisitedTime();
 }
 

+/* private methods */
+
+G_CONST_RETURN gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem* webHistoryItem)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
+
+    WebCore::HistoryItem* item = core(webHistoryItem);
+
+    g_return_val_if_fail(item != NULL, NULL);
+
+    WebCore::CString t = item->target().utf8();
+    return g_strdup(t.data());
+}
+
+gboolean webkit_web_history_item_is_target_item(WebKitWebHistoryItem* webHistoryItem)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
+
+    WebCore::HistoryItem* item = core(webHistoryItem);
+
+    g_return_val_if_fail(item != NULL, NULL);
+
+    return item->isTargetItem();
+}
+
+GList* webkit_web_history_item_get_children(WebKitWebHistoryItem* webHistoryItem)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
+
+    WebCore::HistoryItem* item = core(webHistoryItem);
+
+    g_return_val_if_fail(item != NULL, NULL);
+
+    const WebCore::HistoryItemVector& children = item->children();
+    if (!children.size())
+        return NULL;
+
+    unsigned size = children.size();
+    GList* kids = NULL;
+    for (unsigned i = 0; i < size; ++i)
+        kids = g_list_prepend(kids, kit(children[i].get()));
+
+    return g_list_reverse(kids);
+}
+

 } /* end extern "C" */
 
 WebCore::HistoryItem* WebKit::core(WebKitWebHistoryItem* webHistoryItem)
 } /* end extern "C" */
 
 WebCore::HistoryItem* WebKit::core(WebKitWebHistoryItem* webHistoryItem)


@@ -459,19 +494,29 @@ WebCore::HistoryItem* WebKit::core(WebKitWebHistoryItem* webHistoryItem)
     g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
 
     WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
     g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
 
     WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;

-    WTF::RefPtr<WebCore::HistoryItem> historyItem = priv->historyItem;

 
 

-    return historyItem ? historyItem.get() : 0;
+    return priv->historyItem ? priv->historyItem : 0;

 }
 
 }
 

-WebKitWebHistoryItem* WebKit::kit(WebCore::HistoryItem* historyItem)
+WebKitWebHistoryItem* WebKit::kit(PassRefPtr<WebCore::HistoryItem> historyItem)

 {
     g_return_val_if_fail(historyItem != NULL, NULL);
 
 {
     g_return_val_if_fail(historyItem != NULL, NULL);
 

+    RefPtr<WebCore::HistoryItem> item = historyItem;
+

     WebKitWebHistoryItem* webHistoryItem;
     GHashTable* table = webkit_history_items();
 
     WebKitWebHistoryItem* webHistoryItem;
     GHashTable* table = webkit_history_items();
 

-    webHistoryItem = (WebKitWebHistoryItem*) g_hash_table_lookup(table, historyItem);
+    webHistoryItem = (WebKitWebHistoryItem*) g_hash_table_lookup(table, item.get());
+
+    if (!webHistoryItem) {
+        webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
+        WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
+
+        priv->historyItem = item.release().releaseRef();
+        webkit_history_item_add(webHistoryItem, priv->historyItem);
+    }
+

     return webHistoryItem;
 }
 
     return webHistoryItem;
 }