+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
+
+ * WebCoreSupport/EditorClientGtk.cpp:
+ (WebKit::imContextCommitted):
+ (WebKit::EditorClient::EditorClient):
+ (WebKit::EditorClient::~EditorClient):
+ (WebKit::EditorClient::textFieldDidEndEditing):
+ * webkit/webkitdefines.h:
+ * webkit/webkitnetworkrequest.cpp:
+ (_WebKitNetworkRequestPrivate::webkit_network_request_finalize):
+ (_WebKitNetworkRequestPrivate::webkit_network_request_class_init):
+ (_WebKitNetworkRequestPrivate::webkit_network_request_init):
+ (_WebKitNetworkRequestPrivate::webkit_network_request_new):
+ (_WebKitNetworkRequestPrivate::webkit_network_request_set_uri):
+ (_WebKitNetworkRequestPrivate::webkit_network_request_get_uri):
+ * webkit/webkitnetworkrequest.h:
+ * webkit/webkitprivate.cpp:
+ (WebKit::getViewFromFrame):
+ (WebKit::core):
+ * webkit/webkitprivate.h:
+ * webkit/webkitwebbackforwardlist.cpp:
+ (_WebKitWebBackForwardListPrivate::webkit_web_back_forward_list_new_with_web_view):
+ * webkit/webkitwebbackforwardlist.h:
+ * webkit/webkitwebframe.cpp:
+ * webkit/webkitwebframe.h:
+ * webkit/webkitwebhistoryitem.cpp:
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_dispose):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_finalize):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new_with_core_item):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new_with_data):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_title):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_alternate_title):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_set_alternate_title):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_uri):
+ (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_original_uri):
+ (WebKit::core):
+ * webkit/webkitwebhistoryitem.h:
+ * webkit/webkitwebsettings.h:
+ * webkit/webkitwebview.cpp:
+ * webkit/webkitwebview.h:
+
2008-02-04 Alp Toker <alp@atoker.com>
Rubber-stamped by Mark Rowe.
static void imContextCommitted(GtkIMContext* context, const char* str, EditorClient* client)
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(client->m_webView);
- Frame* frame = webViewData->corePage->focusController()->focusedOrMainFrame();
+ Frame* frame = core(client->m_webView)->focusController()->focusedOrMainFrame();
frame->editor()->insertTextWithoutSendingTextEvent(str, false);
}
EditorClient::EditorClient(WebKitWebView* webView)
: m_webView(webView)
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
- g_signal_connect(webViewData->imContext, "commit", G_CALLBACK(imContextCommitted), this);
+ WebKitWebViewPrivate* priv = m_webView->priv;
+ g_signal_connect(priv->imContext, "commit", G_CALLBACK(imContextCommitted), this);
}
EditorClient::~EditorClient()
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
- g_signal_handlers_disconnect_by_func(webViewData->imContext, (gpointer)imContextCommitted, this);
+ WebKitWebViewPrivate* priv = m_webView->priv;
+ g_signal_handlers_disconnect_by_func(priv->imContext, (gpointer)imContextCommitted, this);
}
void EditorClient::textFieldDidBeginEditing(Element*)
void EditorClient::textFieldDidEndEditing(Element*)
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
+ WebKitWebViewPrivate* priv = m_webView->priv;
- gtk_im_context_focus_out(webViewData->imContext);
+ gtk_im_context_focus_out(priv->imContext);
#ifdef MAEMO_CHANGES
- hildon_gtk_im_context_hide(webViewData->imContext);
+ hildon_gtk_im_context_hide(priv->imContext);
#endif
}
#endif
#ifndef WEBKIT_API
-#define WEBKIT_API
+ #define WEBKIT_API
#endif
G_BEGIN_DECLS
+typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
+typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
+
+typedef struct _WebKitWebBackForwardList WebKitWebBackForwardList;
+typedef struct _WebKitWebBackForwardListClass WebKitWebBackForwardListClass;
+
+typedef struct _WebKitWebHistoryItem WebKitWebHistoryItem;
+typedef struct _WebKitWebHistoryItemClass WebKitWebHistoryItemClass;
+
typedef struct _WebKitWebFrame WebKitWebFrame;
typedef struct _WebKitWebFrameClass WebKitWebFrameClass;
+typedef struct _WebKitWebSettings WebKitWebSettings;
+typedef struct _WebKitWebSettingsClass WebKitWebSettingsClass;
+
typedef struct _WebKitWebView WebKitWebView;
typedef struct _WebKitWebViewClass WebKitWebViewClass;
-typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
-typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
-
G_END_DECLS
#endif
#include "config.h"
#include "webkitnetworkrequest.h"
-#include "webkitprivate.h"
-
-using namespace WebKit;
-using namespace WebCore;
extern "C" {
G_DEFINE_TYPE(WebKitNetworkRequest, webkit_network_request, G_TYPE_OBJECT);
+struct _WebKitNetworkRequestPrivate {
+ gchar* uri;
+};
+
+#define WEBKIT_NETWORK_REQUEST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestPrivate))
+
static void webkit_network_request_finalize(GObject* object)
{
- WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(object);
+ WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(object);
+ WebKitNetworkRequestPrivate* priv = request->priv;
- g_free(requestPrivate->uri);
+ g_free(priv->uri);
G_OBJECT_CLASS(webkit_network_request_parent_class)->finalize(object);
}
static void webkit_network_request_class_init(WebKitNetworkRequestClass* requestClass)
{
- g_type_class_add_private(requestClass, sizeof(WebKitNetworkRequestPrivate));
-
G_OBJECT_CLASS(requestClass)->finalize = webkit_network_request_finalize;
+
+ g_type_class_add_private(requestClass, sizeof(WebKitNetworkRequestPrivate));
}
static void webkit_network_request_init(WebKitNetworkRequest* request)
{
+ WebKitNetworkRequestPrivate* priv = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
+ request->priv = priv;
}
WebKitNetworkRequest* webkit_network_request_new(const gchar* uri)
g_return_val_if_fail(uri, NULL);
WebKitNetworkRequest* request = WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, NULL));
- WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
+ WebKitNetworkRequestPrivate* priv = request->priv;
- requestPrivate->uri = g_strdup(uri);
+ priv->uri = g_strdup(uri);
return request;
}
g_return_if_fail(WEBKIT_IS_NETWORK_REQUEST(request));
g_return_if_fail(uri);
- WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
+ WebKitNetworkRequestPrivate* priv = request->priv;
- g_free(requestPrivate->uri);
- requestPrivate->uri = g_strdup(uri);
+ g_free(priv->uri);
+ priv->uri = g_strdup(uri);
}
const gchar* webkit_network_request_get_uri(WebKitNetworkRequest* request)
{
g_return_val_if_fail(WEBKIT_IS_NETWORK_REQUEST(request), NULL);
- WebKitNetworkRequestPrivate* requestPrivate = WEBKIT_NETWORK_REQUEST_GET_PRIVATE(request);
-
- return requestPrivate->uri;
+ WebKitNetworkRequestPrivate* priv = request->priv;
+ return priv->uri;
}
}
#define WEBKIT_IS_NETWORK_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_NETWORK_REQUEST))
#define WEBKIT_NETWORK_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_NETWORK_REQUEST, WebKitNetworkRequestClass))
+typedef struct _WebKitNetworkRequestPrivate WebKitNetworkRequestPrivate;
struct _WebKitNetworkRequest {
- GObject parent;
+ GObject parent_instance;
+
+ WebKitNetworkRequestPrivate* priv;
};
struct _WebKitNetworkRequestClass {
- GObjectClass parent;
+ GObjectClass parent_class;
};
WEBKIT_API GType
WebKitWebView* getViewFromFrame(WebKitWebFrame* frame)
{
- return webkit_web_frame_get_web_view(frame);
+ WebKitWebFramePrivate* priv = frame->priv;
+ return priv->webView;
}
WebCore::Frame* core(WebKitWebFrame* frame)
if (!frame)
return 0;
- WebKitWebFramePrivate* frame_data = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
- return frame_data ? frame_data->frame : 0;
+ WebKitWebFramePrivate* priv = frame->priv;
+ return priv ? priv->coreFrame : 0;
}
WebKitWebFrame* kit(WebCore::Frame* coreFrame)
if (!webView)
return 0;
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData ? webViewData->corePage : 0;
+ WebKitWebViewPrivate* priv = webView->priv;
+ return priv ? priv->corePage : 0;
}
WebKitWebView* kit(WebCore::Page* corePage)
#define WEBKIT_PRIVATE_H
/*
- * Internal class. This class knows the shared secret of WebKitWebFrame,
- * WebKitNetworkRequest and WebKitWebView.
+ * This file knows the shared secret of WebKitWebView and WebKitWebFrame.
* They are using WebCore which musn't be exposed to the outer world.
*/
#define WEBKIT_WEB_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate;
struct _WebKitWebFramePrivate {
- WebCore::Frame* frame;
+ WebCore::Frame* coreFrame;
WebCore::FrameLoaderClient* client;
WebKitWebView* webView;
gchar* uri;
};
- /* WebKitWebFrame private function */
- WebKitWebFrame* webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*);
+ WebKitWebFrame*
+ webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*);
- /* WebKitWebHistoryItem private function */
- WebKitWebHistoryItem* webkit_web_history_item_new_with_core_item(WebCore::HistoryItem*);
+ WebKitWebHistoryItem*
+ webkit_web_history_item_new_with_core_item(WebCore::HistoryItem*);
-
- // TODO: Move these to webkitwebframe.h once these functions are fully
- // implemented and their API has been discussed.
+ // FIXME: Move these to webkitwebframe.h once their API has been discussed.
WEBKIT_API GSList*
webkit_web_frame_get_children (WebKitWebFrame* frame);
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
WebKitWebBackForwardList* webBackForwardList;
webBackForwardList = WEBKIT_WEB_BACK_FORWARD_LIST(g_object_new(WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, NULL));
- webBackForwardList->priv->backForwardList = webViewData->corePage->backForwardList();
- webBackForwardList->priv->backForwardList->setEnabled(TRUE);
+ WebKitWebBackForwardListPrivate* priv = webBackForwardList->priv;
+
+ priv->backForwardList = core(webView)->backForwardList();
+ priv->backForwardList->setEnabled(TRUE);
return webBackForwardList;
}
#define WEBKIT_IS_WEB_BACK_FORWARD_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_BACK_FORWARD_LIST))
#define WEBKIT_WEB_BACK_FORWARD_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_BACK_FORWARD_LIST, WebKitWebBackForwardListClass))
-
typedef struct _WebKitWebBackForwardListPrivate WebKitWebBackForwardListPrivate;
-typedef struct _WebKitWebBackForwardList WebKitWebBackForwardList;
-typedef struct _WebKitWebBackForwardListClass WebKitWebBackForwardListClass;
-
struct _WebKitWebBackForwardList {
- GObject parent;
+ GObject parent_instance;
- /*< private >*/
- WebKitWebBackForwardListPrivate *priv;
+ WebKitWebBackForwardListPrivate* priv;
};
struct _WebKitWebBackForwardListClass {
- GObjectClass parent;
+ GObjectClass parent_class;
};
WEBKIT_API GType
* Copyright (C) 2007 Holger Hans Peter Freyther
* Copyright (C) 2007 Alp Toker <alp@atoker.com>
* Copyright (C) 2007 Apple Inc.
+ * Copyright (C) 2008 Christian Dywan <christian@imendio.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
static void webkit_web_frame_finalize(GObject* object)
{
- WebKitWebFramePrivate* privateData = WEBKIT_WEB_FRAME_GET_PRIVATE(WEBKIT_WEB_FRAME(object));
- privateData->frame->loader()->cancelAndClear();
- g_free(privateData->name);
- g_free(privateData->title);
- g_free(privateData->uri);
- delete privateData->frame;
+ WebKitWebFrame* frame = WEBKIT_WEB_FRAME(object);
+ WebKitWebFramePrivate* priv = frame->priv;
+
+ priv->coreFrame->loader()->cancelAndClear();
+ g_free(priv->name);
+ g_free(priv->title);
+ g_free(priv->uri);
+ delete priv->coreFrame;
G_OBJECT_CLASS(webkit_web_frame_parent_class)->finalize(object);
}
{
webkit_init();
- g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));
-
/*
* signals
*/
"The current URI of the contents displayed by the frame",
NULL,
WEBKIT_PARAM_READABLE));
+
+ g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));
}
static void webkit_web_frame_init(WebKitWebFrame* frame)
{
+ WebKitWebFramePrivate* priv = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
+
// TODO: Move constructor code here.
+ frame->priv = priv;
}
/**
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
WebKitWebFrame* frame = WEBKIT_WEB_FRAME(g_object_new(WEBKIT_TYPE_WEB_FRAME, NULL));
- WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* priv = frame->priv;
+ WebKitWebViewPrivate* viewPriv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- frameData->client = new WebKit::FrameLoaderClient(frame);
- frameData->frame = new Frame(webViewData->corePage, 0, frameData->client);
+ priv->client = new WebKit::FrameLoaderClient(frame);
+ priv->coreFrame = new Frame(viewPriv->corePage, 0, priv->client);
- FrameView* frameView = new FrameView(frameData->frame);
+ FrameView* frameView = new FrameView(priv->coreFrame);
frameView->setContainingWindow(GTK_CONTAINER(webView));
frameView->setGtkAdjustments(GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)),
GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)));
- frameData->frame->setView(frameView);
- frameData->frame->init();
- frameData->webView = webView;
- frameData->name = 0;
- frameData->title = 0;
- frameData->uri = 0;
+ priv->coreFrame->setView(frameView);
+ priv->coreFrame->init();
+ priv->webView = webView;
return frame;
}
WebKitWebFrame* webkit_web_frame_init_with_web_view(WebKitWebView* webView, HTMLFrameOwnerElement* element)
{
WebKitWebFrame* frame = WEBKIT_WEB_FRAME(g_object_new(WEBKIT_TYPE_WEB_FRAME, NULL));
- WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* priv = frame->priv;
+ WebKitWebViewPrivate* viewPriv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- frameData->client = new WebKit::FrameLoaderClient(frame);
- frameData->frame = new Frame(webViewData->corePage, element, frameData->client);
+ priv->client = new WebKit::FrameLoaderClient(frame);
+ priv->coreFrame = new Frame(viewPriv->corePage, element, priv->client);
- FrameView* frameView = new FrameView(frameData->frame);
+ FrameView* frameView = new FrameView(priv->coreFrame);
frameView->setContainingWindow(GTK_CONTAINER(webView));
- frameData->frame->setView(frameView);
+ priv->coreFrame->setView(frameView);
frameView->deref();
- frameData->frame->init();
- frameData->webView = webView;
+ priv->coreFrame->init();
+ priv->webView = webView;
return frame;
}
{
g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
- return frameData->title;
+ WebKitWebFramePrivate* priv = frame->priv;
+ return priv->title;
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
- return frameData->uri;
+ WebKitWebFramePrivate* priv = frame->priv;
+ return priv->uri;
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
- return frameData->webView;
+ WebKitWebFramePrivate* priv = frame->priv;
+ return priv->webView;
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
+ WebKitWebFramePrivate* priv = frame->priv;
- if (frameData->name)
- return frameData->name;
+ if (priv->name)
+ return priv->name;
Frame* coreFrame = core(frame);
g_return_val_if_fail(coreFrame, NULL);
String string = coreFrame->tree()->name();
- frameData->name = g_strdup(string.utf8().data());
-
- return frameData->name;
+ priv->name = g_strdup(string.utf8().data());
+ return priv->name;
}
/**
Frame* coreFrame = core(frame);
g_return_if_fail(coreFrame);
- // TODO: Use the ResourceRequest carried by WebKitNetworkRequest when it gets implemented.
+ // TODO: Use the ResourceRequest carried by WebKitNetworkRequest when it is implemented.
DeprecatedString string = DeprecatedString::fromUtf8(webkit_network_request_get_uri(request));
coreFrame->loader()->load(ResourceRequest(KURL(string)));
}
#include <JavaScriptCore/JSBase.h>
#include <webkit/webkitdefines.h>
+#include <webkit/webkitnetworkrequest.h>
G_BEGIN_DECLS
#define WEBKIT_IS_WEB_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_FRAME))
#define WEBKIT_WEB_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFrameClass))
+typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate;
struct _WebKitWebFrame {
- GObject parent;
+ GObject parent_instance;
+
+ WebKitWebFramePrivate* priv;
};
struct _WebKitWebFrameClass {
- GObjectClass parent;
+ GObjectClass parent_class;
void (*_webkit_reserved1) (void);
void (*_webkit_reserved2) (void);
static void webkit_web_history_item_dispose(GObject* object)
{
- WebKitWebHistoryItem* item = WEBKIT_WEB_HISTORY_ITEM(object);
+ WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(object);
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
- webkit_history_item_remove(item->priv->historyItem);
-
- delete item->priv->historyItem;
+ webkit_history_item_remove(priv->historyItem);
+ delete priv->historyItem;
/* destroy table if empty */
GHashTable* table = webkit_history_items();
G_OBJECT_CLASS(webkit_web_history_item_parent_class)->dispose(object);
}
-
static void webkit_web_history_item_finalize(GObject* object)
{
- WebKitWebHistoryItem* historyItem = WEBKIT_WEB_HISTORY_ITEM(object);
+ WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(object);
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
- g_free(historyItem->priv->title);
- g_free(historyItem->priv->alternateTitle);
- g_free(historyItem->priv->uri);
- g_free(historyItem->priv->originalUri);
+ g_free(priv->title);
+ g_free(priv->alternateTitle);
+ g_free(priv->uri);
+ g_free(priv->originalUri);
G_OBJECT_CLASS(webkit_web_history_item_parent_class)->finalize(object);
}
WebKitWebHistoryItem* webkit_web_history_item_new_with_core_item(WebCore::HistoryItem* item)
{
WebKitWebHistoryItem* webHistoryItem = kit(item);
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
if (!webHistoryItem) {
webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
- webHistoryItem->priv->historyItem = item;
- webkit_history_item_add(webHistoryItem, webHistoryItem->priv->historyItem);
+ priv->historyItem = item;
+ webkit_history_item_add(webHistoryItem, priv->historyItem);
}
return webHistoryItem;
WebKitWebHistoryItem* webkit_web_history_item_new(void)
{
WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL));
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
- webHistoryItem->priv->historyItem = new WebCore::HistoryItem();
-
- webkit_history_item_add(webHistoryItem, webHistoryItem->priv->historyItem);
+ priv->historyItem = new WebCore::HistoryItem();
+ webkit_history_item_add(webHistoryItem, priv->historyItem);
return webHistoryItem;
}
-
/**
* webkit_web_history_item_new_with_data:
* @uri: the uri of the page
WebCore::String historyTitle(title);
WebKitWebHistoryItem* webHistoryItem = webkit_web_history_item_new();
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
- webHistoryItem->priv->historyItem = new WebCore::HistoryItem(historyUri, historyTitle);
-
- webkit_history_item_add(webHistoryItem, webHistoryItem->priv->historyItem);
+ priv->historyItem = new WebCore::HistoryItem(historyUri, historyTitle);
+ webkit_history_item_add(webHistoryItem, priv->historyItem);
return webHistoryItem;
}
{
g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
- WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));
+ WebCore::HistoryItem* item = core(webHistoryItem);
g_return_val_if_fail(item != NULL, NULL);
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
WebCore::String title = item->title();
+ g_free(priv->title);
+ priv->title = g_strdup(title.utf8().data());
- g_free(webHistoryItem->priv->title);
-
- webHistoryItem->priv->title = g_strdup(title.utf8().data());
-
- return webHistoryItem->priv->title;
+ return priv->title;
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
- WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));
+ WebCore::HistoryItem* item = core(webHistoryItem);
g_return_val_if_fail(item != NULL, NULL);
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
WebCore::String alternateTitle = item->alternateTitle();
+ g_free(priv->alternateTitle);
+ priv->alternateTitle = g_strdup(alternateTitle.utf8().data());
- g_free(webHistoryItem->priv->alternateTitle);
-
- webHistoryItem->priv->alternateTitle = g_strdup(alternateTitle.utf8().data());
-
- return webHistoryItem->priv->alternateTitle;
+ return priv->alternateTitle;
}
/**
{
g_return_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem));
- WebCore::HistoryItem* item = core(WEBKIT_WEB_HISTORY_ITEM(webHistoryItem));
+ WebCore::HistoryItem* item = core(webHistoryItem);
- const WebCore::String alternateTitle = title;
- item->setAlternateTitle(alternateTitle);
+ item->setAlternateTitle(WebCore::String::fromUTF8(title));
}
/**
g_return_val_if_fail(item != NULL, NULL);
WebCore::String uri = item->urlString();
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
+ g_free(priv->uri);
+ priv->uri = g_strdup(uri.utf8().data());
- g_free(webHistoryItem->priv->uri);
-
- webHistoryItem->priv->uri = g_strdup(uri.utf8().data());
-
- return webHistoryItem->priv->uri;
+ return priv->uri;
}
/**
g_return_val_if_fail(item != NULL, NULL);
WebCore::String originalUri = item->originalURLString();
-
- g_free(webHistoryItem->priv->originalUri);
-
- webHistoryItem->priv->originalUri = g_strdup(originalUri.utf8().data());
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
+ g_free(priv->originalUri);
+ priv->originalUri = g_strdup(originalUri.utf8().data());
return webHistoryItem->priv->originalUri;
}
{
g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem), NULL);
- WebCore::HistoryItem* historyItem = webHistoryItem->priv->historyItem;
+ WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
+ WebCore::HistoryItem* historyItem = priv->historyItem;
return historyItem ? historyItem : 0;
}
#define WEBKIT_IS_WEB_HISTORY_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_HISTORY_ITEM))
#define WEBKIT_WEB_HISTORY_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_HISTORY_ITEM, WebKitWebHistoryItemClass))
-
typedef struct _WebKitWebHistoryItemPrivate WebKitWebHistoryItemPrivate;
-typedef struct _WebKitWebHistoryItem WebKitWebHistoryItem;
-typedef struct _WebKitWebHistoryItemClass WebKitWebHistoryItemClass;
-
struct _WebKitWebHistoryItem {
- GObject parent;
+ GObject parent_instance;
- /*< private >*/
WebKitWebHistoryItemPrivate* priv;
};
struct _WebKitWebHistoryItemClass {
- GObjectClass parent;
+ GObjectClass parent_class;
};
WEBKIT_API GType
#define WEBKIT_IS_WEB_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_SETTINGS))
#define WEBKIT_WEB_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsClass))
-typedef struct _WebKitWebSettings WebKitWebSettings;
-typedef struct _WebKitWebSettingsPrivate WebKitWebSettingsPrivate;
-typedef struct _WebKitWebSettingsClass WebKitWebSettingsClass;
+typedef struct _WebKitWebSettingsPrivate WebKitWebSettingsPrivate;
struct _WebKitWebSettings {
GObject parent_instance;
+
WebKitWebSettingsPrivate* priv;
};
static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event)
{
- Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+
+ Frame* frame = core(webView)->mainFrame();
GdkRectangle clip;
gdk_region_get_clipbox(event->region, &clip);
cairo_t* cr = gdk_cairo_create(event->window);
static gboolean webkit_web_view_key_press_event(GtkWidget* widget, GdkEventKey* event)
{
- Frame* frame = core(WEBKIT_WEB_VIEW(widget))->focusController()->focusedOrMainFrame();
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+
+ Frame* frame = core(webView)->focusController()->focusedOrMainFrame();
PlatformKeyboardEvent keyboardEvent(event);
if (frame->eventHandler()->keyEvent(keyboardEvent))
static gboolean webkit_web_view_key_release_event(GtkWidget* widget, GdkEventKey* event)
{
- Frame* frame = core(WEBKIT_WEB_VIEW(widget))->focusController()->focusedOrMainFrame();
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+
+ Frame* frame = core(webView)->focusController()->focusedOrMainFrame();
PlatformKeyboardEvent keyboardEvent(event);
if (frame->eventHandler()->keyEvent(keyboardEvent))
static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventButton* event)
{
- Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+
+ Frame* frame = core(webView)->mainFrame();
// FIXME: need to keep track of subframe focus for key events
- gtk_widget_grab_focus(GTK_WIDGET(widget));
+ gtk_widget_grab_focus(widget);
if (event->button == 3)
- return webkit_web_view_forward_context_menu_event(WEBKIT_WEB_VIEW(widget), PlatformMouseEvent(event));
+ return webkit_web_view_forward_context_menu_event(webView, PlatformMouseEvent(event));
return frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(event));
}
static gboolean webkit_web_view_button_release_event(GtkWidget* widget, GdkEventButton* event)
{
- Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
-
- WebKitWebView* web_view = WEBKIT_WEB_VIEW(widget);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(web_view);
- Frame* focusedFrame = webViewData->corePage->focusController()->focusedFrame();
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+ WebKitWebViewPrivate* priv = webView->priv;
+ Frame* focusedFrame = core(webView)->focusController()->focusedFrame();
if (focusedFrame && focusedFrame->editor()->canEdit()) {
GdkWindow* window = gtk_widget_get_parent_window(widget);
- gtk_im_context_set_client_window(webViewData->imContext, window);
+ gtk_im_context_set_client_window(priv->imContext, window);
#ifdef MAEMO_CHANGES
- hildon_gtk_im_context_filter_event(webViewData->imContext, (GdkEvent*)event);
- hildon_gtk_im_context_show(webViewData->imContext);
+ hildon_gtk_im_context_filter_event(priv->imContext, (GdkEvent*)event);
+ hildon_gtk_im_context_show(priv->imContext);
#endif
}
- return frame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));
+ return focusedFrame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));
}
static gboolean webkit_web_view_motion_event(GtkWidget* widget, GdkEventMotion* event)
{
- Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+
+ Frame* frame = core(webView)->mainFrame();
return frame->eventHandler()->mouseMoved(PlatformMouseEvent(event));
}
static gboolean webkit_web_view_scroll_event(GtkWidget* widget, GdkEventScroll* event)
{
- Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+
+ Frame* frame = core(webView)->mainFrame();
PlatformWheelEvent wheelEvent(event);
return frame->eventHandler()->handleWheelEvent(wheelEvent);
}
{
GTK_WIDGET_CLASS(webkit_web_view_parent_class)->size_allocate(widget,allocation);
- Frame* frame = core(webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(widget)));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+
+ Frame* frame = core(webView)->mainFrame();
frame->view()->resize(allocation->width, allocation->height);
frame->forceLayout();
frame->view()->adjustViewSize();
GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
if (GTK_WIDGET_TOPLEVEL(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
+
+ Frame* frame = core(webView)->mainFrame();
core(webView)->focusController()->setActive(frame);
}
return GTK_WIDGET_CLASS(webkit_web_view_parent_class)->focus_in_event(widget, event);
static void webkit_web_view_container_add(GtkContainer* container, GtkWidget* widget)
{
WebKitWebView* webView = WEBKIT_WEB_VIEW(container);
- WebKitWebViewPrivate* private_data = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebViewPrivate* priv = webView->priv;
- private_data->children.add(widget);
+ priv->children.add(widget);
if (GTK_WIDGET_REALIZED(container))
gtk_widget_set_parent_window(widget, GTK_WIDGET(webView)->window);
gtk_widget_set_parent(widget, GTK_WIDGET(container));
static void webkit_web_view_container_remove(GtkContainer* container, GtkWidget* widget)
{
- WebKitWebViewPrivate* private_data = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(container));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(container);
+ WebKitWebViewPrivate* priv = webView->priv;
- if (private_data->children.contains(widget)) {
+ if (priv->children.contains(widget)) {
gtk_widget_unparent(widget);
- private_data->children.remove(widget);
+ priv->children.remove(widget);
}
}
static void webkit_web_view_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
{
- WebKitWebViewPrivate* privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(container));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(container);
+ WebKitWebViewPrivate* priv = webView->priv;
- HashSet<GtkWidget*> children = privateData->children;
+ HashSet<GtkWidget*> children = priv->children;
HashSet<GtkWidget*>::const_iterator end = children.end();
for (HashSet<GtkWidget*>::const_iterator current = children.begin(); current != end; ++current)
(*callback)(*current, callbackData);
static void webkit_web_view_finalize(GObject* object)
{
- webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(object);
+ WebKitWebViewPrivate* priv = webView->priv;
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(object));
+ webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object));
- delete webViewData->corePage;
+ delete priv->corePage;
- g_object_unref(webViewData->backForwardList);
- g_object_unref(webViewData->webSettings);
- g_object_unref(webViewData->mainFrame);
- g_object_unref(webViewData->imContext);
- gtk_target_list_unref(webViewData->copy_target_list);
- gtk_target_list_unref(webViewData->paste_target_list);
- delete webViewData->userAgent;
+ g_object_unref(priv->backForwardList);
+ g_object_unref(priv->webSettings);
+ g_object_unref(priv->mainFrame);
+ g_object_unref(priv->imContext);
+ gtk_target_list_unref(priv->copy_target_list);
+ gtk_target_list_unref(priv->paste_target_list);
+ delete priv->userAgent;
G_OBJECT_CLASS(webkit_web_view_parent_class)->finalize(object);
}
webkit_init();
- g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
-
/*
* Signals
*/
"Whether content can be modified by the user",
FALSE,
WEBKIT_PARAM_READWRITE));
+
+ g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
}
static void webkit_web_view_screen_changed(WebKitWebView* webView, GdkScreen* previousScreen, gpointer userdata)
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- WebKitWebSettings* webSettings = webViewData->webSettings;
- Settings* settings = webViewData->corePage->settings();
+ WebKitWebViewPrivate* priv = webView->priv;
+ WebKitWebSettings* webSettings = priv->webSettings;
+ Settings* settings = core(webView)->settings();
guint defaultFontSize, defaultMonospaceFontSize, minimumFontSize, minimumLogicalFontSize;
static void webkit_web_view_update_settings(WebKitWebView* webView)
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- WebKitWebSettings* webSettings = webViewData->webSettings;
- Settings* settings = webViewData->corePage->settings();
+ WebKitWebViewPrivate* priv = webView->priv;
+ WebKitWebSettings* webSettings = priv->webSettings;
+ Settings* settings = core(webView)->settings();
gchar* defaultEncoding, *cursiveFontFamily, *defaultFontFamily, *fantasyFontFamily, *monospaceFontFamily, *sansSerifFontFamily, *serifFontFamily, *userStylesheetUri;
gboolean autoLoadImages, autoShrinkImages, printBackgrounds, enableScripts, enablePlugins, resizableTextAreas;
static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GParamSpec* pspec, WebKitWebView* webView)
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- Settings* settings = webViewData->corePage->settings();
+ Settings* settings = core(webView)->settings();
const gchar* name = g_intern_string(pspec->name);
GValue value = {0, 0};
static void webkit_web_view_init(WebKitWebView* webView)
{
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- webViewData->imContext = gtk_im_multicontext_new();
- webViewData->corePage = new Page(new WebKit::ChromeClient(webView), new WebKit::ContextMenuClient, new WebKit::EditorClient(webView), new WebKit::DragClient, new WebKit::InspectorClient);
+ WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ webView->priv = priv;
- webViewData->webSettings = webkit_web_settings_new();
- webkit_web_view_update_settings(webView);
- g_signal_connect(webView, "screen-changed", G_CALLBACK(webkit_web_view_screen_changed), NULL);
- g_signal_connect(webViewData->webSettings, "notify", G_CALLBACK(webkit_web_view_settings_notify), webView);
+ priv->imContext = gtk_im_multicontext_new();
+ priv->corePage = new Page(new WebKit::ChromeClient(webView), new WebKit::ContextMenuClient, new WebKit::EditorClient(webView), new WebKit::DragClient, new WebKit::InspectorClient);
GTK_WIDGET_SET_FLAGS(webView, GTK_CAN_FOCUS);
- webViewData->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView));
- webViewData->lastPopupXPosition = webViewData->lastPopupYPosition = -1;
- webViewData->editable = false;
+ priv->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView));
+ priv->lastPopupXPosition = priv->lastPopupYPosition = -1;
+ priv->editable = false;
- /* Initialize the view's back/forward list */
- webViewData->backForwardList = webkit_web_back_forward_list_new_with_web_view(webView);
+ priv->backForwardList = webkit_web_back_forward_list_new_with_web_view(webView);
#if GTK_CHECK_VERSION(2,10,0)
GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
GdkAtom textHtml = gdk_atom_intern("text/html", false);
#endif
/* Targets for copy */
- webViewData->copy_target_list = gtk_target_list_new(NULL, 0);
- gtk_target_list_add(webViewData->copy_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
- gtk_target_list_add_text_targets(webViewData->copy_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
+ priv->copy_target_list = gtk_target_list_new(NULL, 0);
+ gtk_target_list_add(priv->copy_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
+ gtk_target_list_add_text_targets(priv->copy_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
/* Targets for pasting */
- webViewData->paste_target_list = gtk_target_list_new(NULL, 0);
- gtk_target_list_add(webViewData->paste_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
- gtk_target_list_add_text_targets(webViewData->paste_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
+ priv->paste_target_list = gtk_target_list_new(NULL, 0);
+ gtk_target_list_add(priv->paste_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
+ gtk_target_list_add_text_targets(priv->paste_target_list, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
+ priv->webSettings = webkit_web_settings_new();
+ webkit_web_view_update_settings(webView);
+ g_signal_connect(webView, "screen-changed", G_CALLBACK(webkit_web_view_screen_changed), NULL);
+ g_signal_connect(priv->webSettings, "notify", G_CALLBACK(webkit_web_view_settings_notify), webView);
}
GtkWidget* webkit_web_view_new(void)
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(WEBKIT_IS_WEB_SETTINGS(webSettings));
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- g_signal_handlers_disconnect_by_func(webViewData->webSettings, (gpointer)webkit_web_view_settings_notify, webView);
- g_object_unref(webViewData->webSettings);
+ WebKitWebViewPrivate* priv = webView->priv;
+ g_signal_handlers_disconnect_by_func(priv->webSettings, (gpointer)webkit_web_view_settings_notify, webView);
+ g_object_unref(priv->webSettings);
g_object_ref(webSettings);
- webViewData->webSettings = webSettings;
+ priv->webSettings = webSettings;
webkit_web_view_update_settings(webView);
g_signal_connect(webSettings, "notify", G_CALLBACK(webkit_web_view_settings_notify), webView);
}
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData->webSettings;
+ WebKitWebViewPrivate* priv = webView->priv;
+ return priv->webSettings;
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(webView));
+ WebKitWebViewPrivate* priv = webView->priv;
- if (!webViewData->corePage || !webViewData->corePage->backForwardList()->enabled())
+ if (!core(webView) || !core(webView)->backForwardList()->enabled())
return NULL;
- return webViewData->backForwardList;
+ return priv->backForwardList;
}
/**
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
g_return_val_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(item), FALSE);
+ // FIXME: This always returns TRUE
core(webView)->goToItem(core(item), FrameLoadTypeIndexedBackForward);
return TRUE;
}
* webkit_web_view_go_backward:
* @webView: the #WebKitWebView
*
+ * @Deprecated: Use webkit_web_view_go_back() instead.
+ *
* Go to the previous page, if there's any.
*/
void webkit_web_view_go_backward(WebKitWebView* webView)
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
+ Frame* frame = core(webView)->mainFrame();
frame->loader()->goBackOrForward(steps);
}
*
* Checks whether the view can go back to the previous page
*
+ * @Deprecated: Use webkit_web_view_can_go_back() instead.
+ *
* Return value: %TRUE if the page can go back, otherwise returns %FALSE
*/
gboolean webkit_web_view_can_go_backward(WebKitWebView* webView)
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- Page* page = core(webView);
-
- if (!page || !page->backForwardList()->backItem())
+ if (!core(webView) || !core(webView)->backForwardList()->backItem())
return FALSE;
return TRUE;
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
+ Frame* frame = core(webView)->mainFrame();
return frame->loader()->canGoBackOrForward(steps);
}
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(uri);
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
+ Frame* frame = core(webView)->mainFrame();
DeprecatedString string = DeprecatedString::fromUtf8(uri);
frame->loader()->load(ResourceRequest(KURL(string)));
}
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
- frame->loader()->reload();
+ core(webView)->mainFrame()->loader()->reload();
}
void webkit_web_view_load_string(WebKitWebView* webView, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUri)
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(content);
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
+ Frame* frame = core(webView)->mainFrame();
KURL url(baseUri ? DeprecatedString::fromUtf8(baseUri) : "");
RefPtr<SharedBuffer> sharedBuffer = new SharedBuffer(strdup(content), strlen(content));
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
+ Frame* frame = core(webView)->mainFrame();
if (FrameLoader* loader = frame->loader())
loader->stopAllLoaders();
TextCaseSensitivity caseSensitivity = caseSensitive ? TextCaseSensitive : TextCaseInsensitive;
FindDirection direction = forward ? FindDirectionForward : FindDirectionBackward;
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData->corePage->findString(String::fromUTF8(string), caseSensitivity, direction, shouldWrap);
+ return core(webView)->findString(String::fromUTF8(string), caseSensitivity, direction, shouldWrap);
}
/**
TextCaseSensitivity caseSensitivity = caseSensitive ? TextCaseSensitive : TextCaseInsensitive;
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData->corePage->markAllMatchesForText(String::fromUTF8(string), caseSensitivity, false, limit);
+ return core(webView)->markAllMatchesForText(String::fromUTF8(string), caseSensitivity, false, limit);
}
/**
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
- frameData->frame->setMarkedTextMatchesAreHighlighted(shouldHighlight);
+ core(webView)->mainFrame()->setMarkedTextMatchesAreHighlighted(shouldHighlight);
}
/**
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData->corePage->unmarkAllTextMatches();
+ return core(webView)->unmarkAllTextMatches();
}
WebKitWebFrame* webkit_web_view_get_main_frame(WebKitWebView* webView)
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData->mainFrame;
+ WebKitWebViewPrivate* priv = webView->priv;
+ return priv->mainFrame;
}
void webkit_web_view_execute_script(WebKitWebView* webView, const gchar* script)
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(script);
- Frame* frame = core(webkit_web_view_get_main_frame(webView));
- if (FrameLoader* loader = frame->loader())
+ if (FrameLoader* loader = core(webView)->mainFrame()->loader())
loader->executeScript(String::fromUTF8(script), true);
}
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return !webViewData->corePage->selection().isNone();
+ return !core(webView)->selection().isNone();
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- ASSERT(webViewData);
+ WebKitWebViewPrivate* priv = webView->priv;
- return webViewData->editable;
+ return priv->editable;
}
/**
void webkit_web_view_set_editable(WebKitWebView* webView, gboolean flag)
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- flag = flag != FALSE;
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- ASSERT(webViewData);
+ WebKitWebViewPrivate* priv = webView->priv;
- Frame* mainFrame = core(webViewData->mainFrame);
- g_return_if_fail(mainFrame);
+ Frame* frame = core(webView)->mainFrame();
+ g_return_if_fail(frame);
// TODO: What happens when the frame is replaced?
- if (flag == webViewData->editable)
+ flag = flag != FALSE;
+ if (flag == priv->editable)
return;
- webViewData->editable = flag;
+ priv->editable = flag;
if (flag) {
- mainFrame->applyEditingStyleToBodyElement();
+ frame->applyEditingStyleToBodyElement();
// TODO: If the WebKitWebView is made editable and the selection is empty, set it to something.
//if (!webkit_web_view_get_selected_dom_range(webView))
// mainFrame->setSelectionFromNone();
} else
- mainFrame->removeEditingStyleFromBodyElement();
+ frame->removeEditingStyleFromBodyElement();
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData->copy_target_list;
+ WebKitWebViewPrivate* priv = webView->priv;
+ return priv->copy_target_list;
}
/**
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- return webViewData->paste_target_list;
+ WebKitWebViewPrivate* priv = webView->priv;
+ return priv->paste_target_list;
}
}
#define WEBKIT_IS_WEB_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_WEB_VIEW))
#define WEBKIT_WEB_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
+typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
typedef enum {
WEBKIT_NAVIGATION_RESPONSE_ACCEPT,
} WebKitWebViewTargetInfo;
struct _WebKitWebView {
- GtkContainer parent;
+ GtkContainer parent_instance;
+
+ WebKitWebViewPrivate* priv;
};
struct _WebKitWebViewClass {
- GtkContainerClass parent;
+ GtkContainerClass parent_class;
/*
* default handler/virtual methods
git://git.webkit.org / WebKit-https.git / commitdiff