Commit 3ad41664 authored by kov@webkit.org's avatar kov@webkit.org

2010-12-10 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>

        Reviewed by Martin Robinson.

        [GTK] Split webkitprivate.{cpp,h} in more manageable chunks
        https://bugs.webkit.org/show_bug.cgi?id=50698

        Split private bits of several objects to their own private
        headers, and to their implementation files.

        * GNUmakefile.am:
        * WebCoreSupport/ChromeClientGtk.cpp:
        * WebCoreSupport/EditorClientGtk.cpp:
        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::dispatchWillSendRequest):
        * webkit/webkitdownload.cpp:
        (webkit_download_set_response):
        * webkit/webkitdownloadprivate.h: Added.
        * webkit/webkithittestresult.cpp:
        (WebKit::kit):
        * webkit/webkithittestresultprivate.h: Added.
        * webkit/webkitnetworkresponse.cpp:
        (WebKit::core):
        (WebKit::kitNew):
        * webkit/webkitnetworkresponseprivate.h: Added.
        * webkit/webkitprivate.cpp:
        * webkit/webkitprivate.h:
        * webkit/webkitsecurityorigin.cpp:
        (webkit_security_origin_get_web_database):
        (WebKit::core):
        (WebKit::kit):
        * webkit/webkitsecurityoriginprivate.h: Added.
        * webkit/webkitviewportattributes.cpp:
        * webkit/webkitviewportattributesprivate.h: Added.
        * webkit/webkitwebbackforwardlist.cpp:
        * webkit/webkitwebbackforwardlistprivate.h: Added.
        * webkit/webkitwebdatabase.cpp:
        * webkit/webkitwebframe.cpp:
        (webkit_web_frame_get_network_response):
        * webkit/webkitwebhistoryitem.cpp:
        * webkit/webkitwebhistoryitemprivate.h: Added.
        * webkit/webkitwebnavigationaction.cpp:
        (WebKit::kit):
        (WebKit::core):
        * webkit/webkitwebnavigationactionprivate.h: Added.
        * webkit/webkitwebpolicydecision.cpp:
        * webkit/webkitwebpolicydecisionprivate.h: Added.
        * webkit/webkitwebresource.cpp:
        * webkit/webkitwebresourceprivate.h: Added.
        * webkit/webkitwebsettings.cpp:
        * webkit/webkitwebsettingsprivate.h: Added.
        * webkit/webkitwebview.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73855 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3cb966d5
