Changeset 29985 in webkit


Ignore:
Timestamp:
Feb 4, 2008 5:41:04 PM (16 years ago)
Author:
alp@webkit.org
Message:

2008-02-04 Christian Dywan <christian@imendio.com>

Reviewed by Alp Toker.

http://bugs.webkit.org/show_bug.cgi?id=17065
[GTK] Use a consistent coding style

Location:
trunk/WebKit/gtk
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/gtk/ChangeLog

    r29961 r29985  
     12008-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
    1482008-02-04  Alp Toker  <alp@atoker.com>
    249
  • trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

    r29663 r29985  
    3737static void imContextCommitted(GtkIMContext* context, const char* str, EditorClient* client)
    3838{
    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();
    4140    frame->editor()->insertTextWithoutSendingTextEvent(str, false);
    4241}
     
    354353    : m_webView(webView)
    355354{
    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);
    358357}
    359358
    360359EditorClient::~EditorClient()
    361360{
    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);
    364363}
    365364
     
    371370void EditorClient::textFieldDidEndEditing(Element*)
    372371{
    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);
    376375#ifdef MAEMO_CHANGES
    377     hildon_gtk_im_context_hide(webViewData->imContext);
     376    hildon_gtk_im_context_hide(priv->imContext);
    378377#endif
    379378}
  • trunk/WebKit/gtk/webkit/webkitdefines.h

    r29898 r29985  
    3636
    3737#ifndef WEBKIT_API
    38 #define WEBKIT_API
     38    #define WEBKIT_API
    3939#endif
    4040
    4141G_BEGIN_DECLS
    4242
     43typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
     44typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
     45
     46typedef struct _WebKitWebBackForwardList WebKitWebBackForwardList;
     47typedef struct _WebKitWebBackForwardListClass WebKitWebBackForwardListClass;
     48
     49typedef struct _WebKitWebHistoryItem WebKitWebHistoryItem;
     50typedef struct _WebKitWebHistoryItemClass WebKitWebHistoryItemClass;
     51
    4352typedef struct _WebKitWebFrame WebKitWebFrame;
    4453typedef struct _WebKitWebFrameClass WebKitWebFrameClass;
     54
     55typedef struct _WebKitWebSettings WebKitWebSettings;
     56typedef struct _WebKitWebSettingsClass WebKitWebSettingsClass;
    4557
    4658typedef struct _WebKitWebView WebKitWebView;
    4759typedef struct _WebKitWebViewClass WebKitWebViewClass;
    4860
    49 typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
    50 typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
    51 
    5261G_END_DECLS
    5362
  • trunk/WebKit/gtk/webkit/webkitnetworkrequest.cpp

    r29898 r29985  
    2121
    2222#include "webkitnetworkrequest.h"
    23 #include "webkitprivate.h"
    24 
    25 using namespace WebKit;
    26 using namespace WebCore;
    2723
    2824extern "C" {
     
    3026G_DEFINE_TYPE(WebKitNetworkRequest, webkit_network_request, G_TYPE_OBJECT);
    3127
     28struct _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
    3234static void webkit_network_request_finalize(GObject* object)
    3335{
    34     WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(object);
     36    WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(object);
     37    WebKitNetworkRequestPrivate* priv = request->priv;
    3538
    36     g_free(requestPrivate->uri);
     39    g_free(priv->uri);
    3740
    3841    G_OBJECT_CLASS(webkit_network_request_parent_class)->finalize(object);
     
    4144static void webkit_network_request_class_init(WebKitNetworkRequestClass* requestClass)
    4245{
     46    G_OBJECT_CLASS(requestClass)->finalize = webkit_network_request_finalize;
     47
    4348    g_type_class_add_private(requestClass, sizeof(WebKitNetworkRequestPrivate));
    44 
    45     G_OBJECT_CLASS(requestClass)->finalize = webkit_network_request_finalize;
    4649}
    4750
    4851static void webkit_network_request_init(WebKitNetworkRequest* request)
    4952{
     53    WebKitNetworkRequestPrivate* priv = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
     54    request->priv = priv;
    5055}
    5156
     
    5560
    5661    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;
    5863
    59     requestPrivate->uri = g_strdup(uri);
     64    priv->uri = g_strdup(uri);
    6065
    6166    return request;
     
    6772    g_return_if_fail(uri);
    6873
    69     WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
     74    WebKitNetworkRequestPrivate* priv = request->priv;
    7075
    71     g_free(requestPrivate->uri);
    72     requestPrivate->uri = g_strdup(uri);
     76    g_free(priv->uri);
     77    priv->uri = g_strdup(uri);
    7378}
    7479
     
    7782    g_return_val_if_fail(WEBKIT_IS_NETWORK_REQUEST(request), NULL);
    7883
    79     WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
    80 
    81     return requestPrivate->uri;
     84    WebKitNetworkRequestPrivate* priv = request->priv;
     85    return priv->uri;
    8286}
    8387
  • trunk/WebKit/gtk/webkit/webkitnetworkrequest.h

    r29898 r29985  
    3434#define WEBKIT_NETWORK_REQUEST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass))
    3535
     36typedef struct _WebKitNetworkRequestPrivate WebKitNetworkRequestPrivate;
    3637
    3738struct _WebKitNetworkRequest {
    38     GObject parent;
     39    GObject parent_instance;
     40
     41    WebKitNetworkRequestPrivate* priv;
    3942};
    4043
    4144struct _WebKitNetworkRequestClass {
    42     GObjectClass parent;
     45    GObjectClass parent_class;
    4346};
    4447
  • trunk/WebKit/gtk/webkit/webkitprivate.cpp

    r29898 r29985  
    4040WebKitWebView* getViewFromFrame(WebKitWebFrame* frame)
    4141{
    42     return webkit_web_frame_get_web_view(frame);
     42    WebKitWebFramePrivate* priv = frame->priv;
     43    return priv->webView;
    4344}
    4445
     
    4849        return 0;
    4950
    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;
    5253}
    5354
     
    6768        return 0;
    6869
    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;
    7172}
    7273
  • trunk/WebKit/gtk/webkit/webkitprivate.h

    r29961 r29985  
    2323
    2424/*
    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.
    2726 * They are using WebCore which musn't be exposed to the outer world.
    2827 */
     
    9190    typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate;
    9291    struct _WebKitWebFramePrivate {
    93         WebCore::Frame* frame;
     92        WebCore::Frame* coreFrame;
    9493        WebCore::FrameLoaderClient* client;
    9594        WebKitWebView* webView;
     
    106105    };
    107106
    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*);
    110109
    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*);
    113112
    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.
    117114
    118115    WEBKIT_API GSList*
  • trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp

    r29961 r29985  
    6464    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    6565
    66     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    6766    WebKitWebBackForwardList* webBackForwardList;
    6867
    6968    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);
    7273
    7374    return webBackForwardList;
  • trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.h

    r29898 r29985  
    3636#define WEBKIT_WEB_BACK_FORWARD_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, WebKitWebBackForwardListClass))
    3737
    38 
    3938typedef struct _WebKitWebBackForwardListPrivate WebKitWebBackForwardListPrivate;
    40 typedef struct _WebKitWebBackForwardList WebKitWebBackForwardList;
    41 typedef struct _WebKitWebBackForwardListClass WebKitWebBackForwardListClass;
    42 
    4339
    4440struct _WebKitWebBackForwardList {
    45     GObject parent;
     41    GObject parent_instance;
    4642
    47     /*< private >*/
    48     WebKitWebBackForwardListPrivate *priv;
     43    WebKitWebBackForwardListPrivate* priv;
    4944};
    5045
    5146struct _WebKitWebBackForwardListClass {
    52     GObjectClass parent;
     47    GObjectClass parent_class;
    5348};
    5449
  • trunk/WebKit/gtk/webkit/webkitwebframe.cpp

    r29898 r29985  
    33 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
    44 * Copyright (C) 2007 Apple Inc.
     5 * Copyright (C) 2008 Christian Dywan <christian@imendio.com>
    56 *
    67 * This library is free software; you can redistribute it and/or
     
    8990static void webkit_web_frame_finalize(GObject* object)
    9091{
    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;
    97100
    98101    G_OBJECT_CLASS(webkit_web_frame_parent_class)->finalize(object);
     
    102105{
    103106    webkit_init();
    104 
    105     g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));
    106107
    107108    /*
     
    186187                                                        NULL,
    187188                                                        WEBKIT_PARAM_READABLE));
     189
     190    g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));
    188191}
    189192
    190193static void webkit_web_frame_init(WebKitWebFrame* frame)
    191194{
     195    WebKitWebFramePrivate* priv = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
     196
    192197    // TODO: Move constructor code here.
     198    frame->priv = priv;
    193199}
    194200
     
    206212
    207213    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);
    215221    frameView->setContainingWindow(GTK_CONTAINER(webView));
    216222    frameView->setGtkAdjustments(GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)),
    217223                                 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;
    224227
    225228    return frame;
     
    229232{
    230233    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);
    238241    frameView->setContainingWindow(GTK_CONTAINER(webView));
    239     frameData->frame->setView(frameView);
     242    priv->coreFrame->setView(frameView);
    240243    frameView->deref();
    241     frameData->frame->init();
    242     frameData->webView = webView;
     244    priv->coreFrame->init();
     245    priv->webView = webView;
    243246
    244247    return frame;
     
    257260    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
    258261
    259     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
    260     return frameData->title;
     262    WebKitWebFramePrivate* priv = frame->priv;
     263    return priv->title;
    261264}
    262265
     
    273276    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
    274277
    275     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
    276     return frameData->uri;
     278    WebKitWebFramePrivate* priv = frame->priv;
     279    return priv->uri;
    277280}
    278281
     
    292295    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
    293296
    294     WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
    295     return frameData->webView;
     297    WebKitWebFramePrivate* priv = frame->priv;
     298    return priv->webView;
    296299}
    297300
     
    308311    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
    309312
    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;
    314317
    315318    Frame* coreFrame = core(frame);
     
    317320
    318321    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;
    322324}
    323325
     
    359361    g_return_if_fail(coreFrame);
    360362
    361     // TODO: Use the ResourceRequest carried by WebKitNetworkRequest when it gets implemented.
     363    // TODO: Use the ResourceRequest carried by WebKitNetworkRequest when it is implemented.
    362364    DeprecatedString string = DeprecatedString::fromUtf8(webkit_network_request_get_uri(request));
    363365    coreFrame->loader()->load(ResourceRequest(KURL(string)));
  • trunk/WebKit/gtk/webkit/webkitwebframe.h

    r29898 r29985  
    2626
    2727#include <webkit/webkitdefines.h>
     28#include <webkit/webkitnetworkrequest.h>
    2829
    2930G_BEGIN_DECLS
     
    3637#define WEBKIT_WEB_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_FRAME, WebKitWebFrameClass))
    3738
     39typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate;
    3840
    3941struct _WebKitWebFrame {
    40     GObject parent;
     42    GObject parent_instance;
     43
     44    WebKitWebFramePrivate* priv;
    4145};
    4246
    4347struct _WebKitWebFrameClass {
    44     GObjectClass parent;
     48    GObjectClass parent_class;
    4549
    4650    void (*_webkit_reserved1) (void);
  • trunk/WebKit/gtk/webkit/webkitwebhistoryitem.cpp

    r29961 r29985  
    7878static void webkit_web_history_item_dispose(GObject* object)
    7979{
    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;
    8585
    8686    /* destroy table if empty */
     
    9292}
    9393
    94 
    9594static void webkit_web_history_item_finalize(GObject* object)
    9695{
    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);
    103103
    104104    G_OBJECT_CLASS(webkit_web_history_item_parent_class)->finalize(object);
     
    124124{
    125125    WebKitWebHistoryItem* webHistoryItem = kit(item);
     126    WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
    126127
    127128    if (!webHistoryItem) {
    128129        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);
    131132    }
    132133
     
    145146{
    146147    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);
    151152
    152153    return webHistoryItem;
    153154}
    154 
    155155
    156156/**
     
    169169
    170170    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);
    175175
    176176    return webHistoryItem;
     
    187187    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
    188188
     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 */
     209const 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 */
     232void 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 */
     249const gchar* webkit_web_history_item_get_uri(WebKitWebHistoryItem* webHistoryItem)
     250{
     251    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
     252
    189253    WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));
    190254
    191255    g_return_val_if_fail(item != NULL, NULL);
    192256
    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 */
     273const gchar* webkit_web_history_item_get_original_uri(WebKitWebHistoryItem* webHistoryItem)
    211274{
    212275    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
     
    216279    g_return_val_if_fail(item != NULL, NULL);
    217280
    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 #WebKitWebHistoryItem
    230  * @title: the alternate title for @this history item
    231  *
    232  * Sets an alternate title for @webHistoryItem
    233  */
    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 */
     297gdouble webkit_web_history_item_get_last_visited_time(WebKitWebHistoryItem* webHistoryItem)
     298{
     299    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
    237300
    238301    WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));
    239302
    240     const WebCore::String alternateTitle = title;
    241     item->setAlternateTitle(alternateTitle);
    242 }
    243 
    244 /**
    245  * webkit_web_history_item_get_uri:
    246  * @webHistoryItem: a #WebKitWebHistoryItem
    247  *
    248  * Returns the URI of @this
    249  *
    250  * Return value: the URI of @webHistoryItem
    251  */
    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 #WebKitWebHistoryItem
    272  *
    273  * Returns the original URI of @webHistoryItem.
    274  *
    275  * Return value: the original URI of @webHistoryITem
    276  */
    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 #WebKitWebHistoryItem
    297  *
    298  * Returns the last time @webHistoryItem was visited
    299  *
    300  * Return value: the time in seconds this @webHistoryItem was last visited
    301  */
    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 
    308303    g_return_val_if_fail(item != NULL, 0);
    309304
     
    317312    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
    318313
    319     WebCore::HistoryItem* historyItem = webHistoryItem->priv->historyItem;
     314    WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
     315    WebCore::HistoryItem* historyItem = priv->historyItem;
    320316
    321317    return historyItem ? historyItem : 0;
  • trunk/WebKit/gtk/webkit/webkitwebhistoryitem.h

    r29961 r29985  
    3636#define WEBKIT_WEB_HISTORY_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_HISTORY_ITEM, WebKitWebHistoryItemClass))
    3737
    38 
    3938typedef struct _WebKitWebHistoryItemPrivate WebKitWebHistoryItemPrivate;
    40 typedef struct _WebKitWebHistoryItem WebKitWebHistoryItem;
    41 typedef struct _WebKitWebHistoryItemClass WebKitWebHistoryItemClass;
    42 
    4339
    4440struct _WebKitWebHistoryItem {
    45     GObject parent;
     41    GObject parent_instance;
    4642
    47     /*< private >*/
    4843    WebKitWebHistoryItemPrivate* priv;
    4944};
    5045
    5146struct _WebKitWebHistoryItemClass {
    52     GObjectClass parent;
     47    GObjectClass parent_class;
    5348};
    5449
  • trunk/WebKit/gtk/webkit/webkitwebsettings.h

    r29898 r29985  
    3434#define WEBKIT_WEB_SETTINGS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsClass))
    3535
    36 typedef struct _WebKitWebSettings                WebKitWebSettings;
    37 typedef struct _WebKitWebSettingsPrivate         WebKitWebSettingsPrivate;
    38 typedef struct _WebKitWebSettingsClass           WebKitWebSettingsClass;
     36typedef struct _WebKitWebSettingsPrivate WebKitWebSettingsPrivate;
    3937
    4038struct _WebKitWebSettings {
    4139    GObject parent_instance;
     40
    4241    WebKitWebSettingsPrivate* priv;
    4342};
  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r29961 r29985  
    234234static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event)
    235235{
    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();
    237239    GdkRectangle clip;
    238240    gdk_region_get_clipbox(event->region, &clip);
     
    251253static gboolean webkit_web_view_key_press_event(GtkWidget* widget, GdkEventKey* event)
    252254{
    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();
    254258    PlatformKeyboardEvent keyboardEvent(event);
    255259
     
    293297static gboolean webkit_web_view_key_release_event(GtkWidget* widget, GdkEventKey* event)
    294298{
    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();
    296302    PlatformKeyboardEvent keyboardEvent(event);
    297303
     
    305311static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventButton* event)
    306312{
    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();
    308316
    309317    // 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);
    311319
    312320    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));
    314322
    315323    return frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(event));
     
    318326static gboolean webkit_web_view_button_release_event(GtkWidget* widget, GdkEventButton* event)
    319327{
    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();
    325331
    326332    if (focusedFrame && focusedFrame->editor()->canEdit()) {
    327333        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);
    329335#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);
    332338#endif
    333339    }
    334340
    335     return frame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));
     341    return focusedFrame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));
    336342}
    337343
    338344static gboolean webkit_web_view_motion_event(GtkWidget* widget, GdkEventMotion* event)
    339345{
    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();
    341349    return frame->eventHandler()->mouseMoved(PlatformMouseEvent(event));
    342350}
     
    344352static gboolean webkit_web_view_scroll_event(GtkWidget* widget, GdkEventScroll* event)
    345353{
    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();
    347357    PlatformWheelEvent wheelEvent(event);
    348358    return frame->eventHandler()->handleWheelEvent(wheelEvent);
     
    353363    GTK_WIDGET_CLASS(webkit_web_view_parent_class)->size_allocate(widget,allocation);
    354364
    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();
    356368    frame->view()->resize(allocation->width, allocation->height);
    357369    frame->forceLayout();
     
    366378    if (GTK_WIDGET_TOPLEVEL(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
    367379        WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
    368         Frame* frame = core(webkit_web_view_get_main_frame(webView));
     380
     381        Frame* frame = core(webView)->mainFrame();
    369382        core(webView)->focusController()->setActive(frame);
    370383    }
     
    414427{
    415428    WebKitWebView* webView = WEBKIT_WEB_VIEW(container);
    416     WebKitWebViewPrivate* private_data = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    417 
    418     private_data->children.add(widget);
     429    WebKitWebViewPrivate* priv = webView->priv;
     430
     431    priv->children.add(widget);
    419432    if (GTK_WIDGET_REALIZED(container))
    420433        gtk_widget_set_parent_window(widget, GTK_WIDGET(webView)->window);
     
    424437static void webkit_web_view_container_remove(GtkContainer* container, GtkWidget* widget)
    425438{
    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)) {
    429443        gtk_widget_unparent(widget);
    430         private_data->children.remove(widget);
     444        priv->children.remove(widget);
    431445    }
    432446}
     
    434448static void webkit_web_view_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
    435449{
    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;
    439454    HashSet<GtkWidget*>::const_iterator end = children.end();
    440455    for (HashSet<GtkWidget*>::const_iterator current = children.begin(); current != end; ++current)
     
    591606static void webkit_web_view_finalize(GObject* object)
    592607{
     608    WebKitWebView* webView = WEBKIT_WEB_VIEW(object);
     609    WebKitWebViewPrivate* priv = webView->priv;
     610
    593611    webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object));
    594612
    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;
    606622
    607623    G_OBJECT_CLASS(webkit_web_view_parent_class)->finalize(object);
     
    625641
    626642    webkit_init();
    627 
    628     g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
    629643
    630644    /*
     
    10621076                                                         FALSE,
    10631077                                                         WEBKIT_PARAM_READWRITE));
     1078
     1079    g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
    10641080}
    10651081
    10661082static void webkit_web_view_screen_changed(WebKitWebView* webView, GdkScreen* previousScreen, gpointer userdata)
    10671083{
    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();
    10711087
    10721088    guint defaultFontSize, defaultMonospaceFontSize, minimumFontSize, minimumLogicalFontSize;
     
    10941110static void webkit_web_view_update_settings(WebKitWebView* webView)
    10951111{
    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();
    10991115
    11001116    gchar* defaultEncoding, *cursiveFontFamily, *defaultFontFamily, *fantasyFontFamily, *monospaceFontFamily, *sansSerifFontFamily, *serifFontFamily, *userStylesheetUri;
     
    11471163static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GParamSpec* pspec, WebKitWebView* webView)
    11481164{
    1149     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    1150     Settings* settings = webViewData->corePage->settings();
     1165    Settings* settings = core(webView)->settings();
    11511166
    11521167    const gchar* name = g_intern_string(pspec->name);
     
    11981213static void webkit_web_view_init(WebKitWebView* webView)
    11991214{
    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);
    12081220
    12091221    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);
    12161227
    12171228#if GTK_CHECK_VERSION(2,10,0)
     
    12211232#endif
    12221233    /* 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);
    12261237
    12271238    /* 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);
    12321247}
    12331248
     
    12441259    g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(webSettings));
    12451260
    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);
    12491264    g_object_ref(webSettings);
    1250     webViewData->webSettings = webSettings;
     1265    priv->webSettings = webSettings;
    12511266    webkit_web_view_update_settings(webView);
    12521267    g_signal_connect(webSettings, "notify", G_CALLBACK(webkit_web_view_settings_notify), webView);
     
    12571272    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    12581273
    1259     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    1260     return webViewData->webSettings;
     1274    WebKitWebViewPrivate* priv = webView->priv;
     1275    return priv->webSettings;
    12611276}
    12621277
     
    12871302    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    12881303
    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())
    12921307        return NULL;
    12931308
    1294     return webViewData->backForwardList;
     1309    return priv->backForwardList;
    12951310}
    12961311
     
    13091324    g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(item), FALSE);
    13101325
     1326    // FIXME: This always returns TRUE
    13111327    core(webView)->goToItem(core(item), FrameLoadTypeIndexedBackForward);
    13121328    return TRUE;
     
    13161332 * webkit_web_view_go_backward:
    13171333 * @webView: the #WebKitWebView
     1334 *
     1335 * @Deprecated: Use webkit_web_view_go_back() instead.
    13181336 *
    13191337 * Go to the previous page, if there's any.
     
    13511369    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    13521370
    1353     Frame* frame = core(webkit_web_view_get_main_frame(webView));
     1371    Frame* frame = core(webView)->mainFrame();
    13541372    frame->loader()->goBackOrForward(steps);
    13551373}
     
    13741392 * Checks whether the view can go back to the previous page
    13751393 *
     1394 * @Deprecated: Use webkit_web_view_can_go_back() instead.
     1395 *
    13761396 * Return value: %TRUE if the page can go back, otherwise returns %FALSE
    13771397 */
     
    13941414    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    13951415
    1396     Page* page = core(webView);
    1397 
    1398     if (!page || !page->backForwardList()->backItem())
     1416    if (!core(webView) || !core(webView)->backForwardList()->backItem())
    13991417        return FALSE;
    14001418
     
    14171435    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    14181436
    1419     Frame* frame = core(webkit_web_view_get_main_frame(webView));
     1437    Frame* frame = core(webView)->mainFrame();
    14201438    return frame->loader()->canGoBackOrForward(steps);
    14211439}
     
    14491467    g_return_if_fail(uri);
    14501468
    1451     Frame* frame = core(webkit_web_view_get_main_frame(webView));
     1469    Frame* frame = core(webView)->mainFrame();
    14521470    DeprecatedString string = DeprecatedString::fromUtf8(uri);
    14531471    frame->loader()->load(ResourceRequest(KURL(string)));
     
    14581476    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    14591477
    1460     Frame* frame = core(webkit_web_view_get_main_frame(webView));
    1461     frame->loader()->reload();
     1478    core(webView)->mainFrame()->loader()->reload();
    14621479}
    14631480
     
    14671484    g_return_if_fail(content);
    14681485
    1469     Frame* frame = core(webkit_web_view_get_main_frame(webView));
     1486    Frame* frame = core(webView)->mainFrame();
    14701487
    14711488    KURL url(baseUri ? DeprecatedString::fromUtf8(baseUri) : "");
     
    14881505    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    14891506
    1490     Frame* frame = core(webkit_web_view_get_main_frame(webView));
     1507    Frame* frame = core(webView)->mainFrame();
    14911508
    14921509    if (FrameLoader* loader = frame->loader())
     
    15141531    FindDirection direction = forward ? FindDirectionForward : FindDirectionBackward;
    15151532
    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);
    15181534}
    15191535
     
    15361552    TextCaseSensitivity caseSensitivity = caseSensitive ? TextCaseSensitive : TextCaseInsensitive;
    15371553
    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);
    15401555}
    15411556
     
    15511566    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    15521567
    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);
    15561569}
    15571570
     
    15661579    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    15671580
    1568     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    1569     return webViewData->corePage->unmarkAllTextMatches();
     1581    return core(webView)->unmarkAllTextMatches();
    15701582}
    15711583
     
    15741586    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    15751587
    1576     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    1577     return webViewData->mainFrame;
     1588    WebKitWebViewPrivate* priv = webView->priv;
     1589    return priv->mainFrame;
    15781590}
    15791591
     
    15831595    g_return_if_fail(script);
    15841596
    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())
    15871598        loader->executeScript(String::fromUTF8(script), true);
    15881599}
     
    17041715    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    17051716
    1706     WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
    1707     return !webViewData->corePage->selection().isNone();
     1717    return !core(webView)->selection().isNone();
    17081718}
    17091719
     
    17531763    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    17541764
    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;
    17591768}
    17601769
     
    17801789{
    17811790    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?
    17821798    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)
    17921800        return;
    17931801
    1794     webViewData->editable = flag;
     1802    priv->editable = flag;
    17951803
    17961804    if (flag) {
    1797         mainFrame->applyEditingStyleToBodyElement();
     1805        frame->applyEditingStyleToBodyElement();
    17981806        // TODO: If the WebKitWebView is made editable and the selection is empty, set it to something.
    17991807        //if (!webkit_web_view_get_selected_dom_range(webView))
    18001808        //    mainFrame->setSelectionFromNone();
    18011809    } else
    1802         mainFrame->removeEditingStyleFromBodyElement();
     1810        frame->removeEditingStyleFromBodyElement();
    18031811}
    18041812
     
    18191827    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    18201828
    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;
    18231831}
    18241832
     
    18391847    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    18401848
    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  
    3838#define WEBKIT_WEB_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
    3939
     40typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
    4041
    4142typedef enum {
     
    5253
    5354struct _WebKitWebView {
    54     GtkContainer parent;
     55    GtkContainer parent_instance;
     56
     57    WebKitWebViewPrivate* priv;
    5558};
    5659
    5760struct _WebKitWebViewClass {
    58     GtkContainerClass parent;
     61    GtkContainerClass parent_class;
    5962
    6063    /*
Note: See TracChangeset for help on using the changeset viewer.