Commit e1a9b4a0 authored by alp@webkit.org's avatar alp@webkit.org

2007-11-30 Alp Toker <alp@atoker.com>

        Reviewed by Adam Roben.

        http://bugs.webkit.org/show_bug.cgi?id=15691
        [GTK] Public API does not follow GTK+ conventions

        Refactor the WebKit/GTK+ public API. Changes:
          WebKitPage -> WebKitWebView
          WebKitFrame -> WebKitWebFrame

        Public API source and header names have been updated to mirror the API
        changes.

        The API is now kept in WebKit/gtk/WebView to match other ports in the
        same class such as Mac and Win.

        API/ABI-breaking change.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@28273 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9846753d
2007-11-30 Alp Toker <alp@atoker.com>
Reviewed by Adam Roben.
http://bugs.webkit.org/show_bug.cgi?id=15691
[GTK] Public API does not follow GTK+ conventions
Refactor the WebKit/GTK+ public API. Changes:
WebKitPage -> WebKitWebView
WebKitFrame -> WebKitWebFrame
Public API source and header names have been updated to mirror the API
changes.
The API is now kept in WebKit/gtk/WebView to match other ports in the
same class such as Mac and Win.
* WebKit.pri:
2007-11-26 Rodney Dawes <dobey@wayofthemonkey.com>
Reviewed by Mark Rowe.
......
2007-11-30 Alp Toker <alp@atoker.com>
Reviewed by Adam Roben.
http://bugs.webkit.org/show_bug.cgi?id=15691
[GTK] Public API does not follow GTK+ conventions
Refactor the WebKit/GTK+ public API. Changes:
WebKitPage -> WebKitWebView
WebKitFrame -> WebKitWebFrame
Public API source and header names have been updated to mirror the API
changes.
The API is now kept in WebKit/gtk/WebView to match other ports in the
same class such as Mac and Win.
* WebCore.pro:
2007-11-30 Anders Carlsson <andersca@apple.com>
Add platform/text project group.
......
......@@ -146,7 +146,7 @@ gtk-port {
$$PWD/loader/gtk \
$$PWD/page/gtk \
$$PWD/../WebKit/gtk/WebCoreSupport \
$$PWD/../WebKit/gtk/Api
$$PWD/../WebKit/gtk/WebView
DEPENDPATH += \
platform/gtk \
......@@ -164,7 +164,7 @@ gtk-port {
loader/gtk \
page/gtk \
../WebKit/gtk/WebCoreSupport \
../WebKit/gtk/Api
../WebKit/gtk/WebView
}
INCLUDEPATH += $$PWD \
......@@ -939,13 +939,13 @@ qt-port {
gtk-port {
HEADERS += \
../WebCore/platform/gtk/ClipboardGtk.h \
../WebKit/gtk/Api/webkitgtkdefines.h \
../WebKit/gtk/Api/webkitgtkframe.h \
../WebKit/gtk/Api/webkitgtkglobal.h \
../WebKit/gtk/Api/webkitgtknetworkrequest.h \
../WebKit/gtk/Api/webkitgtkpage.h \
../WebKit/gtk/Api/webkitgtkprivate.h \
../WebKit/gtk/Api/webkitgtksettings.h \
../WebKit/gtk/WebView/webkitdefines.h \
../WebKit/gtk/WebView/webkitglobal.h \
../WebKit/gtk/WebView/webkitnetworkrequest.h \
../WebKit/gtk/WebView/webkitprivate.h \
../WebKit/gtk/WebView/webkitsettings.h \
../WebKit/gtk/WebView/webkitwebframe.h \
../WebKit/gtk/WebView/webkitwebview.h \
../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
../WebKit/gtk/WebCoreSupport/DragClientGtk.h \
......@@ -1016,12 +1016,12 @@ gtk-port {
platform/image-decoders/bmp/BMPImageDecoder.cpp \
platform/image-decoders/ico/ICOImageDecoder.cpp \
platform/image-decoders/xbm/XBMImageDecoder.cpp \
../WebKit/gtk/Api/webkitgtkframe.cpp \
../WebKit/gtk/Api/webkitgtkglobal.cpp \
../WebKit/gtk/Api/webkitgtknetworkrequest.cpp \
../WebKit/gtk/Api/webkitgtkpage.cpp \
../WebKit/gtk/Api/webkitgtkprivate.cpp \
../WebKit/gtk/Api/webkitgtksettings.cpp \
../WebKit/gtk/WebView/webkitglobal.cpp \
../WebKit/gtk/WebView/webkitnetworkrequest.cpp \
../WebKit/gtk/WebView/webkitprivate.cpp \
../WebKit/gtk/WebView/webkitsettings.cpp \
../WebKit/gtk/WebView/webkitwebframe.cpp \
../WebKit/gtk/WebView/webkitwebview.cpp \
../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
../WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
......@@ -1681,7 +1681,7 @@ gtk-port {
target.path = $$WEBKIT_LIB_DIR
INSTALLS += target
include($$PWD/../WebKit/gtk/Api/headers.pri)
include($$PWD/../WebKit/gtk/WebView/headers.pri)
headers.files = $$WEBKIT_API_HEADERS
headers.path = $$WEBKIT_INC_DIR
INSTALLS += headers
......@@ -1701,7 +1701,7 @@ gtk-port {
QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
}
GENMARSHALS = ../WebKit/gtk/Api/webkitgtk-marshal.list
GENMARSHALS = ../WebKit/gtk/WebView/webkit-marshal.list
GENMARSHALS_PREFIX = webkit_marshal
#
......
......@@ -17,7 +17,7 @@ qt-port:!building-libs {
gtk-port:!building-libs {
QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
LIBS += -lWebKitGtk
DEPENDPATH += $$PWD/WebKit/gtk/Api $$PWD/WebKit/gtk/WebCoreSupport
DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport
}
gtk-port {
......@@ -44,6 +44,9 @@ gtk-port {
# This set of warnings is borrowed from the Mac build
QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
DEPENDPATH += $$PWD/JavaScriptCore/API
INCLUDEPATH += $$PWD
}
DEFINES += USE_SYSTEM_MALLOC
......@@ -60,7 +63,7 @@ gtk-port:INCLUDEPATH += \
$$BASE_DIR/WebCore/platform/graphics/cairo \
$$BASE_DIR/WebCore/loader/gtk \
$$BASE_DIR/WebCore/page/gtk \
$$BASE_DIR/WebKit/gtk/Api \
$$BASE_DIR/WebKit/gtk/WebView \
$$BASE_DIR/WebKit/gtk/WebCoreSupport
INCLUDEPATH += \
$$BASE_DIR/JavaScriptCore/ \
......
WEBKIT_API_HEADERS = $$PWD/webkitgtkdefines.h \
$$PWD/webkitgtkframe.h \
$$PWD/webkitgtkframedata.h \
$$PWD/webkitgtkglobal.h \
$$PWD/webkitgtknetworkrequest.h \
$$PWD/webkitgtkpage.h \
$$PWD/webkitgtksettings.h
2007-11-30 Alp Toker <alp@atoker.com>
Reviewed by Adam Roben.
http://bugs.webkit.org/show_bug.cgi?id=15691
[GTK] Public API does not follow GTK+ conventions
Refactor the WebKit/GTK+ public API. Changes:
WebKitPage -> WebKitWebView
WebKitFrame -> WebKitWebFrame
Public API source and header names have been updated to mirror the API
changes.
The API is now kept in WebKit/gtk/WebView to match other ports in the
same class such as Mac and Win.
API/ABI-breaking change.
* Api: Removed.
* Api/headers.pri: Removed.
* Api/webkitgtk-marshal.list: Removed.
* Api/webkitgtkdefines.h: Removed.
* Api/webkitgtkframe.cpp: Removed.
* Api/webkitgtkframe.h: Removed.
* Api/webkitgtkglobal.cpp: Removed.
* Api/webkitgtkglobal.h: Removed.
* Api/webkitgtknetworkrequest.cpp: Removed.
* Api/webkitgtknetworkrequest.h: Removed.
* Api/webkitgtkpage.cpp: Removed.
* Api/webkitgtkpage.h: Removed.
* Api/webkitgtkprivate.cpp: Removed.
* Api/webkitgtkprivate.h: Removed.
* Api/webkitgtksettings.cpp: Removed.
* Api/webkitgtksettings.h: Removed.
* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::ChromeClient):
(WebKit::ChromeClient::createWindow):
* WebCoreSupport/ChromeClientGtk.h:
(WebKit::ChromeClient::webPage):
* WebCoreSupport/EditorClientGtk.cpp:
(WebKit::EditorClient::isEditable):
(WebKit::EditorClient::EditorClient):
* WebCoreSupport/EditorClientGtk.h:
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::FrameLoaderClient):
(WebKit::FrameLoaderClient::postProgressStartedNotification):
(WebKit::FrameLoaderClient::postProgressEstimateChangedNotification):
(WebKit::FrameLoaderClient::postProgressFinishedNotification):
(WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
(WebKit::FrameLoaderClient::createFrame):
(WebKit::FrameLoaderClient::windowObjectCleared):
(WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
(WebKit::FrameLoaderClient::setTitle):
* WebCoreSupport/FrameLoaderClientGtk.h:
(WebKit::FrameLoaderClient::webFrame):
* WebView: Added.
* WebView/headers.pri: Added.
* WebView/webkit-marshal.list: Added.
* WebView/webkitdefines.h: Added.
* WebView/webkitglobal.cpp: Added.
* WebView/webkitglobal.h: Added.
* WebView/webkitnetworkrequest.cpp: Added.
* WebView/webkitnetworkrequest.h: Added.
* WebView/webkitprivate.cpp: Added.
(WebKit::apply):
(WebKit::create):
(WebKit::getFrameFromView):
(WebKit::getViewFromFrame):
(WebKit::core):
(WebKit::kit):
* WebView/webkitprivate.h: Added.
* WebView/webkitsettings.cpp: Added.
* WebView/webkitsettings.h: Added.
* WebView/webkitwebframe.cpp: Added.
* WebView/webkitwebframe.h: Added.
* WebView/webkitwebview.cpp: Added.
* WebView/webkitwebview.h: Added.
2007-11-28 Alp Toker <alp@atoker.com>
Reviewed by Timothy Hatcher.
......
......@@ -35,15 +35,15 @@
#include "CString.h"
#include "HitTestResult.h"
#include "KURL.h"
#include "webkitgtkpage.h"
#include "webkitgtkprivate.h"
#include "webkitwebview.h"
#include "webkitprivate.h"
#include "NotImplemented.h"
#include "WindowFeatures.h"
using namespace WebCore;
namespace WebKit {
ChromeClient::ChromeClient(WebKitPage* page)
ChromeClient::ChromeClient(WebKitWebView* page)
: m_webPage(page)
{
}
......@@ -93,12 +93,12 @@ Page* ChromeClient::createWindow(Frame*, const FrameLoadRequest&, const WindowFe
return 0;
} else {
/* TODO: FrameLoadRequest is not used */
WebKitPage* page = WEBKIT_PAGE_GET_CLASS(m_webPage)->create_page(m_webPage);
WebKitWebView* page = WEBKIT_WEB_VIEW_GET_CLASS(m_webPage)->create_web_view(m_webPage);
if (!page)
return 0;
WebKitPagePrivate *privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));
return privateData->page;
WebKitWebViewPrivate *privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(page));
return privateData->corePage;
}
}
......
......@@ -32,14 +32,14 @@
#include "ChromeClient.h"
#include "KURL.h"
typedef struct _WebKitPage WebKitPage;
typedef struct _WebKitWebView WebKitWebView;
namespace WebKit {
class ChromeClient : public WebCore::ChromeClient {
public:
ChromeClient(WebKitPage*);
WebKitPage* webPage() const { return m_webPage; }
ChromeClient(WebKitWebView*);
WebKitWebView* webPage() const { return m_webPage; }
virtual void chromeDestroyed();
......@@ -106,7 +106,7 @@ namespace WebKit {
virtual unsigned long long requestQuotaIncreaseForDatabaseOperation(WebCore::Frame*, const WebCore::SecurityOriginData&, const WebCore::String&, unsigned long long);
private:
WebKitPage* m_webPage;
WebKitWebView* m_webPage;
WebCore::KURL m_hoveredLinkURL;
};
}
......
......@@ -40,7 +40,7 @@
#include "NotImplemented.h"
#include "Page.h"
#include "PlatformKeyboardEvent.h"
#include "webkitgtkprivate.h"
#include "webkitprivate.h"
#include <stdio.h>
......@@ -146,7 +146,7 @@ void EditorClient::didSetSelectionTypesForPasteboard()
bool EditorClient::isEditable()
{
return webkit_page_get_editable(m_page);
return webkit_web_view_get_editable(m_page);
}
void EditorClient::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>)
......@@ -360,7 +360,7 @@ void EditorClient::handleInputMethodKeypress(KeyboardEvent*)
notImplemented();
}
EditorClient::EditorClient(WebKitPage* page)
EditorClient::EditorClient(WebKitWebView* page)
: m_page(page)
{
}
......
......@@ -34,7 +34,7 @@
#include <wtf/Forward.h>
typedef struct _WebKitPage WebKitPage;
typedef struct _WebKitWebView WebKitWebView;
namespace WebCore {
class Page;
......@@ -44,7 +44,7 @@ namespace WebKit {
class EditorClient : public WebCore::EditorClient {
public:
EditorClient(WebKitPage*);
EditorClient(WebKitWebView*);
// from EditorClient
virtual void pageDestroyed();
......@@ -109,7 +109,7 @@ namespace WebKit {
virtual void setInputMethodState(bool enabled);
private:
WebKitPage* m_page;
WebKitWebView* m_page;
};
}
......
......@@ -51,9 +51,9 @@
#include "kjs_binding.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
#include "webkitgtkpage.h"
#include "webkitgtkframe.h"
#include "webkitgtkprivate.h"
#include "webkitwebview.h"
#include "webkitwebframe.h"
#include "webkitprivate.h"
#include <JavaScriptCore/APICast.h>
#include <stdio.h>
......@@ -65,7 +65,7 @@ using namespace WebCore;
namespace WebKit {
FrameLoaderClient::FrameLoaderClient(WebKitFrame* frame)
FrameLoaderClient::FrameLoaderClient(WebKitWebFrame* frame)
: m_frame(frame)
, m_userAgent("")
{
......@@ -199,13 +199,13 @@ void FrameLoaderClient::assignIdentifierToInitialRequest(unsigned long identifie
void FrameLoaderClient::postProgressStartedNotification()
{
WebKitPage* page = getPageFromFrame(m_frame);
WebKitWebView* page = getViewFromFrame(m_frame);
g_signal_emit_by_name(page, "load_started", m_frame);
}
void FrameLoaderClient::postProgressEstimateChangedNotification()
{
WebKitPage* kitPage = getPageFromFrame(m_frame);
WebKitWebView* kitPage = getViewFromFrame(m_frame);
Page* corePage = core(kitPage);
g_signal_emit_by_name(kitPage, "load_progress_changed", lround(corePage->progress()->estimatedProgress()*100));
......@@ -213,7 +213,7 @@ void FrameLoaderClient::postProgressEstimateChangedNotification()
void FrameLoaderClient::postProgressFinishedNotification()
{
WebKitPage* page = getPageFromFrame(m_frame);
WebKitWebView* page = getViewFromFrame(m_frame);
g_signal_emit_by_name(page, "load_finished", m_frame);
}
......@@ -254,7 +254,7 @@ void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunct
if (!policyFunction)
return;
WebKitPage* page = getPageFromFrame(m_frame);
WebKitWebView* page = getViewFromFrame(m_frame);
WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().url().utf8().data());
WebKitNavigationResponse response;
......@@ -281,8 +281,8 @@ PassRefPtr<Frame> FrameLoaderClient::createFrame(const KURL& url, const String&
{
Frame* coreFrame = core(webFrame());
ASSERT(core(getPageFromFrame(webFrame())) == coreFrame->page());
WebKitFrame* gtkFrame = WEBKIT_FRAME(webkit_frame_init_with_page(getPageFromFrame(webFrame()), ownerElement));
ASSERT(core(getViewFromFrame(webFrame())) == coreFrame->page());
WebKitWebFrame* gtkFrame = WEBKIT_WEB_FRAME(webkit_web_frame_init_with_web_view(getViewFromFrame(webFrame()), ownerElement));
RefPtr<Frame> childFrame(adoptRef(core(gtkFrame)));
coreFrame->tree()->appendChild(childFrame);
......@@ -366,7 +366,7 @@ void FrameLoaderClient::windowObjectCleared()
JSObjectRef windowObject = toRef(KJS::Window::retrieve(coreFrame)->getObject());
ASSERT(windowObject);
WebKitPage* page = getPageFromFrame(m_frame);
WebKitWebView* page = getViewFromFrame(m_frame);
g_signal_emit_by_name(page, "window_object_cleared", m_frame, context, windowObject);
// TODO: Re-attach debug clients if present.
......@@ -447,7 +447,7 @@ void FrameLoaderClient::dispatchWillClose() { notImplemented(); }
void FrameLoaderClient::dispatchDidReceiveIcon()
{
WebKitPage* page = getPageFromFrame(m_frame);
WebKitWebView* page = getViewFromFrame(m_frame);
g_signal_emit_by_name(page, "icon_loaded", m_frame);
}
......@@ -507,13 +507,13 @@ void FrameLoaderClient::prepareForDataSourceReplacement() { notImplemented(); }
void FrameLoaderClient::setTitle(const String& title, const KURL& url)
{
WebKitPage* page = getPageFromFrame(m_frame);
WebKitWebView* page = getViewFromFrame(m_frame);
CString titleString = title.utf8();
DeprecatedCString urlString = url.prettyURL().utf8();
g_signal_emit_by_name(m_frame, "title_changed", titleString.data(), urlString.data());
if (m_frame == webkit_page_get_main_frame(page))
if (m_frame == webkit_web_view_get_main_frame(page))
g_signal_emit_by_name(page, "title_changed", titleString.data(), urlString.data());
}
......
......@@ -32,17 +32,17 @@
#include "FrameLoaderClient.h"
#include "ResourceResponse.h"
typedef struct _WebKitFrame WebKitFrame;
typedef struct _WebKitWebFrame WebKitWebFrame;
namespace WebKit {
class FrameLoaderClient : public WebCore::FrameLoaderClient {
public:
FrameLoaderClient(WebKitFrame*);
FrameLoaderClient(WebKitWebFrame*);
virtual ~FrameLoaderClient() { }
virtual void frameLoaderDestroyed();
WebKitFrame* webFrame() const { return m_frame; }
WebKitWebFrame* webFrame() const { return m_frame; }
virtual bool hasWebView() const;
virtual bool hasFrameView() const;
......@@ -178,7 +178,7 @@ namespace WebKit {
virtual bool canCachePage() const;
virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
private:
WebKitFrame* m_frame;
WebKitWebFrame* m_frame;
WebCore::ResourceResponse m_response;
WebCore::String m_userAgent;
};
......
WEBKIT_API_HEADERS = $$PWD/webkitdefines.h \
$$PWD/webkitwebframe.h \
$$PWD/webkitframedata.h \
$$PWD/webkitglobal.h \
$$PWD/webkitnetworkrequest.h \
$$PWD/webkitwebview.h \
$$PWD/webkitsettings.h
......@@ -31,13 +31,13 @@
#include <glib.h>
typedef struct _WebKitFrame WebKitFrame;
typedef struct _WebKitFrameClass WebKitFrameClass;
typedef struct _WebKitWebFrame WebKitWebFrame;
typedef struct _WebKitWebFrameClass WebKitWebFrameClass;
typedef struct _WebKitFrameData WebKitFrameData;
typedef struct _WebKitWebFrameData WebKitWebFrameData;
typedef struct _WebKitPage WebKitPage;
typedef struct _WebKitPageClass WebKitPageClass;
typedef struct _WebKitWebView WebKitWebView;
typedef struct _WebKitWebViewClass WebKitWebViewClass;
typedef struct _WebKitNetworkRequest WebKitNetworkRequest;
typedef struct _WebKitNetworkRequestClass WebKitNetworkRequestClass;
......
......@@ -27,7 +27,7 @@
*/
#include "config.h"
#include "webkitgtkglobal.h"
#include "webkitglobal.h"
#include "Logging.h"
#include "DatabaseTracker.h"
......
......@@ -29,7 +29,7 @@
#ifndef WEBKIT_GLOBAL_H
#define WEBKIT_GLOBAL_H
#include "webkitgtkdefines.h"
#include "webkitdefines.h"
G_BEGIN_DECLS
......
......@@ -28,8 +28,8 @@
#include "config.h"
#include "webkitgtknetworkrequest.h"
#include "webkitgtkprivate.h"
#include "webkitnetworkrequest.h"
#include "webkitprivate.h"
using namespace WebKit;
using namespace WebCore;
......
......@@ -31,7 +31,7 @@
#include <glib-object.h>
#include "webkitgtkdefines.h"
#include "webkitdefines.h"
G_BEGIN_DECLS
......
......@@ -28,7 +28,7 @@
#include "config.h"
#include "webkitgtkprivate.h"
#include "webkitprivate.h"
#include "ChromeClientGtk.h"
#include "FrameLoader.h"
#include "FrameLoaderClientGtk.h"
......@@ -48,26 +48,26 @@ WebKitSettings* create(WebCore::Settings*)
return 0;
}
WebKitFrame* getFrameFromPage(WebKitPage* page)
WebKitWebFrame* getFrameFromView(WebKitWebView* webView)
{
return webkit_page_get_main_frame(page);
return webkit_web_view_get_main_frame(webView);
}
WebKitPage* getPageFromFrame(WebKitFrame* frame)
WebKitWebView* getViewFromFrame(WebKitWebFrame* frame)
{
return webkit_frame_get_page(frame);
return webkit_web_frame_get_web_view(frame);
}
WebCore::Frame* core(WebKitFrame* frame)
WebCore::Frame* core(WebKitWebFrame* frame)
{
if (!frame)
return 0;
WebKitFramePrivate* frame_data = WEBKIT_FRAME_GET_PRIVATE(frame);
WebKitWebFramePrivate* frame_data = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
return frame_data ? frame_data->frame : 0;
}
WebKitFrame* kit(WebCore::Frame* coreFrame)
WebKitWebFrame* kit(WebCore::Frame* coreFrame)
{
if (!coreFrame)
return 0;
......@@ -77,22 +77,22 @@ WebKitFrame* kit(WebCore::Frame* coreFrame)
return client ? client->webFrame() : 0;
}
WebCore::Page* core(WebKitPage* page)
WebCore::Page* core(WebKitWebView* webView)
{
if (!page)
if (!webView)
return 0;
WebKitPagePrivate* page_data = WEBKIT_PAGE_GET_PRIVATE(page);
return page_data ? page_data->page : 0;
WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
return webViewData ? webViewData->corePage : 0;
}
WebKitPage* kit(WebCore::Page* page)
WebKitWebView* kit(WebCore::Page* corePage)
{
if (!page)
if (!corePage)
return 0;
ASSERT(page->chrome());
WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(page->chrome()->client());
ASSERT(webView->chrome());
WebKit::ChromeClient* client = static_cast<WebKit::ChromeClient*>(corePage->chrome()->client());
return client ? client->webPage() : 0;
}
}