2010-12-10 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Reviewed by Martin Robinson.
[GTK] Split webkitprivate.{cpp,h} in more manageable chunks
https://bugs.webkit.org/show_bug.cgi?id=50698
Split private bits of several objects to their own private
headers, and to their implementation files.
* GNUmakefile.am:
* WebCoreSupport/ChromeClientGtk.cpp:
* WebCoreSupport/EditorClientGtk.cpp:
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::dispatchWillSendRequest):
* webkit/webkitdownload.cpp:
(webkit_download_set_response):
* webkit/webkitdownloadprivate.h: Added.
* webkit/webkithittestresult.cpp:
(WebKit::kit):
* webkit/webkithittestresultprivate.h: Added.
* webkit/webkitnetworkresponse.cpp:
(WebKit::core):
(WebKit::kitNew):
* webkit/webkitnetworkresponseprivate.h: Added.
* webkit/webkitprivate.cpp:
* webkit/webkitprivate.h:
* webkit/webkitsecurityorigin.cpp:
(webkit_security_origin_get_web_database):
(WebKit::core):
(WebKit::kit):
* webkit/webkitsecurityoriginprivate.h: Added.
* webkit/webkitviewportattributes.cpp:
* webkit/webkitviewportattributesprivate.h: Added.
* webkit/webkitwebbackforwardlist.cpp:
* webkit/webkitwebbackforwardlistprivate.h: Added.
* webkit/webkitwebdatabase.cpp:
* webkit/webkitwebframe.cpp:
(webkit_web_frame_get_network_response):
* webkit/webkitwebhistoryitem.cpp:
* webkit/webkitwebhistoryitemprivate.h: Added.
* webkit/webkitwebnavigationaction.cpp:
(WebKit::kit):
(WebKit::core):
* webkit/webkitwebnavigationactionprivate.h: Added.
* webkit/webkitwebpolicydecision.cpp:
* webkit/webkitwebpolicydecisionprivate.h: Added.
* webkit/webkitwebresource.cpp:
* webkit/webkitwebresourceprivate.h: Added.
* webkit/webkitwebsettings.cpp:
* webkit/webkitwebsettingsprivate.h: Added.
* webkit/webkitwebview.cpp:
2010-12-10 Alejandro G. Castro <alex@igalia.com>
Unreviewed, fixed small typo in the name of a function.
......
......@@ -160,12 +160,12 @@ webkitgtk_sources += \
WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
WebKit/gtk/WebCoreSupport/DragClientGtk.h \
WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp \
WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h \
WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp \
WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h \
WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h \
WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp \
WebKit/gtk/WebCoreSupport/FullscreenVideoController.h \
......@@ -176,26 +176,30 @@ webkitgtk_sources += \
WebKit/gtk/webkit/webkitapplicationcache.cpp \
WebKit/gtk/webkit/webkitdownload.cpp \
WebKit/gtk/webkit/webkiterror.cpp \
WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
WebKit/gtk/webkit/webkithittestresult.cpp \
WebKit/gtk/webkit/webkitnetworkrequest.cpp \
WebKit/gtk/webkit/webkitnetworkrequestprivate.h \
WebKit/gtk/webkit/webkitnetworkresponse.cpp \
WebKit/gtk/webkit/webkitnetworkresponseprivate.h \
WebKit/gtk/webkit/webkitprivate.cpp \
WebKit/gtk/webkit/webkitprivate.h \
WebKit/gtk/webkit/webkitsecurityorigin.cpp \
WebKit/gtk/webkit/webkitsoupauthdialog.c \
WebKit/gtk/webkit/webkitversion.cpp \
WebKit/gtk/webkit/webkitviewportattributes.cpp \
WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
WebKit/gtk/webkit/webkitwebdatabase.cpp \
WebKit/gtk/webkit/webkitwebdatasource.cpp \
WebKit/gtk/webkit/webkitwebframe.cpp \
WebKit/gtk/webkit/webkitwebframeprivate.h \
WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
WebKit/gtk/webkit/webkitwebinspector.cpp \
WebKit/gtk/webkit/webkitwebinspectorprivate.h \
WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
WebKit/gtk/webkit/webkitwebnavigationactionprivate.h \
WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
WebKit/gtk/webkit/webkitwebresource.cpp \
WebKit/gtk/webkit/webkitwebdatabase.cpp \
WebKit/gtk/webkit/webkitsecurityorigin.cpp \
WebKit/gtk/webkit/webkitwebsettings.cpp \
WebKit/gtk/webkit/webkitwebview.cpp \
WebKit/gtk/webkit/webkitwebviewprivate.h \
......
......@@ -50,6 +50,8 @@
#include "webkitgeolocationpolicydecision.h"
#include "webkitnetworkrequest.h"
#include "webkitprivate.h"
#include "webkitsecurityoriginprivate.h"
#include "webkitviewportattributesprivate.h"
#include "webkitwebframeprivate.h"
#include "webkitwebview.h"
#include "webkitwebviewprivate.h"
......
......@@ -46,6 +46,7 @@
#include "WindowsKeyboardCodes.h"
#include "webkitmarshal.h"
#include "webkitprivate.h"
#include "webkitwebsettingsprivate.h"
#include "webkitwebviewprivate.h"
#include <wtf/text/CString.h>
......
......@@ -62,11 +62,18 @@
#include "webkitnetworkrequest.h"
#include "webkitnetworkrequestprivate.h"
#include "webkitnetworkresponse.h"
#include "webkitnetworkresponseprivate.h"
#include "webkitprivate.h"
#include "webkitviewportattributes.h"
#include "webkitviewportattributesprivate.h"
#include "webkitwebframe.h"
#include "webkitwebframeprivate.h"
#include "webkitwebnavigationaction.h"
#include "webkitwebnavigationactionprivate.h"
#include "webkitwebpolicydecision.h"
#include "webkitwebpolicydecisionprivate.h"
#include "webkitwebresource.h"
#include "webkitwebresourceprivate.h"
#include "webkitwebview.h"
#include "webkitwebviewprivate.h"
#include <JavaScriptCore/APICast.h>
......@@ -309,7 +316,7 @@ void FrameLoaderClient::dispatchWillSendRequest(WebCore::DocumentLoader* loader,
if (redirectResponse.isNull())
static_cast<WebKit::DocumentLoader*>(loader)->increaseLoadCount(identifier);
else
networkResponse = adoptPlatformRef(webkit_network_response_new_with_core_response(redirectResponse));
networkResponse = adoptPlatformRef(kitNew(redirectResponse));
WebKitWebView* webView = getViewFromFrame(m_frame);
GOwnPtr<gchar> identifierString(toString(identifier));
......
......@@ -29,10 +29,12 @@
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "webkitdownload.h"
#include "webkitdownloadprivate.h"
#include "webkitenumtypes.h"
#include "webkitmarshal.h"
#include "webkitnetworkrequestprivate.h"
#include "webkitnetworkresponse.h"
#include "webkitnetworkresponseprivate.h"
#include "webkitprivate.h"
#include <wtf/text/CString.h>
......@@ -594,7 +596,7 @@ WebKitNetworkResponse* webkit_download_get_network_response(WebKitDownload* down
static void webkit_download_set_response(WebKitDownload* download, const ResourceResponse& response)
{
WebKitDownloadPrivate* priv = download->priv;
priv->networkResponse = webkit_network_response_new_with_core_response(response);
priv->networkResponse = kitNew(response);
if (!response.isNull() && !response.suggestedFilename().isEmpty())
webkit_download_set_suggested_filename(download, response.suggestedFilename().utf8().data());
......
/*
* Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
* Copyright (C) 2008 Jan Michael C. Alonzo
* Copyright (C) 2008 Collabora Ltd.
* Copyright (C) 2010 Igalia S.L.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef webkitdownloadprivate_h
#define webkitdownloadprivate_h
#include "webkitdownload.h"
extern "C" {
WebKitDownload* webkit_download_new_with_handle(WebKitNetworkRequest*, WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
void webkit_download_set_suggested_filename(WebKitDownload*, const gchar* suggestedFilename);
}
#endif
......@@ -22,6 +22,8 @@
#include "webkithittestresult.h"
#include "GOwnPtr.h"
#include "HitTestResult.h"
#include "WebKitDOMBinding.h"
#include "WebKitDOMNode.h"
#include "webkitenumtypes.h"
#include "webkitprivate.h"
......@@ -230,3 +232,48 @@ static void webkit_hit_test_result_init(WebKitHitTestResult* web_hit_test_result
{
web_hit_test_result->priv = WEBKIT_HIT_TEST_RESULT_GET_PRIVATE(web_hit_test_result);
}
namespace WebKit {
WebKitHitTestResult* kit(const WebCore::HitTestResult& result)
{
guint context = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT;
GOwnPtr<char> linkURI(0);
GOwnPtr<char> imageURI(0);
GOwnPtr<char> mediaURI(0);
WebKitDOMNode* node = 0;
if (!result.absoluteLinkURL().isEmpty()) {
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK;
linkURI.set(g_strdup(result.absoluteLinkURL().string().utf8().data()));
}
if (!result.absoluteImageURL().isEmpty()) {
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE;
imageURI.set(g_strdup(result.absoluteImageURL().string().utf8().data()));
}
if (!result.absoluteMediaURL().isEmpty()) {
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA;
mediaURI.set(g_strdup(result.absoluteMediaURL().string().utf8().data()));
}
if (result.isSelected())
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION;
if (result.isContentEditable())
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
if (result.innerNonSharedNode())
node = kit(result.innerNonSharedNode());
return WEBKIT_HIT_TEST_RESULT(g_object_new(WEBKIT_TYPE_HIT_TEST_RESULT,
"link-uri", linkURI.get(),
"image-uri", imageURI.get(),
"media-uri", mediaURI.get(),
"context", context,
"inner-node", node,
NULL));
}
}
/*
* Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
* Copyright (C) 2008 Jan Michael C. Alonzo
* Copyright (C) 2008 Collabora Ltd.
* Copyright (C) 2010 Igalia S.L.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef webkithittestresultprivate_h
#define webkithittestresultprivate_h
#include "HitTestResult.h"
#include "webkithittestresult.h"
namespace WebKit {
WebKitHitTestResult* kit(const WebCore::HitTestResult&);
}
#endif
......@@ -158,16 +158,6 @@ static void webkit_network_response_init(WebKitNetworkResponse* response)
response->priv = WEBKIT_NETWORK_RESPONSE_GET_PRIVATE(response);
}
// for internal use only
WebKitNetworkResponse* webkit_network_response_new_with_core_response(const WebCore::ResourceResponse& resourceResponse)
{
PlatformRefPtr<SoupMessage> soupMessage(adoptPlatformRef(resourceResponse.toSoupMessage()));
if (soupMessage)
return WEBKIT_NETWORK_RESPONSE(g_object_new(WEBKIT_TYPE_NETWORK_RESPONSE, "message", soupMessage.get(), NULL));
return WEBKIT_NETWORK_RESPONSE(g_object_new(WEBKIT_TYPE_NETWORK_RESPONSE, "uri", resourceResponse.url().string().utf8().data(), NULL));
}
/**
* webkit_network_response_new:
* @uri: an URI
......@@ -259,3 +249,25 @@ SoupMessage* webkit_network_response_get_message(WebKitNetworkResponse* response
return priv->message;
}
namespace WebKit {
WebCore::ResourceResponse core(WebKitNetworkResponse* response)
{
SoupMessage* soupMessage = webkit_network_response_get_message(response);
if (soupMessage)
return WebCore::ResourceResponse(soupMessage);
return WebCore::ResourceResponse();
}
WebKitNetworkResponse* kitNew(const WebCore::ResourceResponse& resourceResponse)
{
PlatformRefPtr<SoupMessage> soupMessage(adoptPlatformRef(resourceResponse.toSoupMessage()));
if (soupMessage)
return WEBKIT_NETWORK_RESPONSE(g_object_new(WEBKIT_TYPE_NETWORK_RESPONSE, "message", soupMessage.get(), NULL));
return WEBKIT_NETWORK_RESPONSE(g_object_new(WEBKIT_TYPE_NETWORK_RESPONSE, "uri", resourceResponse.url().string().utf8().data(), NULL));
}
}
/*
* Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
* Copyright (C) 2008 Jan Michael C. Alonzo
* Copyright (C) 2008 Collabora Ltd.
* Copyright (C) 2010 Igalia S.L.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef webkitnetworkresponseprivate_h
#define webkitnetworkresponseprivate_h
#include "ResourceResponse.h"
namespace WebKit {
WebCore::ResourceResponse core(WebKitNetworkResponse*);
WebKitNetworkResponse* kitNew(const WebCore::ResourceResponse&);
}
#endif
......@@ -44,7 +44,6 @@
#include "ResourceHandleInternal.h"
#include "ResourceResponse.h"
#include "TextEncodingRegistry.h"
#include "WebKitDOMBinding.h"
#include "webkitnetworkresponse.h"
#include "webkitsoupauthdialog.h"
#include "webkitversion.h"
......@@ -65,71 +64,11 @@ using namespace WebCore;
namespace WebKit {
WebKitWebNavigationReason kit(WebCore::NavigationType type)
{
return (WebKitWebNavigationReason)type;
}
WebCore::NavigationType core(WebKitWebNavigationReason type)
{
return static_cast<WebCore::NavigationType>(type);
}
WebCore::ResourceResponse core(WebKitNetworkResponse* response)
{
SoupMessage* soupMessage = webkit_network_response_get_message(response);
if (soupMessage)
return ResourceResponse(soupMessage);
return ResourceResponse();
}
WebCore::EditingBehaviorType core(WebKitEditingBehavior type)
{
return (WebCore::EditingBehaviorType)type;
}
WebKitHitTestResult* kit(const WebCore::HitTestResult& result)
{
guint context = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT;
GOwnPtr<char> linkURI(0);
GOwnPtr<char> imageURI(0);
GOwnPtr<char> mediaURI(0);
WebKitDOMNode* node = 0;
if (!result.absoluteLinkURL().isEmpty()) {
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK;
linkURI.set(g_strdup(result.absoluteLinkURL().string().utf8().data()));
}
if (!result.absoluteImageURL().isEmpty()) {
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE;
imageURI.set(g_strdup(result.absoluteImageURL().string().utf8().data()));
}
if (!result.absoluteMediaURL().isEmpty()) {
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA;
mediaURI.set(g_strdup(result.absoluteMediaURL().string().utf8().data()));
}
if (result.isSelected())
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION;
if (result.isContentEditable())
context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
if (result.innerNonSharedNode())
node = kit(result.innerNonSharedNode());
return WEBKIT_HIT_TEST_RESULT(g_object_new(WEBKIT_TYPE_HIT_TEST_RESULT,
"link-uri", linkURI.get(),
"image-uri", imageURI.get(),
"media-uri", mediaURI.get(),
"context", context,
"inner-node", node,
NULL));
}
PasteboardHelperGtk* pasteboardHelperInstance()
{
static PasteboardHelperGtk* helper = new PasteboardHelperGtk();
......
......@@ -30,30 +30,20 @@
*/
#include <webkit/webkitdefines.h>
#include <webkit/webkitdownload.h>
#include <webkit/webkithittestresult.h>
#include <webkit/webkitnetworkrequest.h>
#include <webkit/webkitviewportattributes.h>
#include <webkit/webkitwebview.h>
#include <webkit/webkitwebdatasource.h>
#include <webkit/webkitwebframe.h>
#include <webkit/webkitwebpolicydecision.h>
#include <webkit/webkitwebnavigationaction.h>
#include <webkit/webkitwebresource.h>
#include <webkit/webkitwebsettings.h>
#include <webkit/webkitwebwindowfeatures.h>
#include <webkit/webkitwebbackforwardlist.h>
#include <webkit/webkitnetworkrequest.h>
#include <webkit/webkitsecurityorigin.h>
#include "ArchiveResource.h"
#include "BackForwardListImpl.h"
#include "DataObjectGtk.h"
#include "DragActions.h"
#include "Frame.h"
#include "GOwnPtr.h"
#include "Geolocation.h"
#include "HistoryItem.h"
#include "IntPoint.h"
#include "IntRect.h"
#include "FrameLoaderClient.h"
......@@ -62,9 +52,7 @@
#include "PlatformString.h"
#include "ResourceHandle.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "WindowFeatures.h"
#include "SecurityOrigin.h"
#include "Settings.h"
#include <enchant.h>
#include <wtf/OwnPtr.h>
......@@ -74,30 +62,13 @@
#include <glib.h>
#include <libsoup/soup.h>
class DownloadClient;
namespace WebKit {
class DocumentLoader;
class PasteboardHelperGtk;
WebCore::HistoryItem* core(WebKitWebHistoryItem*);
WebKitWebHistoryItem* kit(PassRefPtr<WebCore::HistoryItem>);
WebCore::BackForwardListImpl* core(WebKitWebBackForwardList*);
WebKitWebNavigationReason kit(WebCore::NavigationType type);
WebCore::NavigationType core(WebKitWebNavigationReason reason);
WebCore::ResourceResponse core(WebKitNetworkResponse* response);
WebCore::EditingBehaviorType core(WebKitEditingBehavior type);
WebKitSecurityOrigin* kit(WebCore::SecurityOrigin*);
WebCore::SecurityOrigin* core(WebKitSecurityOrigin*);
WebKitHitTestResult* kit(const WebCore::HitTestResult&);
PasteboardHelperGtk* pasteboardHelperInstance();
}
......@@ -107,118 +78,21 @@ extern "C" {
#define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
#define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
#define WEBKIT_SECURITY_ORIGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_SECURITY_ORIGIN, WebKitSecurityOriginPrivate))
struct _WebKitSecurityOriginPrivate {
RefPtr<WebCore::SecurityOrigin> coreOrigin;
gchar* protocol;
gchar* host;
GHashTable* webDatabases;
gboolean disposed;
};
struct _WebKitViewportAttributesPrivate {
WebKitWebView* webView;
int deviceWidth;
int deviceHeight;
int availableWidth;
int availableHeight;
int desktopWidth;
int deviceDPI;
int width;
int height;
float initialScaleFactor;
float minimumScaleFactor;
float maximumScaleFactor;
float devicePixelRatio;
gboolean userScalable;
gboolean isValid;
};
WTF::String
webkitUserAgent();
// WebKitWebHistoryItem private
WebKitWebHistoryItem*
webkit_web_history_item_new_with_core_item(PassRefPtr<WebCore::HistoryItem> historyItem);
WEBKIT_API G_CONST_RETURN gchar*
webkit_web_history_item_get_target(WebKitWebHistoryItem*);
WEBKIT_API gboolean
webkit_web_history_item_is_target_item(WebKitWebHistoryItem*);
WEBKIT_API GList*
webkit_web_history_item_get_children(WebKitWebHistoryItem*);
// end WebKitWebHistoryItem private
// WebKitWebResource private
#define WEBKIT_WEB_RESOURCE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_RESOURCE, WebKitWebResourcePrivate))
struct _WebKitWebResourcePrivate {
WebCore::ArchiveResource* resource;
gchar* uri;
gchar* mimeType;
gchar* textEncoding;
gchar* frameName;
GString* data;
};
WebKitWebResource*
webkit_web_resource_new_with_core_resource(PassRefPtr<WebCore::ArchiveResource>);
void
webkit_web_resource_init_with_core_resource(WebKitWebResource*, PassRefPtr<WebCore::ArchiveResource>);
// end WebKitWebResource private
WebKitWebWindowFeatures*
webkit_web_window_features_new_from_core_features (const WebCore::WindowFeatures& features);
WebKitDownload*
webkit_download_new_with_handle(WebKitNetworkRequest* request, WebCore::ResourceHandle* handle, const WebCore::ResourceResponse& response);
void
webkit_download_set_suggested_filename(WebKitDownload* download, const gchar* suggestedFilename);
WebKitWebPolicyDecision*
webkit_web_policy_decision_new (WebKitWebFrame*, WebCore::FramePolicyFunction);
void
webkit_web_policy_decision_cancel (WebKitWebPolicyDecision* decision);
WebKitNetworkResponse*
webkit_network_response_new_with_core_response(const WebCore::ResourceResponse& resourceResponse);
WebKitGeolocationPolicyDecision*
webkit_geolocation_policy_decision_new(WebKitWebFrame*, WebCore::Geolocation*);
// FIXME: Move these to webkitwebframe.h once their API has been discussed.
WEBKIT_API void
webkit_web_settings_add_extra_plugin_directory (WebKitWebView *web_view, const gchar* directory);
GSList*
webkit_web_settings_get_enchant_dicts(WebKitWebView* web_view);