1 files changed, 28 insertions, 4 deletions

diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index ace996d..0b83a11 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Holger Hans Peter Freyther
+ * Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
  * Copyright (C) 2008 Jan Michael C. Alonzo
  * Copyright (C) 2008 Collabora Ltd.
  *
@@ -28,6 +28,7 @@
  */
 
 #include <webkit/webkitdefines.h>
+#include <webkit/webkitdownload.h>
 #include <webkit/webkitwebview.h>
 #include <webkit/webkitwebframe.h>
 #include <webkit/webkitwebpolicydecision.h>
@@ -43,10 +44,14 @@
 #include "Frame.h"
 #include "InspectorClientGtk.h"
 #include "FrameLoaderClient.h"
+#include "ResourceHandle.h"
+#include "ResourceResponse.h"
 #include "WindowFeatures.h"
 
 #include <glib.h>
 
+class DownloadClient;
+
 namespace WebKit {
     WebKitWebView* getViewFromFrame(WebKitWebFrame*);
 
@@ -57,7 +62,7 @@ namespace WebKit {
     WebKitWebView* kit(WebCore::Page*);
 
     WebCore::HistoryItem* core(WebKitWebHistoryItem*);
-    WebKitWebHistoryItem* kit(WebCore::HistoryItem*);
+    WebKitWebHistoryItem* kit(PassRefPtr<WebCore::HistoryItem>);
 
     WebCore::BackForwardList* core(WebKitWebBackForwardList*);
 
@@ -101,6 +106,10 @@ extern "C" {
         GtkAdjustment* verticalAdjustment;
 
         gboolean zoomFullContent;
+        char* encoding;
+        char* customEncoding;
+
+        gboolean disposing;
     };
 
     #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
@@ -120,11 +129,22 @@ extern "C" {
     void
     webkit_web_frame_core_frame_gone(WebKitWebFrame*);
 
+    // WebKitWebHistoryItem private
     WebKitWebHistoryItem*
-    webkit_web_history_item_new_with_core_item(WebCore::HistoryItem*);
+    webkit_web_history_item_new_with_core_item(PassRefPtr<WebCore::HistoryItem> historyItem);
+
+    WEBKIT_API G_CONST_RETURN gchar*
+    webkit_web_history_item_get_target(WebKitWebHistoryItem*);
+
+    WEBKIT_API gboolean
+    webkit_web_history_item_is_target_item(WebKitWebHistoryItem*);
+
+    WEBKIT_API GList*
+    webkit_web_history_item_get_children(WebKitWebHistoryItem*);
+    // end WebKitWebHistoryItem private
 
     void
-    webkit_web_inspector_set_inspector_client(WebKitWebInspector*, WebKit::InspectorClient*);
+    webkit_web_inspector_set_inspector_client(WebKitWebInspector*, WebCore::Page*);
 
     void
     webkit_web_inspector_set_web_view(WebKitWebInspector *web_inspector, WebKitWebView *web_view);
@@ -144,6 +164,10 @@ extern "C" {
     void
     webkit_web_policy_decision_cancel (WebKitWebPolicyDecision* decision);
 
+    // FIXME: move this functionality into a 'WebKitWebDataSource' once implemented
+    WEBKIT_API gchar*
+    webkit_web_frame_get_response_mime_type(WebKitWebFrame* frame);
+
     // FIXME: Move these to webkitwebframe.h once their API has been discussed.
 
     WEBKIT_API GSList*