1 files changed, 25 insertions, 19 deletions

diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index bde5b55..616ee6b 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -59,6 +59,7 @@
 #include "FullscreenVideoController.h"
 #include "Node.h"
 #include "Page.h"
+#include "PlatformString.h"
 #include "ResourceHandle.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
@@ -133,32 +134,32 @@ extern "C" {
     typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
     struct _WebKitWebViewPrivate {
         WebCore::Page* corePage;
-        WebKitWebSettings* webSettings;
-        WebKitWebInspector* webInspector;
-        WebKitWebWindowFeatures* webWindowFeatures;
+        PlatformRefPtr<WebKitWebSettings> webSettings;
+        PlatformRefPtr<WebKitWebInspector> webInspector;
+        PlatformRefPtr<WebKitWebWindowFeatures> webWindowFeatures;
 
         WebKitWebFrame* mainFrame;
-        WebKitWebBackForwardList* backForwardList;
+        PlatformRefPtr<WebKitWebBackForwardList> backForwardList;
 
-        GtkMenu* currentMenu;
+        PlatformRefPtr<GtkMenu> currentMenu;
         gint lastPopupXPosition;
         gint lastPopupYPosition;
 
         HashSet<GtkWidget*> children;
         bool editable;
-        GtkIMContext* imContext;
+        PlatformRefPtr<GtkIMContext> imContext;
 
         gboolean transparent;
 
-        GtkAdjustment* horizontalAdjustment;
-        GtkAdjustment* verticalAdjustment;
+        PlatformRefPtr<GtkAdjustment> horizontalAdjustment;
+        PlatformRefPtr<GtkAdjustment> verticalAdjustment;
 
         gboolean zoomFullContent;
         WebKitLoadStatus loadStatus;
-        char* encoding;
-        char* customEncoding;
+        CString encoding;
+        CString customEncoding;
 
-        char* iconURI;
+        CString iconURI;
 
         gboolean disposing;
         gboolean usePrimaryForPaste;
@@ -169,18 +170,17 @@ extern "C" {
 
         // These are hosted here because the DataSource object is
         // created too late in the frame loading process.
-        WebKitWebResource* mainResource;
-        char* mainResourceIdentifier;
-        GHashTable* subResources;
-        char* tooltipText;
+        PlatformRefPtr<WebKitWebResource> mainResource;
+        CString mainResourceIdentifier;
+        PlatformRefPtr<GHashTable> subResources;
+        CString tooltipText;
 
         int currentClickCount;
-        WebCore::IntPoint* previousClickPoint;
+        WebCore::IntPoint previousClickPoint;
         guint previousClickButton;
         guint32 previousClickTime;
-
-        HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> >* draggingDataObjects;
-        HashMap<GdkDragContext*, WebKit::DroppingContext*>* droppingContexts;
+        HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
+        HashMap<GdkDragContext*, WebKit::DroppingContext*> droppingContexts;
     };
 
     #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
@@ -206,6 +206,9 @@ extern "C" {
         gboolean disposed;
     };
 
+    WTF::String
+    webkitUserAgent();
+
     void
     webkit_web_frame_core_frame_gone(WebKitWebFrame*);
 
@@ -283,6 +286,9 @@ extern "C" {
     void
     webkit_web_view_set_tooltip_text(WebKitWebView*, const char*);
 
+    GtkMenu*
+    webkit_web_view_get_context_menu(WebKitWebView*);
+
     WEBKIT_API void
     webkit_web_view_execute_core_command_by_name(WebKitWebView* webView, const gchar* name, const gchar* value);