Changeset 29985 in webkit
- Timestamp:
- Feb 4, 2008 5:41:04 PM (16 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r29961 r29985 1 2008-02-04 Christian Dywan <christian@imendio.com> 2 3 Reviewed by Alp Toker. 4 5 http://bugs.webkit.org/show_bug.cgi?id=17065 6 [GTK] Use a consistent coding style 7 8 * WebCoreSupport/EditorClientGtk.cpp: 9 (WebKit::imContextCommitted): 10 (WebKit::EditorClient::EditorClient): 11 (WebKit::EditorClient::~EditorClient): 12 (WebKit::EditorClient::textFieldDidEndEditing): 13 * webkit/webkitdefines.h: 14 * webkit/webkitnetworkrequest.cpp: 15 (_WebKitNetworkRequestPrivate::webkit_network_request_finalize): 16 (_WebKitNetworkRequestPrivate::webkit_network_request_class_init): 17 (_WebKitNetworkRequestPrivate::webkit_network_request_init): 18 (_WebKitNetworkRequestPrivate::webkit_network_request_new): 19 (_WebKitNetworkRequestPrivate::webkit_network_request_set_uri): 20 (_WebKitNetworkRequestPrivate::webkit_network_request_get_uri): 21 * webkit/webkitnetworkrequest.h: 22 * webkit/webkitprivate.cpp: 23 (WebKit::getViewFromFrame): 24 (WebKit::core): 25 * webkit/webkitprivate.h: 26 * webkit/webkitwebbackforwardlist.cpp: 27 (_WebKitWebBackForwardListPrivate::webkit_web_back_forward_list_new_with_web_view): 28 * webkit/webkitwebbackforwardlist.h: 29 * webkit/webkitwebframe.cpp: 30 * webkit/webkitwebframe.h: 31 * webkit/webkitwebhistoryitem.cpp: 32 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_dispose): 33 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_finalize): 34 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new_with_core_item): 35 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new): 36 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new_with_data): 37 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_title): 38 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_alternate_title): 39 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_set_alternate_title): 40 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_uri): 41 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_original_uri): 42 (WebKit::core): 43 * webkit/webkitwebhistoryitem.h: 44 * webkit/webkitwebsettings.h: 45 * webkit/webkitwebview.cpp: 46 * webkit/webkitwebview.h: 47 1 48 2008-02-04 Alp Toker <alp@atoker.com> 2 49 -
trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
r29663 r29985 37 37 static void imContextCommitted(GtkIMContext* context, const char* str, EditorClient* client) 38 38 { 39 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(client->m_webView); 40 Frame* frame = webViewData->corePage->focusController()->focusedOrMainFrame(); 39 Frame* frame = core(client->m_webView)->focusController()->focusedOrMainFrame(); 41 40 frame->editor()->insertTextWithoutSendingTextEvent(str, false); 42 41 } … … 354 353 : m_webView(webView) 355 354 { 356 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);357 g_signal_connect( webViewData->imContext, "commit", G_CALLBACK(imContextCommitted), this);355 WebKitWebViewPrivate* priv = m_webView->priv; 356 g_signal_connect(priv->imContext, "commit", G_CALLBACK(imContextCommitted), this); 358 357 } 359 358 360 359 EditorClient::~EditorClient() 361 360 { 362 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);363 g_signal_handlers_disconnect_by_func( webViewData->imContext, (gpointer)imContextCommitted, this);361 WebKitWebViewPrivate* priv = m_webView->priv; 362 g_signal_handlers_disconnect_by_func(priv->imContext, (gpointer)imContextCommitted, this); 364 363 } 365 364 … … 371 370 void EditorClient::textFieldDidEndEditing(Element*) 372 371 { 373 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);374 375 gtk_im_context_focus_out( webViewData->imContext);372 WebKitWebViewPrivate* priv = m_webView->priv; 373 374 gtk_im_context_focus_out(priv->imContext); 376 375 #ifdef MAEMO_CHANGES 377 hildon_gtk_im_context_hide( webViewData->imContext);376 hildon_gtk_im_context_hide(priv->imContext); 378 377 #endif 379 378 } -
trunk/WebKit/gtk/webkit/webkitdefines.h
r29898 r29985 36 36 37 37 #ifndef WEBKIT_API 38 #define WEBKIT_API38 #define WEBKIT_API 39 39 #endif 40 40 41 41 G_BEGIN_DECLS 42 42 43 typedef struct _WebKitNetworkRequest WebKitNetworkRequest; 44 typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass; 45 46 typedef struct _WebKitWebBackForwardList WebKitWebBackForwardList; 47 typedef struct _WebKitWebBackForwardListClass WebKitWebBackForwardListClass; 48 49 typedef struct _WebKitWebHistoryItem WebKitWebHistoryItem; 50 typedef struct _WebKitWebHistoryItemClass WebKitWebHistoryItemClass; 51 43 52 typedef struct _WebKitWebFrame WebKitWebFrame; 44 53 typedef struct _WebKitWebFrameClass WebKitWebFrameClass; 54 55 typedef struct _WebKitWebSettings WebKitWebSettings; 56 typedef struct _WebKitWebSettingsClass WebKitWebSettingsClass; 45 57 46 58 typedef struct _WebKitWebView WebKitWebView; 47 59 typedef struct _WebKitWebViewClass WebKitWebViewClass; 48 60 49 typedef struct _WebKitNetworkRequest WebKitNetworkRequest;50 typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;51 52 61 G_END_DECLS 53 62 -
trunk/WebKit/gtk/webkit/webkitnetworkrequest.cpp
r29898 r29985 21 21 22 22 #include "webkitnetworkrequest.h" 23 #include "webkitprivate.h"24 25 using namespace WebKit;26 using namespace WebCore;27 23 28 24 extern "C" { … … 30 26 G_DEFINE_TYPE(WebKitNetworkRequest, webkit_network_request, G_TYPE_OBJECT); 31 27 28 struct _WebKitNetworkRequestPrivate { 29 gchar* uri; 30 }; 31 32 #define WEBKIT_NETWORK_REQUEST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate)) 33 32 34 static void webkit_network_request_finalize(GObject* object) 33 35 { 34 WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(object); 36 WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(object); 37 WebKitNetworkRequestPrivate* priv = request->priv; 35 38 36 g_free( requestPrivate->uri);39 g_free(priv->uri); 37 40 38 41 G_OBJECT_CLASS(webkit_network_request_parent_class)->finalize(object); … … 41 44 static void webkit_network_request_class_init(WebKitNetworkRequestClass* requestClass) 42 45 { 46 G_OBJECT_CLASS(requestClass)->finalize = webkit_network_request_finalize; 47 43 48 g_type_class_add_private(requestClass, sizeof(WebKitNetworkRequestPrivate)); 44 45 G_OBJECT_CLASS(requestClass)->finalize = webkit_network_request_finalize;46 49 } 47 50 48 51 static void webkit_network_request_init(WebKitNetworkRequest* request) 49 52 { 53 WebKitNetworkRequestPrivate* priv = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request); 54 request->priv = priv; 50 55 } 51 56 … … 55 60 56 61 WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, NULL)); 57 WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);62 WebKitNetworkRequestPrivate* priv = request->priv; 58 63 59 requestPrivate->uri = g_strdup(uri);64 priv->uri = g_strdup(uri); 60 65 61 66 return request; … … 67 72 g_return_if_fail(uri); 68 73 69 WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);74 WebKitNetworkRequestPrivate* priv = request->priv; 70 75 71 g_free( requestPrivate->uri);72 requestPrivate->uri = g_strdup(uri);76 g_free(priv->uri); 77 priv->uri = g_strdup(uri); 73 78 } 74 79 … … 77 82 g_return_val_if_fail(WEBKIT_IS_NETWORK_REQUEST(request), NULL); 78 83 79 WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request); 80 81 return requestPrivate->uri; 84 WebKitNetworkRequestPrivate* priv = request->priv; 85 return priv->uri; 82 86 } 83 87 -
trunk/WebKit/gtk/webkit/webkitnetworkrequest.h
r29898 r29985 34 34 #define WEBKIT_NETWORK_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass)) 35 35 36 typedef struct _WebKitNetworkRequestPrivate WebKitNetworkRequestPrivate; 36 37 37 38 struct _WebKitNetworkRequest { 38 GObject parent; 39 GObject parent_instance; 40 41 WebKitNetworkRequestPrivate* priv; 39 42 }; 40 43 41 44 struct _WebKitNetworkRequestClass { 42 GObjectClass parent ;45 GObjectClass parent_class; 43 46 }; 44 47 -
trunk/WebKit/gtk/webkit/webkitprivate.cpp
r29898 r29985 40 40 WebKitWebView* getViewFromFrame(WebKitWebFrame* frame) 41 41 { 42 return webkit_web_frame_get_web_view(frame); 42 WebKitWebFramePrivate* priv = frame->priv; 43 return priv->webView; 43 44 } 44 45 … … 48 49 return 0; 49 50 50 WebKitWebFramePrivate* frame_data = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);51 return frame_data ? frame_data->frame : 0;51 WebKitWebFramePrivate* priv = frame->priv; 52 return priv ? priv->coreFrame : 0; 52 53 } 53 54 … … 67 68 return 0; 68 69 69 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);70 return webViewData ? webViewData->corePage : 0;70 WebKitWebViewPrivate* priv = webView->priv; 71 return priv ? priv->corePage : 0; 71 72 } 72 73 -
trunk/WebKit/gtk/webkit/webkitprivate.h
r29961 r29985 23 23 24 24 /* 25 * Internal class. This class knows the shared secret of WebKitWebFrame, 26 * WebKitNetworkRequest and WebKitWebView. 25 * This file knows the shared secret of WebKitWebView and WebKitWebFrame. 27 26 * They are using WebCore which musn't be exposed to the outer world. 28 27 */ … … 91 90 typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate; 92 91 struct _WebKitWebFramePrivate { 93 WebCore::Frame* frame;92 WebCore::Frame* coreFrame; 94 93 WebCore::FrameLoaderClient* client; 95 94 WebKitWebView* webView; … … 106 105 }; 107 106 108 /* WebKitWebFrame private function */109 WebKitWebFrame*webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*);107 WebKitWebFrame* 108 webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*); 110 109 111 /* WebKitWebHistoryItem private function */112 WebKitWebHistoryItem*webkit_web_history_item_new_with_core_item(WebCore::HistoryItem*);110 WebKitWebHistoryItem* 111 webkit_web_history_item_new_with_core_item(WebCore::HistoryItem*); 113 112 114 115 // TODO: Move these to webkitwebframe.h once these functions are fully 116 // implemented and their API has been discussed. 113 // FIXME: Move these to webkitwebframe.h once their API has been discussed. 117 114 118 115 WEBKIT_API GSList* -
trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
r29961 r29985 64 64 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); 65 65 66 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);67 66 WebKitWebBackForwardList* webBackForwardList; 68 67 69 68 webBackForwardList = WEBKIT_WEB_BACK_FORWARD_LIST(g_object_new(WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, NULL)); 70 webBackForwardList->priv->backForwardList = webViewData->corePage->backForwardList(); 71 webBackForwardList->priv->backForwardList->setEnabled(TRUE); 69 WebKitWebBackForwardListPrivate* priv = webBackForwardList->priv; 70 71 priv->backForwardList = core(webView)->backForwardList(); 72 priv->backForwardList->setEnabled(TRUE); 72 73 73 74 return webBackForwardList; -
trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.h
r29898 r29985 36 36 #define WEBKIT_WEB_BACK_FORWARD_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, WebKitWebBackForwardListClass)) 37 37 38 39 38 typedef struct _WebKitWebBackForwardListPrivate WebKitWebBackForwardListPrivate; 40 typedef struct _WebKitWebBackForwardList WebKitWebBackForwardList;41 typedef struct _WebKitWebBackForwardListClass WebKitWebBackForwardListClass;42 43 39 44 40 struct _WebKitWebBackForwardList { 45 GObject parent ;41 GObject parent_instance; 46 42 47 /*< private >*/ 48 WebKitWebBackForwardListPrivate *priv; 43 WebKitWebBackForwardListPrivate* priv; 49 44 }; 50 45 51 46 struct _WebKitWebBackForwardListClass { 52 GObjectClass parent ;47 GObjectClass parent_class; 53 48 }; 54 49 -
trunk/WebKit/gtk/webkit/webkitwebframe.cpp
r29898 r29985 3 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 4 4 * Copyright (C) 2007 Apple Inc. 5 * Copyright (C) 2008 Christian Dywan <christian@imendio.com> 5 6 * 6 7 * This library is free software; you can redistribute it and/or … … 89 90 static void webkit_web_frame_finalize(GObject* object) 90 91 { 91 WebKitWebFramePrivate* privateData = WEBKIT_WEB_FRAME_GET_PRIVATE(WEBKIT_WEB_FRAME(object)); 92 privateData->frame->loader()->cancelAndClear(); 93 g_free(privateData->name); 94 g_free(privateData->title); 95 g_free(privateData->uri); 96 delete privateData->frame; 92 WebKitWebFrame* frame = WEBKIT_WEB_FRAME(object); 93 WebKitWebFramePrivate* priv = frame->priv; 94 95 priv->coreFrame->loader()->cancelAndClear(); 96 g_free(priv->name); 97 g_free(priv->title); 98 g_free(priv->uri); 99 delete priv->coreFrame; 97 100 98 101 G_OBJECT_CLASS(webkit_web_frame_parent_class)->finalize(object); … … 102 105 { 103 106 webkit_init(); 104 105 g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));106 107 107 108 /* … … 186 187 NULL, 187 188 WEBKIT_PARAM_READABLE)); 189 190 g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate)); 188 191 } 189 192 190 193 static void webkit_web_frame_init(WebKitWebFrame* frame) 191 194 { 195 WebKitWebFramePrivate* priv = WEBKIT_WEB_FRAME_GET_PRIVATE(frame); 196 192 197 // TODO: Move constructor code here. 198 frame->priv = priv; 193 199 } 194 200 … … 206 212 207 213 WebKitWebFrame* frame = WEBKIT_WEB_FRAME(g_object_new(WEBKIT_TYPE_WEB_FRAME, NULL)); 208 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);209 WebKitWebViewPrivate* webViewData= WEBKIT_WEB_VIEW_GET_PRIVATE(webView);210 211 frameData->client = new WebKit::FrameLoaderClient(frame);212 frameData->frame = new Frame(webViewData->corePage, 0, frameData->client);213 214 FrameView* frameView = new FrameView( frameData->frame);214 WebKitWebFramePrivate* priv = frame->priv; 215 WebKitWebViewPrivate* viewPriv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 216 217 priv->client = new WebKit::FrameLoaderClient(frame); 218 priv->coreFrame = new Frame(viewPriv->corePage, 0, priv->client); 219 220 FrameView* frameView = new FrameView(priv->coreFrame); 215 221 frameView->setContainingWindow(GTK_CONTAINER(webView)); 216 222 frameView->setGtkAdjustments(GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)), 217 223 GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0))); 218 frameData->frame->setView(frameView); 219 frameData->frame->init(); 220 frameData->webView = webView; 221 frameData->name = 0; 222 frameData->title = 0; 223 frameData->uri = 0; 224 priv->coreFrame->setView(frameView); 225 priv->coreFrame->init(); 226 priv->webView = webView; 224 227 225 228 return frame; … … 229 232 { 230 233 WebKitWebFrame* frame = WEBKIT_WEB_FRAME(g_object_new(WEBKIT_TYPE_WEB_FRAME, NULL)); 231 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);232 WebKitWebViewPrivate* webViewData= WEBKIT_WEB_VIEW_GET_PRIVATE(webView);233 234 frameData->client = new WebKit::FrameLoaderClient(frame);235 frameData->frame = new Frame(webViewData->corePage, element, frameData->client);236 237 FrameView* frameView = new FrameView( frameData->frame);234 WebKitWebFramePrivate* priv = frame->priv; 235 WebKitWebViewPrivate* viewPriv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 236 237 priv->client = new WebKit::FrameLoaderClient(frame); 238 priv->coreFrame = new Frame(viewPriv->corePage, element, priv->client); 239 240 FrameView* frameView = new FrameView(priv->coreFrame); 238 241 frameView->setContainingWindow(GTK_CONTAINER(webView)); 239 frameData->frame->setView(frameView);242 priv->coreFrame->setView(frameView); 240 243 frameView->deref(); 241 frameData->frame->init();242 frameData->webView = webView;244 priv->coreFrame->init(); 245 priv->webView = webView; 243 246 244 247 return frame; … … 257 260 g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL); 258 261 259 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);260 return frameData->title;262 WebKitWebFramePrivate* priv = frame->priv; 263 return priv->title; 261 264 } 262 265 … … 273 276 g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL); 274 277 275 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);276 return frameData->uri;278 WebKitWebFramePrivate* priv = frame->priv; 279 return priv->uri; 277 280 } 278 281 … … 292 295 g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL); 293 296 294 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);295 return frameData->webView;297 WebKitWebFramePrivate* priv = frame->priv; 298 return priv->webView; 296 299 } 297 300 … … 308 311 g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL); 309 312 310 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);311 312 if ( frameData->name)313 return frameData->name;313 WebKitWebFramePrivate* priv = frame->priv; 314 315 if (priv->name) 316 return priv->name; 314 317 315 318 Frame* coreFrame = core(frame); … … 317 320 318 321 String string = coreFrame->tree()->name(); 319 frameData->name = g_strdup(string.utf8().data()); 320 321 return frameData->name; 322 priv->name = g_strdup(string.utf8().data()); 323 return priv->name; 322 324 } 323 325 … … 359 361 g_return_if_fail(coreFrame); 360 362 361 // TODO: Use the ResourceRequest carried by WebKitNetworkRequest when it gets implemented.363 // TODO: Use the ResourceRequest carried by WebKitNetworkRequest when it is implemented. 362 364 DeprecatedString string = DeprecatedString::fromUtf8(webkit_network_request_get_uri(request)); 363 365 coreFrame->loader()->load(ResourceRequest(KURL(string))); -
trunk/WebKit/gtk/webkit/webkitwebframe.h
r29898 r29985 26 26 27 27 #include <webkit/webkitdefines.h> 28 #include <webkit/webkitnetworkrequest.h> 28 29 29 30 G_BEGIN_DECLS … … 36 37 #define WEBKIT_WEB_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFrameClass)) 37 38 39 typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate; 38 40 39 41 struct _WebKitWebFrame { 40 GObject parent; 42 GObject parent_instance; 43 44 WebKitWebFramePrivate* priv; 41 45 }; 42 46 43 47 struct _WebKitWebFrameClass { 44 GObjectClass parent ;48 GObjectClass parent_class; 45 49 46 50 void (*_webkit_reserved1) (void); -
trunk/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
r29961 r29985 78 78 static void webkit_web_history_item_dispose(GObject* object) 79 79 { 80 WebKitWebHistoryItem* item = WEBKIT_WEB_HISTORY_ITEM(object);81 82 webkit_history_item_remove(item->priv->historyItem); 83 84 delete item->priv->historyItem;80 WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(object); 81 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 82 83 webkit_history_item_remove(priv->historyItem); 84 delete priv->historyItem; 85 85 86 86 /* destroy table if empty */ … … 92 92 } 93 93 94 95 94 static void webkit_web_history_item_finalize(GObject* object) 96 95 { 97 WebKitWebHistoryItem* historyItem = WEBKIT_WEB_HISTORY_ITEM(object); 98 99 g_free(historyItem->priv->title); 100 g_free(historyItem->priv->alternateTitle); 101 g_free(historyItem->priv->uri); 102 g_free(historyItem->priv->originalUri); 96 WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(object); 97 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 98 99 g_free(priv->title); 100 g_free(priv->alternateTitle); 101 g_free(priv->uri); 102 g_free(priv->originalUri); 103 103 104 104 G_OBJECT_CLASS(webkit_web_history_item_parent_class)->finalize(object); … … 124 124 { 125 125 WebKitWebHistoryItem* webHistoryItem = kit(item); 126 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 126 127 127 128 if (!webHistoryItem) { 128 129 webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL)); 129 webHistoryItem->priv->historyItem = item;130 webkit_history_item_add(webHistoryItem, webHistoryItem->priv->historyItem);130 priv->historyItem = item; 131 webkit_history_item_add(webHistoryItem, priv->historyItem); 131 132 } 132 133 … … 145 146 { 146 147 WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL)); 147 148 webHistoryItem->priv->historyItem = new WebCore::HistoryItem(); 149 150 webkit_history_item_add(webHistoryItem, webHistoryItem->priv->historyItem);148 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 149 150 priv->historyItem = new WebCore::HistoryItem(); 151 webkit_history_item_add(webHistoryItem, priv->historyItem); 151 152 152 153 return webHistoryItem; 153 154 } 154 155 155 156 156 /** … … 169 169 170 170 WebKitWebHistoryItem* webHistoryItem = webkit_web_history_item_new(); 171 172 webHistoryItem->priv->historyItem = new WebCore::HistoryItem(historyUri, historyTitle); 173 174 webkit_history_item_add(webHistoryItem, webHistoryItem->priv->historyItem);171 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 172 173 priv->historyItem = new WebCore::HistoryItem(historyUri, historyTitle); 174 webkit_history_item_add(webHistoryItem, priv->historyItem); 175 175 176 176 return webHistoryItem; … … 187 187 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL); 188 188 189 WebCore::HistoryItem* item = core(webHistoryItem); 190 191 g_return_val_if_fail(item != NULL, NULL); 192 193 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 194 WebCore::String title = item->title(); 195 g_free(priv->title); 196 priv->title = g_strdup(title.utf8().data()); 197 198 return priv->title; 199 } 200 201 /** 202 * webkit_web_history_item_get_alternate_title: 203 * @webHistoryItem: a #WebKitWebHistoryItem 204 * 205 * Returns the alternate title of @webHistoryItem 206 * 207 * Return value: the alternate title of @webHistoryItem 208 */ 209 const gchar* webkit_web_history_item_get_alternate_title(WebKitWebHistoryItem* webHistoryItem) 210 { 211 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL); 212 213 WebCore::HistoryItem* item = core(webHistoryItem); 214 215 g_return_val_if_fail(item != NULL, NULL); 216 217 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 218 WebCore::String alternateTitle = item->alternateTitle(); 219 g_free(priv->alternateTitle); 220 priv->alternateTitle = g_strdup(alternateTitle.utf8().data()); 221 222 return priv->alternateTitle; 223 } 224 225 /** 226 * webkit_web_history_item_set_alternate_title: 227 * @webHistoryItem: a #WebKitWebHistoryItem 228 * @title: the alternate title for @this history item 229 * 230 * Sets an alternate title for @webHistoryItem 231 */ 232 void webkit_web_history_item_set_alternate_title(WebKitWebHistoryItem* webHistoryItem, const gchar* title) 233 { 234 g_return_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem)); 235 236 WebCore::HistoryItem* item = core(webHistoryItem); 237 238 item->setAlternateTitle(WebCore::String::fromUTF8(title)); 239 } 240 241 /** 242 * webkit_web_history_item_get_uri: 243 * @webHistoryItem: a #WebKitWebHistoryItem 244 * 245 * Returns the URI of @this 246 * 247 * Return value: the URI of @webHistoryItem 248 */ 249 const gchar* webkit_web_history_item_get_uri(WebKitWebHistoryItem* webHistoryItem) 250 { 251 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL); 252 189 253 WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem)); 190 254 191 255 g_return_val_if_fail(item != NULL, NULL); 192 256 193 WebCore::String title = item->title(); 194 195 g_free(webHistoryItem->priv->title); 196 197 webHistoryItem->priv->title = g_strdup(title.utf8().data()); 198 199 return webHistoryItem->priv->title; 200 } 201 202 /** 203 * webkit_web_history_item_get_alternate_title: 204 * @webHistoryItem: a #WebKitWebHistoryItem 205 * 206 * Returns the alternate title of @webHistoryItem 207 * 208 * Return value: the alternate title of @webHistoryItem 209 */ 210 const gchar* webkit_web_history_item_get_alternate_title(WebKitWebHistoryItem* webHistoryItem) 257 WebCore::String uri = item->urlString(); 258 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 259 g_free(priv->uri); 260 priv->uri = g_strdup(uri.utf8().data()); 261 262 return priv->uri; 263 } 264 265 /** 266 * webkit_web_history_item_get_original_uri: 267 * @webHistoryItem: a #WebKitWebHistoryItem 268 * 269 * Returns the original URI of @webHistoryItem. 270 * 271 * Return value: the original URI of @webHistoryITem 272 */ 273 const gchar* webkit_web_history_item_get_original_uri(WebKitWebHistoryItem* webHistoryItem) 211 274 { 212 275 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL); … … 216 279 g_return_val_if_fail(item != NULL, NULL); 217 280 218 WebCore::String alternateTitle = item->alternateTitle();219 220 g_free( webHistoryItem->priv->alternateTitle);221 222 webHistoryItem->priv->alternateTitle = g_strdup(alternateTitle.utf8().data()); 223 224 return webHistoryItem->priv->alternateTitle; 225 } 226 227 /** 228 * webkit_web_history_item_set_alternate_title:229 * @webHistoryItem: a #WebKitWebHistoryItem230 * @title: the alternate title for @this history item231 * 232 * Sets an alternate title for @webHistoryItem233 */ 234 void webkit_web_history_item_set_alternate_title(WebKitWebHistoryItem* webHistoryItem, const gchar* title)235 { 236 g_return_ if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem));281 WebCore::String originalUri = item->originalURLString(); 282 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 283 g_free(priv->originalUri); 284 priv->originalUri = g_strdup(originalUri.utf8().data()); 285 286 return webHistoryItem->priv->originalUri; 287 } 288 289 /** 290 * webkit_web_history_item_get_last_visisted_time : 291 * @webHistoryItem: a #WebKitWebHistoryItem 292 * 293 * Returns the last time @webHistoryItem was visited 294 * 295 * Return value: the time in seconds this @webHistoryItem was last visited 296 */ 297 gdouble webkit_web_history_item_get_last_visited_time(WebKitWebHistoryItem* webHistoryItem) 298 { 299 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL); 237 300 238 301 WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem)); 239 302 240 const WebCore::String alternateTitle = title;241 item->setAlternateTitle(alternateTitle);242 }243 244 /**245 * webkit_web_history_item_get_uri:246 * @webHistoryItem: a #WebKitWebHistoryItem247 *248 * Returns the URI of @this249 *250 * Return value: the URI of @webHistoryItem251 */252 const gchar* webkit_web_history_item_get_uri(WebKitWebHistoryItem* webHistoryItem)253 {254 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);255 256 WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));257 258 g_return_val_if_fail(item != NULL, NULL);259 260 WebCore::String uri = item->urlString();261 262 g_free(webHistoryItem->priv->uri);263 264 webHistoryItem->priv->uri = g_strdup(uri.utf8().data());265 266 return webHistoryItem->priv->uri;267 }268 269 /**270 * webkit_web_history_item_get_original_uri:271 * @webHistoryItem: a #WebKitWebHistoryItem272 *273 * Returns the original URI of @webHistoryItem.274 *275 * Return value: the original URI of @webHistoryITem276 */277 const gchar* webkit_web_history_item_get_original_uri(WebKitWebHistoryItem* webHistoryItem)278 {279 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);280 281 WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));282 283 g_return_val_if_fail(item != NULL, NULL);284 285 WebCore::String originalUri = item->originalURLString();286 287 g_free(webHistoryItem->priv->originalUri);288 289 webHistoryItem->priv->originalUri = g_strdup(originalUri.utf8().data());290 291 return webHistoryItem->priv->originalUri;292 }293 294 /**295 * webkit_web_history_item_get_last_visisted_time :296 * @webHistoryItem: a #WebKitWebHistoryItem297 *298 * Returns the last time @webHistoryItem was visited299 *300 * Return value: the time in seconds this @webHistoryItem was last visited301 */302 gdouble webkit_web_history_item_get_last_visited_time(WebKitWebHistoryItem* webHistoryItem)303 {304 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);305 306 WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));307 308 303 g_return_val_if_fail(item != NULL, 0); 309 304 … … 317 312 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL); 318 313 319 WebCore::HistoryItem* historyItem = webHistoryItem->priv->historyItem; 314 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 315 WebCore::HistoryItem* historyItem = priv->historyItem; 320 316 321 317 return historyItem ? historyItem : 0; -
trunk/WebKit/gtk/webkit/webkitwebhistoryitem.h
r29961 r29985 36 36 #define WEBKIT_WEB_HISTORY_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_HISTORY_ITEM, WebKitWebHistoryItemClass)) 37 37 38 39 38 typedef struct _WebKitWebHistoryItemPrivate WebKitWebHistoryItemPrivate; 40 typedef struct _WebKitWebHistoryItem WebKitWebHistoryItem;41 typedef struct _WebKitWebHistoryItemClass WebKitWebHistoryItemClass;42 43 39 44 40 struct _WebKitWebHistoryItem { 45 GObject parent ;41 GObject parent_instance; 46 42 47 /*< private >*/48 43 WebKitWebHistoryItemPrivate* priv; 49 44 }; 50 45 51 46 struct _WebKitWebHistoryItemClass { 52 GObjectClass parent ;47 GObjectClass parent_class; 53 48 }; 54 49 -
trunk/WebKit/gtk/webkit/webkitwebsettings.h
r29898 r29985 34 34 #define WEBKIT_WEB_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsClass)) 35 35 36 typedef struct _WebKitWebSettings WebKitWebSettings; 37 typedef struct _WebKitWebSettingsPrivate WebKitWebSettingsPrivate; 38 typedef struct _WebKitWebSettingsClass WebKitWebSettingsClass; 36 typedef struct _WebKitWebSettingsPrivate WebKitWebSettingsPrivate; 39 37 40 38 struct _WebKitWebSettings { 41 39 GObject parent_instance; 40 42 41 WebKitWebSettingsPrivate* priv; 43 42 }; -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r29961 r29985 234 234 static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event) 235 235 { 236 Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget))); 236 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 237 238 Frame* frame = core(webView)->mainFrame(); 237 239 GdkRectangle clip; 238 240 gdk_region_get_clipbox(event->region, &clip); … … 251 253 static gboolean webkit_web_view_key_press_event(GtkWidget* widget, GdkEventKey* event) 252 254 { 253 Frame* frame = core(WEBKIT_WEB_VIEW(widget))->focusController()->focusedOrMainFrame(); 255 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 256 257 Frame* frame = core(webView)->focusController()->focusedOrMainFrame(); 254 258 PlatformKeyboardEvent keyboardEvent(event); 255 259 … … 293 297 static gboolean webkit_web_view_key_release_event(GtkWidget* widget, GdkEventKey* event) 294 298 { 295 Frame* frame = core(WEBKIT_WEB_VIEW(widget))->focusController()->focusedOrMainFrame(); 299 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 300 301 Frame* frame = core(webView)->focusController()->focusedOrMainFrame(); 296 302 PlatformKeyboardEvent keyboardEvent(event); 297 303 … … 305 311 static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventButton* event) 306 312 { 307 Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget))); 313 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 314 315 Frame* frame = core(webView)->mainFrame(); 308 316 309 317 // FIXME: need to keep track of subframe focus for key events 310 gtk_widget_grab_focus( GTK_WIDGET(widget));318 gtk_widget_grab_focus(widget); 311 319 312 320 if (event->button == 3) 313 return webkit_web_view_forward_context_menu_event( WEBKIT_WEB_VIEW(widget), PlatformMouseEvent(event));321 return webkit_web_view_forward_context_menu_event(webView, PlatformMouseEvent(event)); 314 322 315 323 return frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(event)); … … 318 326 static gboolean webkit_web_view_button_release_event(GtkWidget* widget, GdkEventButton* event) 319 327 { 320 Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget))); 321 322 WebKitWebView* web_view = WEBKIT_WEB_VIEW(widget); 323 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(web_view); 324 Frame* focusedFrame = webViewData->corePage->focusController()->focusedFrame(); 328 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 329 WebKitWebViewPrivate* priv = webView->priv; 330 Frame* focusedFrame = core(webView)->focusController()->focusedFrame(); 325 331 326 332 if (focusedFrame && focusedFrame->editor()->canEdit()) { 327 333 GdkWindow* window = gtk_widget_get_parent_window(widget); 328 gtk_im_context_set_client_window( webViewData->imContext, window);334 gtk_im_context_set_client_window(priv->imContext, window); 329 335 #ifdef MAEMO_CHANGES 330 hildon_gtk_im_context_filter_event( webViewData->imContext, (GdkEvent*)event);331 hildon_gtk_im_context_show( webViewData->imContext);336 hildon_gtk_im_context_filter_event(priv->imContext, (GdkEvent*)event); 337 hildon_gtk_im_context_show(priv->imContext); 332 338 #endif 333 339 } 334 340 335 return f rame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));341 return focusedFrame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event)); 336 342 } 337 343 338 344 static gboolean webkit_web_view_motion_event(GtkWidget* widget, GdkEventMotion* event) 339 345 { 340 Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget))); 346 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 347 348 Frame* frame = core(webView)->mainFrame(); 341 349 return frame->eventHandler()->mouseMoved(PlatformMouseEvent(event)); 342 350 } … … 344 352 static gboolean webkit_web_view_scroll_event(GtkWidget* widget, GdkEventScroll* event) 345 353 { 346 Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget))); 354 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 355 356 Frame* frame = core(webView)->mainFrame(); 347 357 PlatformWheelEvent wheelEvent(event); 348 358 return frame->eventHandler()->handleWheelEvent(wheelEvent); … … 353 363 GTK_WIDGET_CLASS(webkit_web_view_parent_class)->size_allocate(widget,allocation); 354 364 355 Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget))); 365 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 366 367 Frame* frame = core(webView)->mainFrame(); 356 368 frame->view()->resize(allocation->width, allocation->height); 357 369 frame->forceLayout(); … … 366 378 if (GTK_WIDGET_TOPLEVEL(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) { 367 379 WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); 368 Frame* frame = core(webkit_web_view_get_main_frame(webView)); 380 381 Frame* frame = core(webView)->mainFrame(); 369 382 core(webView)->focusController()->setActive(frame); 370 383 } … … 414 427 { 415 428 WebKitWebView* webView = WEBKIT_WEB_VIEW(container); 416 WebKitWebViewPrivate* priv ate_data = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);417 418 priv ate_data->children.add(widget);429 WebKitWebViewPrivate* priv = webView->priv; 430 431 priv->children.add(widget); 419 432 if (GTK_WIDGET_REALIZED(container)) 420 433 gtk_widget_set_parent_window(widget, GTK_WIDGET(webView)->window); … … 424 437 static void webkit_web_view_container_remove(GtkContainer* container, GtkWidget* widget) 425 438 { 426 WebKitWebViewPrivate* private_data = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(container)); 427 428 if (private_data->children.contains(widget)) { 439 WebKitWebView* webView = WEBKIT_WEB_VIEW(container); 440 WebKitWebViewPrivate* priv = webView->priv; 441 442 if (priv->children.contains(widget)) { 429 443 gtk_widget_unparent(widget); 430 priv ate_data->children.remove(widget);444 priv->children.remove(widget); 431 445 } 432 446 } … … 434 448 static void webkit_web_view_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData) 435 449 { 436 WebKitWebViewPrivate* privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(container)); 437 438 HashSet<GtkWidget*> children = privateData->children; 450 WebKitWebView* webView = WEBKIT_WEB_VIEW(container); 451 WebKitWebViewPrivate* priv = webView->priv; 452 453 HashSet<GtkWidget*> children = priv->children; 439 454 HashSet<GtkWidget*>::const_iterator end = children.end(); 440 455 for (HashSet<GtkWidget*>::const_iterator current = children.begin(); current != end; ++current) … … 591 606 static void webkit_web_view_finalize(GObject* object) 592 607 { 608 WebKitWebView* webView = WEBKIT_WEB_VIEW(object); 609 WebKitWebViewPrivate* priv = webView->priv; 610 593 611 webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object)); 594 612 595 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(object)); 596 597 delete webViewData->corePage; 598 599 g_object_unref(webViewData->backForwardList); 600 g_object_unref(webViewData->webSettings); 601 g_object_unref(webViewData->mainFrame); 602 g_object_unref(webViewData->imContext); 603 gtk_target_list_unref(webViewData->copy_target_list); 604 gtk_target_list_unref(webViewData->paste_target_list); 605 delete webViewData->userAgent; 613 delete priv->corePage; 614 615 g_object_unref(priv->backForwardList); 616 g_object_unref(priv->webSettings); 617 g_object_unref(priv->mainFrame); 618 g_object_unref(priv->imContext); 619 gtk_target_list_unref(priv->copy_target_list); 620 gtk_target_list_unref(priv->paste_target_list); 621 delete priv->userAgent; 606 622 607 623 G_OBJECT_CLASS(webkit_web_view_parent_class)->finalize(object); … … 625 641 626 642 webkit_init(); 627 628 g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));629 643 630 644 /* … … 1062 1076 FALSE, 1063 1077 WEBKIT_PARAM_READWRITE)); 1078 1079 g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate)); 1064 1080 } 1065 1081 1066 1082 static void webkit_web_view_screen_changed(WebKitWebView* webView, GdkScreen* previousScreen, gpointer userdata) 1067 1083 { 1068 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1069 WebKitWebSettings* webSettings = webViewData->webSettings;1070 Settings* settings = webViewData->corePage->settings();1084 WebKitWebViewPrivate* priv = webView->priv; 1085 WebKitWebSettings* webSettings = priv->webSettings; 1086 Settings* settings = core(webView)->settings(); 1071 1087 1072 1088 guint defaultFontSize, defaultMonospaceFontSize, minimumFontSize, minimumLogicalFontSize; … … 1094 1110 static void webkit_web_view_update_settings(WebKitWebView* webView) 1095 1111 { 1096 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1097 WebKitWebSettings* webSettings = webViewData->webSettings;1098 Settings* settings = webViewData->corePage->settings();1112 WebKitWebViewPrivate* priv = webView->priv; 1113 WebKitWebSettings* webSettings = priv->webSettings; 1114 Settings* settings = core(webView)->settings(); 1099 1115 1100 1116 gchar* defaultEncoding, *cursiveFontFamily, *defaultFontFamily, *fantasyFontFamily, *monospaceFontFamily, *sansSerifFontFamily, *serifFontFamily, *userStylesheetUri; … … 1147 1163 static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GParamSpec* pspec, WebKitWebView* webView) 1148 1164 { 1149 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1150 Settings* settings = webViewData->corePage->settings(); 1165 Settings* settings = core(webView)->settings(); 1151 1166 1152 1167 const gchar* name = g_intern_string(pspec->name); … … 1198 1213 static void webkit_web_view_init(WebKitWebView* webView) 1199 1214 { 1200 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1201 webViewData->imContext = gtk_im_multicontext_new(); 1202 webViewData->corePage = new Page(new WebKit::ChromeClient(webView), new WebKit::ContextMenuClient, new WebKit::EditorClient(webView), new WebKit::DragClient, new WebKit::InspectorClient); 1203 1204 webViewData->webSettings = webkit_web_settings_new(); 1205 webkit_web_view_update_settings(webView); 1206 g_signal_connect(webView, "screen-changed", G_CALLBACK(webkit_web_view_screen_changed), NULL); 1207 g_signal_connect(webViewData->webSettings, "notify", G_CALLBACK(webkit_web_view_settings_notify), webView); 1215 WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1216 webView->priv = priv; 1217 1218 priv->imContext = gtk_im_multicontext_new(); 1219 priv->corePage = new Page(new WebKit::ChromeClient(webView), new WebKit::ContextMenuClient, new WebKit::EditorClient(webView), new WebKit::DragClient, new WebKit::InspectorClient); 1208 1220 1209 1221 GTK_WIDGET_SET_FLAGS(webView, GTK_CAN_FOCUS); 1210 webViewData->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView)); 1211 webViewData->lastPopupXPosition = webViewData->lastPopupYPosition = -1; 1212 webViewData->editable = false; 1213 1214 /* Initialize the view's back/forward list */ 1215 webViewData->backForwardList = webkit_web_back_forward_list_new_with_web_view(webView); 1222 priv->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView)); 1223 priv->lastPopupXPosition = priv->lastPopupYPosition = -1; 1224 priv->editable = false; 1225 1226 priv->backForwardList = webkit_web_back_forward_list_new_with_web_view(webView); 1216 1227 1217 1228 #if GTK_CHECK_VERSION(2,10,0) … … 1221 1232 #endif 1222 1233 /* Targets for copy */ 1223 webViewData->copy_target_list = gtk_target_list_new(NULL, 0);1224 gtk_target_list_add( webViewData->copy_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);1225 gtk_target_list_add_text_targets( webViewData->copy_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);1234 priv->copy_target_list = gtk_target_list_new(NULL, 0); 1235 gtk_target_list_add(priv->copy_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML); 1236 gtk_target_list_add_text_targets(priv->copy_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT); 1226 1237 1227 1238 /* Targets for pasting */ 1228 webViewData->paste_target_list = gtk_target_list_new(NULL, 0); 1229 gtk_target_list_add(webViewData->paste_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML); 1230 gtk_target_list_add_text_targets(webViewData->paste_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT); 1231 1239 priv->paste_target_list = gtk_target_list_new(NULL, 0); 1240 gtk_target_list_add(priv->paste_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML); 1241 gtk_target_list_add_text_targets(priv->paste_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT); 1242 1243 priv->webSettings = webkit_web_settings_new(); 1244 webkit_web_view_update_settings(webView); 1245 g_signal_connect(webView, "screen-changed", G_CALLBACK(webkit_web_view_screen_changed), NULL); 1246 g_signal_connect(priv->webSettings, "notify", G_CALLBACK(webkit_web_view_settings_notify), webView); 1232 1247 } 1233 1248 … … 1244 1259 g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(webSettings)); 1245 1260 1246 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1247 g_signal_handlers_disconnect_by_func( webViewData->webSettings, (gpointer)webkit_web_view_settings_notify, webView);1248 g_object_unref( webViewData->webSettings);1261 WebKitWebViewPrivate* priv = webView->priv; 1262 g_signal_handlers_disconnect_by_func(priv->webSettings, (gpointer)webkit_web_view_settings_notify, webView); 1263 g_object_unref(priv->webSettings); 1249 1264 g_object_ref(webSettings); 1250 webViewData->webSettings = webSettings;1265 priv->webSettings = webSettings; 1251 1266 webkit_web_view_update_settings(webView); 1252 1267 g_signal_connect(webSettings, "notify", G_CALLBACK(webkit_web_view_settings_notify), webView); … … 1257 1272 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); 1258 1273 1259 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1260 return webViewData->webSettings;1274 WebKitWebViewPrivate* priv = webView->priv; 1275 return priv->webSettings; 1261 1276 } 1262 1277 … … 1287 1302 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); 1288 1303 1289 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(webView));1290 1291 if (! webViewData->corePage || !webViewData->corePage->backForwardList()->enabled())1304 WebKitWebViewPrivate* priv = webView->priv; 1305 1306 if (!core(webView) || !core(webView)->backForwardList()->enabled()) 1292 1307 return NULL; 1293 1308 1294 return webViewData->backForwardList;1309 return priv->backForwardList; 1295 1310 } 1296 1311 … … 1309 1324 g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(item), FALSE); 1310 1325 1326 // FIXME: This always returns TRUE 1311 1327 core(webView)->goToItem(core(item), FrameLoadTypeIndexedBackForward); 1312 1328 return TRUE; … … 1316 1332 * webkit_web_view_go_backward: 1317 1333 * @webView: the #WebKitWebView 1334 * 1335 * @Deprecated: Use webkit_web_view_go_back() instead. 1318 1336 * 1319 1337 * Go to the previous page, if there's any. … … 1351 1369 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 1352 1370 1353 Frame* frame = core(web kit_web_view_get_main_frame(webView));1371 Frame* frame = core(webView)->mainFrame(); 1354 1372 frame->loader()->goBackOrForward(steps); 1355 1373 } … … 1374 1392 * Checks whether the view can go back to the previous page 1375 1393 * 1394 * @Deprecated: Use webkit_web_view_can_go_back() instead. 1395 * 1376 1396 * Return value: %TRUE if the page can go back, otherwise returns %FALSE 1377 1397 */ … … 1394 1414 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE); 1395 1415 1396 Page* page = core(webView); 1397 1398 if (!page || !page->backForwardList()->backItem()) 1416 if (!core(webView) || !core(webView)->backForwardList()->backItem()) 1399 1417 return FALSE; 1400 1418 … … 1417 1435 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE); 1418 1436 1419 Frame* frame = core(web kit_web_view_get_main_frame(webView));1437 Frame* frame = core(webView)->mainFrame(); 1420 1438 return frame->loader()->canGoBackOrForward(steps); 1421 1439 } … … 1449 1467 g_return_if_fail(uri); 1450 1468 1451 Frame* frame = core(web kit_web_view_get_main_frame(webView));1469 Frame* frame = core(webView)->mainFrame(); 1452 1470 DeprecatedString string = DeprecatedString::fromUtf8(uri); 1453 1471 frame->loader()->load(ResourceRequest(KURL(string))); … … 1458 1476 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 1459 1477 1460 Frame* frame = core(webkit_web_view_get_main_frame(webView)); 1461 frame->loader()->reload(); 1478 core(webView)->mainFrame()->loader()->reload(); 1462 1479 } 1463 1480 … … 1467 1484 g_return_if_fail(content); 1468 1485 1469 Frame* frame = core(web kit_web_view_get_main_frame(webView));1486 Frame* frame = core(webView)->mainFrame(); 1470 1487 1471 1488 KURL url(baseUri ? DeprecatedString::fromUtf8(baseUri) : ""); … … 1488 1505 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 1489 1506 1490 Frame* frame = core(web kit_web_view_get_main_frame(webView));1507 Frame* frame = core(webView)->mainFrame(); 1491 1508 1492 1509 if (FrameLoader* loader = frame->loader()) … … 1514 1531 FindDirection direction = forward ? FindDirectionForward : FindDirectionBackward; 1515 1532 1516 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1517 return webViewData->corePage->findString(String::fromUTF8(string), caseSensitivity, direction, shouldWrap); 1533 return core(webView)->findString(String::fromUTF8(string), caseSensitivity, direction, shouldWrap); 1518 1534 } 1519 1535 … … 1536 1552 TextCaseSensitivity caseSensitivity = caseSensitive ? TextCaseSensitive : TextCaseInsensitive; 1537 1553 1538 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1539 return webViewData->corePage->markAllMatchesForText(String::fromUTF8(string), caseSensitivity, false, limit); 1554 return core(webView)->markAllMatchesForText(String::fromUTF8(string), caseSensitivity, false, limit); 1540 1555 } 1541 1556 … … 1551 1566 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 1552 1567 1553 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1554 WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame); 1555 frameData->frame->setMarkedTextMatchesAreHighlighted(shouldHighlight); 1568 core(webView)->mainFrame()->setMarkedTextMatchesAreHighlighted(shouldHighlight); 1556 1569 } 1557 1570 … … 1566 1579 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 1567 1580 1568 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1569 return webViewData->corePage->unmarkAllTextMatches(); 1581 return core(webView)->unmarkAllTextMatches(); 1570 1582 } 1571 1583 … … 1574 1586 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); 1575 1587 1576 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1577 return webViewData->mainFrame;1588 WebKitWebViewPrivate* priv = webView->priv; 1589 return priv->mainFrame; 1578 1590 } 1579 1591 … … 1583 1595 g_return_if_fail(script); 1584 1596 1585 Frame* frame = core(webkit_web_view_get_main_frame(webView)); 1586 if (FrameLoader* loader = frame->loader()) 1597 if (FrameLoader* loader = core(webView)->mainFrame()->loader()) 1587 1598 loader->executeScript(String::fromUTF8(script), true); 1588 1599 } … … 1704 1715 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE); 1705 1716 1706 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1707 return !webViewData->corePage->selection().isNone(); 1717 return !core(webView)->selection().isNone(); 1708 1718 } 1709 1719 … … 1753 1763 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE); 1754 1764 1755 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1756 ASSERT(webViewData); 1757 1758 return webViewData->editable; 1765 WebKitWebViewPrivate* priv = webView->priv; 1766 1767 return priv->editable; 1759 1768 } 1760 1769 … … 1780 1789 { 1781 1790 g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); 1791 1792 WebKitWebViewPrivate* priv = webView->priv; 1793 1794 Frame* frame = core(webView)->mainFrame(); 1795 g_return_if_fail(frame); 1796 1797 // TODO: What happens when the frame is replaced? 1782 1798 flag = flag != FALSE; 1783 1784 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView); 1785 ASSERT(webViewData); 1786 1787 Frame* mainFrame = core(webViewData->mainFrame); 1788 g_return_if_fail(mainFrame); 1789 1790 // TODO: What happens when the frame is replaced? 1791 if (flag == webViewData->editable) 1799 if (flag == priv->editable) 1792 1800 return; 1793 1801 1794 webViewData->editable = flag;1802 priv->editable = flag; 1795 1803 1796 1804 if (flag) { 1797 mainFrame->applyEditingStyleToBodyElement();1805 frame->applyEditingStyleToBodyElement(); 1798 1806 // TODO: If the WebKitWebView is made editable and the selection is empty, set it to something. 1799 1807 //if (!webkit_web_view_get_selected_dom_range(webView)) 1800 1808 // mainFrame->setSelectionFromNone(); 1801 1809 } else 1802 mainFrame->removeEditingStyleFromBodyElement();1810 frame->removeEditingStyleFromBodyElement(); 1803 1811 } 1804 1812 … … 1819 1827 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); 1820 1828 1821 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1822 return webViewData->copy_target_list;1829 WebKitWebViewPrivate* priv = webView->priv; 1830 return priv->copy_target_list; 1823 1831 } 1824 1832 … … 1839 1847 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); 1840 1848 1841 WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);1842 return webViewData->paste_target_list;1843 } 1844 1845 } 1849 WebKitWebViewPrivate* priv = webView->priv; 1850 return priv->paste_target_list; 1851 } 1852 1853 } -
trunk/WebKit/gtk/webkit/webkitwebview.h
r29961 r29985 38 38 #define WEBKIT_WEB_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass)) 39 39 40 typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate; 40 41 41 42 typedef enum { … … 52 53 53 54 struct _WebKitWebView { 54 GtkContainer parent; 55 GtkContainer parent_instance; 56 57 WebKitWebViewPrivate* priv; 55 58 }; 56 59 57 60 struct _WebKitWebViewClass { 58 GtkContainerClass parent ;61 GtkContainerClass parent_class; 59 62 60 63 /*
Note: See TracChangeset
for help on using the changeset viewer.