+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.
$$PWD/loader/gtk \
$$PWD/page/gtk \
$$PWD/../WebKit/gtk/WebCoreSupport \
- $$PWD/../WebKit/gtk/Api
+ $$PWD/../WebKit/gtk/WebView
DEPENDPATH += \
platform/gtk \
loader/gtk \
page/gtk \
../WebKit/gtk/WebCoreSupport \
- ../WebKit/gtk/Api
+ ../WebKit/gtk/WebView
}
INCLUDEPATH += $$PWD \
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 \
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 \
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
QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
}
- GENMARSHALS = ../WebKit/gtk/Api/webkitgtk-marshal.list
+ GENMARSHALS = ../WebKit/gtk/WebView/webkit-marshal.list
GENMARSHALS_PREFIX = webkit_marshal
#
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 {
# 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
$$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/ \
+++ /dev/null
-WEBKIT_API_HEADERS = $$PWD/webkitgtkdefines.h \
- $$PWD/webkitgtkframe.h \
- $$PWD/webkitgtkframedata.h \
- $$PWD/webkitgtkglobal.h \
- $$PWD/webkitgtknetworkrequest.h \
- $$PWD/webkitgtkpage.h \
- $$PWD/webkitgtksettings.h
+++ /dev/null
-/*
- * Copyright (C) 2007 Holger Hans Peter Freyther
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WEBKIT_FRAME_H
-#define WEBKIT_FRAME_H
-
-#include <glib-object.h>
-#include <gdk/gdk.h>
-
-#include "webkitgtkdefines.h"
-
-G_BEGIN_DECLS
-
-#define WEBKIT_TYPE_FRAME (webkit_frame_get_type())
-#define WEBKIT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_FRAME, WebKitFrame))
-#define WEBKIT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_FRAME, WebKitFrameClass))
-#define WEBKIT_IS_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_FRAME))
-#define WEBKIT_IS_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_FRAME))
-#define WEBKIT_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_FRAME, WebKitFrameClass))
-
-
-struct _WebKitFrame {
- GObject parent;
-};
-
-struct _WebKitFrameClass {
- GObjectClass parent;
-
- void (*title_changed) (WebKitFrame* frame, gchar* title, gchar* location);
-
- /*
- * protected virtual methods
- */
- void (*mouse_move_event) (WebKitFrame* frame, GdkEvent* move_event);
- void (*mouse_press_event) (WebKitFrame* frame, GdkEvent* press_event);
- void (*mouse_release_event) (WebKitFrame* frame, GdkEvent* mouse_release_event);
- void (*mouse_double_click_event) (WebKitFrame* frame, GdkEvent* double_click_event);
- void (*mouse_wheel_event) (WebKitFrame* frame, GdkEvent* wheel_event);
-};
-
-WEBKIT_API GType
-webkit_frame_get_type (void);
-
-WEBKIT_API WebKitFrame*
-webkit_frame_new (WebKitPage* page);
-
-WEBKIT_API WebKitPage*
-webkit_frame_get_page (WebKitFrame* frame);
-
-WEBKIT_API const gchar*
-webkit_frame_get_name (WebKitFrame* frame);
-
-WEBKIT_API const gchar*
-webkit_frame_get_title (WebKitFrame* frame);
-
-WEBKIT_API const gchar*
-webkit_frame_get_location (WebKitFrame* frame);
-
-WEBKIT_API WebKitFrame*
-webkit_frame_get_parent (WebKitFrame* frame);
-
-WEBKIT_API void
-webkit_frame_load_request (WebKitFrame* frame, WebKitNetworkRequest* request);
-
-WEBKIT_API void
-webkit_frame_stop_loading (WebKitFrame* frame);
-
-WEBKIT_API void
-webkit_frame_reload (WebKitFrame* frame);
-
-WEBKIT_API WebKitFrame*
-webkit_frame_find_frame (WebKitFrame* frame, const gchar* name);
-
-WEBKIT_API JSGlobalContextRef
-webkit_frame_get_global_context (WebKitFrame* frame);
-
-G_END_DECLS
-
-#endif
+++ /dev/null
-/*
- * Copyright (C) 2007 Holger Hans Peter Freyther
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WEBKIT_PAGE_H
-#define WEBKIT_PAGE_H
-
-#include <gtk/gtk.h>
-
-#include "webkitgtkdefines.h"
-#include "webkitgtksettings.h"
-
-G_BEGIN_DECLS
-
-#define WEBKIT_TYPE_PAGE (webkit_page_get_type())
-#define WEBKIT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_PAGE, WebKitPage))
-#define WEBKIT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_PAGE, WebKitPageClass))
-#define WEBKIT_IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_PAGE))
-#define WEBKIT_IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_PAGE))
-#define WEBKIT_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_PAGE, WebKitPageClass))
-
-
-typedef enum {
- WEBKIT_NAVIGATION_RESPONSE_ACCEPT,
- WEBKIT_NAVIGATION_RESPONSE_IGNORE,
- WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD
-} WebKitNavigationResponse;
-
-
-
-struct _WebKitPage {
- GtkContainer parent;
-};
-
-struct _WebKitPageClass {
- GtkContainerClass parent;
-
- /*
- * default handler/virtual methods
- * DISCUSS: create_page needs a request and should we make this a signal with default handler? this would
- * require someone doing a g_signal_stop_emission_by_name
- * WebUIDelegate has nothing for create_frame, WebPolicyDelegate as well...
- */
- WebKitPage* (*create_page) (WebKitPage* page);
-
- /*
- * TODO: FIXME: Create something like WebPolicyDecisionListener_Protocol instead
- */
- WebKitNavigationResponse (*navigation_requested) (WebKitPage* page, WebKitFrame* frame, WebKitNetworkRequest* request);
-
- void (*window_object_cleared) (WebKitPage* page, WebKitFrame* frame, JSGlobalContextRef context, JSObjectRef window_object);
- gchar* (*choose_file) (WebKitPage* page, WebKitFrame* frame, const gchar* old_file);
- gboolean (*script_alert) (WebKitPage* page, WebKitFrame* frame, const gchar* alert_message);
- gboolean (*script_confirm) (WebKitPage* page, WebKitFrame* frame, const gchar* confirm_message, gboolean* did_confirm);
- gboolean (*script_prompt) (WebKitPage* page, WebKitFrame* frame, const gchar* message, const gchar* default_value, gchar** value);
- gboolean (*console_message) (WebKitPage* page, const gchar* message, unsigned int line_number, const gchar* source_id);
-
- /*
- * internal
- */
- void (*set_scroll_adjustments) (WebKitPage*, GtkAdjustment*, GtkAdjustment*);
-};
-
-WEBKIT_API GType
-webkit_page_get_type (void);
-
-WEBKIT_API GtkWidget*
-webkit_page_new (void);
-
-WEBKIT_API gboolean
-webkit_page_can_go_backward (WebKitPage* page);
-
-WEBKIT_API gboolean
-webkit_page_can_go_forward (WebKitPage* page);
-
-WEBKIT_API void
-webkit_page_go_backward (WebKitPage* page);
-
-WEBKIT_API void
-webkit_page_go_forward (WebKitPage* page);
-
-WEBKIT_API void
-webkit_page_stop_loading (WebKitPage* page);
-
-WEBKIT_API void
-webkit_page_open (WebKitPage* page, const gchar* uri);
-
-WEBKIT_API void
-webkit_page_reload (WebKitPage *page);
-
-WEBKIT_API void
-webkit_page_load_string (WebKitPage* page, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_uri);
-
-WEBKIT_API void
-webkit_page_load_html_string (WebKitPage* page, const gchar* content, const gchar* base_uri);
-
-WEBKIT_API WebKitFrame*
-webkit_page_get_main_frame (WebKitPage* page);
-
-WEBKIT_API void
-webkit_page_execute_script (WebKitPage* page, const gchar* script);
-
-WEBKIT_API gboolean
-webkit_page_get_editable (WebKitPage* page);
-
-WEBKIT_API void
-webkit_page_set_editable (WebKitPage* page, gboolean flag);
-
-G_END_DECLS
-
-#endif
+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.
#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)
{
}
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;
}
}
#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();
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;
};
}
#include "NotImplemented.h"
#include "Page.h"
#include "PlatformKeyboardEvent.h"
-#include "webkitgtkprivate.h"
+#include "webkitprivate.h"
#include <stdio.h>
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>)
notImplemented();
}
-EditorClient::EditorClient(WebKitPage* page)
+EditorClient::EditorClient(WebKitWebView* page)
: m_page(page)
{
}
#include <wtf/Forward.h>
-typedef struct _WebKitPage WebKitPage;
+typedef struct _WebKitWebView WebKitWebView;
namespace WebCore {
class Page;
class EditorClient : public WebCore::EditorClient {
public:
- EditorClient(WebKitPage*);
+ EditorClient(WebKitWebView*);
// from EditorClient
virtual void pageDestroyed();
virtual void setInputMethodState(bool enabled);
private:
- WebKitPage* m_page;
+ WebKitWebView* m_page;
};
}
#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>
namespace WebKit {
-FrameLoaderClient::FrameLoaderClient(WebKitFrame* frame)
+FrameLoaderClient::FrameLoaderClient(WebKitWebFrame* frame)
: m_frame(frame)
, m_userAgent("")
{
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));
void FrameLoaderClient::postProgressFinishedNotification()
{
- WebKitPage* page = getPageFromFrame(m_frame);
+ WebKitWebView* page = getViewFromFrame(m_frame);
g_signal_emit_by_name(page, "load_finished", m_frame);
}
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;
{
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);
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.
void FrameLoaderClient::dispatchDidReceiveIcon()
{
- WebKitPage* page = getPageFromFrame(m_frame);
+ WebKitWebView* page = getViewFromFrame(m_frame);
g_signal_emit_by_name(page, "icon_loaded", m_frame);
}
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());
}
#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;
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;
};
--- /dev/null
+WEBKIT_API_HEADERS = $$PWD/webkitdefines.h \
+ $$PWD/webkitwebframe.h \
+ $$PWD/webkitframedata.h \
+ $$PWD/webkitglobal.h \
+ $$PWD/webkitnetworkrequest.h \
+ $$PWD/webkitwebview.h \
+ $$PWD/webkitsettings.h
#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;
*/
#include "config.h"
-#include "webkitgtkglobal.h"
+#include "webkitglobal.h"
#include "Logging.h"
#include "DatabaseTracker.h"
#ifndef WEBKIT_GLOBAL_H
#define WEBKIT_GLOBAL_H
-#include "webkitgtkdefines.h"
+#include "webkitdefines.h"
G_BEGIN_DECLS
#include "config.h"
-#include "webkitgtknetworkrequest.h"
-#include "webkitgtkprivate.h"
+#include "webkitnetworkrequest.h"
+#include "webkitprivate.h"
using namespace WebKit;
using namespace WebCore;
#include <glib-object.h>
-#include "webkitgtkdefines.h"
+#include "webkitdefines.h"
G_BEGIN_DECLS
#include "config.h"
-#include "webkitgtkprivate.h"
+#include "webkitprivate.h"
#include "ChromeClientGtk.h"
#include "FrameLoader.h"
#include "FrameLoaderClientGtk.h"
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;
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;
}
}
#define WEBKIT_PRIVATE_H
/*
- * Internal class. This class knows the shared secret of WebKitFrame,
- * WebKitNetworkRequest and WebKitPage.
+ * Internal class. This class knows the shared secret of WebKitWebFrame,
+ * WebKitNetworkRequest and WebKitWebView.
* They are using WebCore which musn't be exposed to the outer world.
*/
-#include "webkitgtksettings.h"
-#include "webkitgtkpage.h"
-#include "webkitgtkframe.h"
-#include "webkitgtknetworkrequest.h"
+#include "webkitsettings.h"
+#include "webkitwebview.h"
+#include "webkitwebframe.h"
+#include "webkitnetworkrequest.h"
#include "Settings.h"
#include "Page.h"
namespace WebKit {
void apply(WebKitSettings*,WebCore::Settings*);
WebKitSettings* create(WebCore::Settings*);
- WebKitFrame* getFrameFromPage(WebKitPage*);
- WebKitPage* getPageFromFrame(WebKitFrame*);
+ WebKitWebFrame* getFrameFromView(WebKitWebView*);
+ WebKitWebView* getViewFromFrame(WebKitWebFrame*);
- WebCore::Frame* core(WebKitFrame*);
- WebKitFrame* kit(WebCore::Frame*);
- WebCore::Page* core(WebKitPage*);
- WebKitPage* kit(WebCore::Page*);
+ WebCore::Frame* core(WebKitWebFrame*);
+ WebKitWebFrame* kit(WebCore::Frame*);
+ WebCore::Page* core(WebKitWebView*);
+ WebKitWebView* kit(WebCore::Page*);
}
extern "C" {
- #define WEBKIT_PAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_PAGE, WebKitPagePrivate))
- typedef struct _WebKitPagePrivate WebKitPagePrivate;
- struct _WebKitPagePrivate {
- WebCore::Page* page;
+ #define WEBKIT_WEB_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewPrivate))
+ typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
+ struct _WebKitWebViewPrivate {
+ WebCore::Page* corePage;
WebCore::Settings* settings;
- WebKitFrame* mainFrame;
+ WebKitWebFrame* mainFrame;
WebCore::String applicationNameForUserAgent;
WebCore::String* userAgent;
bool editable;
};
- #define WEBKIT_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_FRAME, WebKitFramePrivate))
- typedef struct _WebKitFramePrivate WebKitFramePrivate;
- struct _WebKitFramePrivate {
+ #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::FrameLoaderClient* client;
- WebKitPage* page;
+ WebKitWebView* webView;
gchar* name;
gchar* title;
gchar* uri;
};
- WebKitFrame* webkit_frame_init_with_page(WebKitPage*, WebCore::HTMLFrameOwnerElement*);
+ WebKitWebFrame* webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*);
}
#endif
#include "config.h"
-#include "webkitgtksettings.h"
+#include "webkitsettings.h"
extern "C" {
GType webkit_web_settings_get_type(void)
#include <glib.h>
#include <glib-object.h>
-#include "webkitgtkdefines.h"
+#include "webkitdefines.h"
G_BEGIN_DECLS
gboolean should_print_backgrounds;
gboolean text_areas_are_resizable;
WebKitEditableLinkBehaviour editable_link_behaviour;
- gboolean uses_page_cache;
+ gboolean uses_web_view_cache;
gboolean shrink_standalone_images_to_fit;
gboolean show_uris_in_tool_tips;
gchar* ftp_directory_template_path;
*/
#include "config.h"
-#include "webkitgtkframe.h"
-#include "webkitgtkpage.h"
-#include "webkitgtkprivate.h"
+#include "webkitwebframe.h"
+#include "webkitwebview.h"
+#include "webkitprivate.h"
#include "CString.h"
#include "FrameLoader.h"
LAST_SIGNAL
};
-static guint webkit_frame_signals[LAST_SIGNAL] = { 0, };
+static guint webkit_web_frame_signals[LAST_SIGNAL] = { 0, };
-static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location);
+static void webkit_web_frame_real_title_changed(WebKitWebFrame* frame, gchar* title, gchar* location);
-G_DEFINE_TYPE(WebKitFrame, webkit_frame, G_TYPE_OBJECT)
+G_DEFINE_TYPE(WebKitWebFrame, webkit_web_frame, G_TYPE_OBJECT)
-static void webkit_frame_finalize(GObject* object)
+static void webkit_web_frame_finalize(GObject* object)
{
- WebKitFramePrivate* privateData = WEBKIT_FRAME_GET_PRIVATE(WEBKIT_FRAME(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->location);
delete privateData->frame;
- G_OBJECT_CLASS(webkit_frame_parent_class)->finalize(object);
+ G_OBJECT_CLASS(webkit_web_frame_parent_class)->finalize(object);
}
-static void webkit_frame_class_init(WebKitFrameClass* frameClass)
+static void webkit_web_frame_class_init(WebKitWebFrameClass* frameClass)
{
- g_type_class_add_private(frameClass, sizeof(WebKitFramePrivate));
+ g_type_class_add_private(frameClass, sizeof(WebKitWebFramePrivate));
/*
* signals
*/
- webkit_frame_signals[CLEARED] = g_signal_new("cleared",
+ webkit_web_frame_signals[CLEARED] = g_signal_new("cleared",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- webkit_frame_signals[LOAD_DONE] = g_signal_new("load_done",
+ webkit_web_frame_signals[LOAD_DONE] = g_signal_new("load_done",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
- webkit_frame_signals[TITLE_CHANGED] = g_signal_new("title_changed",
+ webkit_web_frame_signals[TITLE_CHANGED] = g_signal_new("title_changed",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitFrameClass, title_changed),
+ G_STRUCT_OFFSET(WebKitWebFrameClass, title_changed),
NULL,
NULL,
webkit_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
- webkit_frame_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
+ webkit_web_frame_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
G_TYPE_FROM_CLASS(frameClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
- frameClass->title_changed = webkit_frame_real_title_changed;
+ frameClass->title_changed = webkit_web_frame_real_title_changed;
/*
* implementations of virtual methods
*/
- G_OBJECT_CLASS(frameClass)->finalize = webkit_frame_finalize;
+ G_OBJECT_CLASS(frameClass)->finalize = webkit_web_frame_finalize;
}
-static void webkit_frame_real_title_changed(WebKitFrame* frame, gchar* title, gchar* location)
+static void webkit_web_frame_real_title_changed(WebKitWebFrame* frame, gchar* title, gchar* location)
{
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
g_free(frameData->title);
g_free(frameData->location);
frameData->title = g_strdup(title);
frameData->location = g_strdup(location);
}
-static void webkit_frame_init(WebKitFrame* frame)
+static void webkit_web_frame_init(WebKitWebFrame* frame)
{
// TODO: Move constructor code here.
}
/**
- * webkit_frame_new:
- * @page: the controlling #WebKitPage
+ * webkit_web_frame_new:
+ * @web_view: the controlling #WebKitWebView
*
- * Creates a new #WebKitFrame initialized with a controlling #WebKitPage.
+ * Creates a new #WebKitWebFrame initialized with a controlling #WebKitWebView.
*
- * Returns: a new #WebKitFrame
+ * Returns: a new #WebKitWebFrame
**/
-WebKitFrame* webkit_frame_new(WebKitPage* page)
+WebKitWebFrame* webkit_web_frame_new(WebKitWebView* webView)
{
- g_return_val_if_fail(WEBKIT_IS_PAGE(page), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitFrame* frame = WEBKIT_FRAME(g_object_new(WEBKIT_TYPE_FRAME, NULL));
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ 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);
frameData->client = new WebKit::FrameLoaderClient(frame);
- frameData->frame = new Frame(pageData->page, 0, frameData->client);
+ frameData->frame = new Frame(webViewData->corePage, 0, frameData->client);
FrameView* frameView = new FrameView(frameData->frame);
- frameView->setContainingWindow(GTK_CONTAINER(page));
+ 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->page = page;
+ frameData->webView = webView;
frameData->name = 0;
frameData->title = 0;
frameData->location = 0;
return frame;
}
-WebKitFrame* webkit_frame_init_with_page(WebKitPage* page, HTMLFrameOwnerElement* element)
+WebKitWebFrame* webkit_web_frame_init_with_web_view(WebKitWebView* webView, HTMLFrameOwnerElement* element)
{
- WebKitFrame* frame = WEBKIT_FRAME(g_object_new(WEBKIT_TYPE_FRAME, NULL));
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
+ 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);
frameData->client = new WebKit::FrameLoaderClient(frame);
- frameData->frame = new Frame(pageData->page, element, frameData->client);
+ frameData->frame = new Frame(webViewData->corePage, element, frameData->client);
FrameView* frameView = new FrameView(frameData->frame);
- frameView->setContainingWindow(GTK_CONTAINER(page));
+ frameView->setContainingWindow(GTK_CONTAINER(webView));
frameData->frame->setView(frameView);
frameView->deref();
frameData->frame->init();
- frameData->page = page;
+ frameData->webView = webView;
return frame;
}
-const gchar* webkit_frame_get_title(WebKitFrame* frame)
+const gchar* webkit_web_frame_get_title(WebKitWebFrame* frame)
{
- g_return_val_if_fail(WEBKIT_IS_FRAME(frame), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
return frameData->title;
}
-const gchar* webkit_frame_get_location(WebKitFrame* frame)
+const gchar* webkit_web_frame_get_location(WebKitWebFrame* frame)
{
- g_return_val_if_fail(WEBKIT_IS_FRAME(frame), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
return frameData->location;
}
/**
- * webkit_frame_get_page:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_get_web_view:
+ * @frame: a #WebKitWebFrame
*
- * Returns the #WebKitPage that manages this #WebKitFrame.
+ * Returns the #WebKitWebView that manages this #WebKitWebFrame.
*
- * The #WebKitPage returned manages the entire hierarchy of #WebKitFrame
+ * The #WebKitWebView returned manages the entire hierarchy of #WebKitWebFrame
* objects that contains @frame.
*
- * Return value: the #WebKitPage that manages @frame
+ * Return value: the #WebKitWebView that manages @frame
*/
-WebKitPage* webkit_frame_get_page(WebKitFrame* frame)
+WebKitWebView* webkit_web_frame_get_web_view(WebKitWebFrame* frame)
{
- g_return_val_if_fail(WEBKIT_IS_FRAME(frame), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
- return frameData->page;
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
+ return frameData->webView;
}
/**
- * webkit_frame_get_name:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_get_name:
+ * @frame: a #WebKitWebFrame
*
* Returns the @frame's name
*
* Return value: the name of @frame
*/
-const gchar* webkit_frame_get_name(WebKitFrame* frame)
+const gchar* webkit_web_frame_get_name(WebKitWebFrame* frame)
{
- g_return_val_if_fail(WEBKIT_IS_FRAME(frame), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(frame);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(frame);
if (frameData->name)
return frameData->name;
}
/**
- * webkit_frame_get_parent:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_get_parent:
+ * @frame: a #WebKitWebFrame
*
* Returns the @frame's parent frame, or %NULL if it has none.
*
- * Return value: the parent #WebKitFrame or %NULL in case there is none
+ * Return value: the parent #WebKitWebFrame or %NULL in case there is none
*/
-WebKitFrame* webkit_frame_get_parent(WebKitFrame* frame)
+WebKitWebFrame* webkit_web_frame_get_parent(WebKitWebFrame* frame)
{
- g_return_val_if_fail(WEBKIT_IS_FRAME(frame), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
Frame* coreFrame = core(frame);
g_return_val_if_fail(coreFrame, NULL);
}
/**
- * webkit_frame_load_request:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_load_request:
+ * @frame: a #WebKitWebFrame
* @request: a #WebKitNetworkRequest
*
* Connects to a given URI by initiating an asynchronous client request.
*
* Creates a provisional data source that will transition to a committed data
- * source once any data has been received. Use webkit_frame_stop_loading() to
+ * source once any data has been received. Use webkit_web_frame_stop_loading() to
* stop the load. This function is typically invoked on the main frame.
*/
-void webkit_frame_load_request(WebKitFrame* frame, WebKitNetworkRequest* request)
+void webkit_web_frame_load_request(WebKitWebFrame* frame, WebKitNetworkRequest* request)
{
- g_return_if_fail(WEBKIT_IS_FRAME(frame));
+ g_return_if_fail(WEBKIT_IS_WEB_FRAME(frame));
g_return_if_fail(WEBKIT_IS_NETWORK_REQUEST(request));
Frame* coreFrame = core(frame);
}
/**
- * webkit_frame_stop_loading:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_stop_loading:
+ * @frame: a #WebKitWebFrame
*
* Stops any pending loads on @frame's data source, and those of its children.
*/
-void webkit_frame_stop_loading(WebKitFrame* frame)
+void webkit_web_frame_stop_loading(WebKitWebFrame* frame)
{
- g_return_if_fail(WEBKIT_IS_FRAME(frame));
+ g_return_if_fail(WEBKIT_IS_WEB_FRAME(frame));
Frame* coreFrame = core(frame);
g_return_if_fail(coreFrame);
}
/**
- * webkit_frame_reload:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_reload:
+ * @frame: a #WebKitWebFrame
*
* Reloads the initial request.
*/
-void webkit_frame_reload(WebKitFrame* frame)
+void webkit_web_frame_reload(WebKitWebFrame* frame)
{
- g_return_if_fail(WEBKIT_IS_FRAME(frame));
+ g_return_if_fail(WEBKIT_IS_WEB_FRAME(frame));
Frame* coreFrame = core(frame);
g_return_if_fail(coreFrame);
}
/**
- * webkit_frame_find_frame:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_find_frame:
+ * @frame: a #WebKitWebFrame
* @name: the name of the frame to be found
*
* For pre-defined names, returns @frame if @name is "_self" or "_current",
* hierarchy, this function will search for a matching frame in other main
* frame hierarchies. Returns %NULL if no match is found.
*
- * Return value: the found #WebKitFrame or %NULL in case none is found
+ * Return value: the found #WebKitWebFrame or %NULL in case none is found
*/
-WebKitFrame* webkit_frame_find_frame(WebKitFrame* frame, const gchar* name)
+WebKitWebFrame* webkit_web_frame_find_frame(WebKitWebFrame* frame, const gchar* name)
{
- g_return_val_if_fail(WEBKIT_IS_FRAME(frame), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
g_return_val_if_fail(name, NULL);
Frame* coreFrame = core(frame);
}
/**
- * webkit_frame_get_global_context:
- * @frame: a #WebKitFrame
+ * webkit_web_frame_get_global_context:
+ * @frame: a #WebKitWebFrame
*
* Gets the global JavaScript execution context. Use this function to bridge
* between the WebKit and JavaScriptCore APIs.
*
* Return value: the global JavaScript context
*/
-JSGlobalContextRef webkit_frame_get_global_context(WebKitFrame* frame)
+JSGlobalContextRef webkit_web_frame_get_global_context(WebKitWebFrame* frame)
{
- g_return_val_if_fail(WEBKIT_IS_FRAME(frame), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
Frame* coreFrame = core(frame);
g_return_val_if_fail(coreFrame, NULL);
--- /dev/null
+/*
+ * Copyright (C) 2007 Holger Hans Peter Freyther
+ * Copyright (C) 2007 Alp Toker <alp@atoker.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WEBKIT_WEB_FRAME_H
+#define WEBKIT_WEB_FRAME_H
+
+#include <glib-object.h>
+#include <gdk/gdk.h>
+
+#include "webkitdefines.h"
+
+G_BEGIN_DECLS
+
+#define WEBKIT_TYPE_WEB_FRAME (webkit_web_frame_get_type())
+#define WEBKIT_WEB_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFrame))
+#define WEBKIT_WEB_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_WEB_FRAME, WebKitWebFrameClass))
+#define WEBKIT_IS_WEB_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_WEB_FRAME))
+#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))
+
+
+struct _WebKitWebFrame {
+ GObject parent;
+};
+
+struct _WebKitWebFrameClass {
+ GObjectClass parent;
+
+ void (*title_changed) (WebKitWebFrame* frame, gchar* title, gchar* location);
+
+ /*
+ * protected virtual methods
+ */
+ void (*mouse_move_event) (WebKitWebFrame* frame, GdkEvent* move_event);
+ void (*mouse_press_event) (WebKitWebFrame* frame, GdkEvent* press_event);
+ void (*mouse_release_event) (WebKitWebFrame* frame, GdkEvent* mouse_release_event);
+ void (*mouse_double_click_event) (WebKitWebFrame* frame, GdkEvent* double_click_event);
+ void (*mouse_wheel_event) (WebKitWebFrame* frame, GdkEvent* wheel_event);
+};
+
+WEBKIT_API GType
+webkit_web_frame_get_type (void);
+
+WEBKIT_API WebKitWebFrame*
+webkit_web_frame_new (WebKitWebView* web_view);
+
+WEBKIT_API WebKitWebView*
+webkit_web_frame_get_web_view (WebKitWebFrame* frame);
+
+WEBKIT_API const gchar*
+webkit_web_frame_get_name (WebKitWebFrame* frame);
+
+WEBKIT_API const gchar*
+webkit_web_frame_get_title (WebKitWebFrame* frame);
+
+WEBKIT_API const gchar*
+webkit_web_frame_get_location (WebKitWebFrame* frame);
+
+WEBKIT_API WebKitWebFrame*
+webkit_web_frame_get_parent (WebKitWebFrame* frame);
+
+WEBKIT_API void
+webkit_web_frame_load_request (WebKitWebFrame* frame, WebKitNetworkRequest* request);
+
+WEBKIT_API void
+webkit_web_frame_stop_loading (WebKitWebFrame* frame);
+
+WEBKIT_API void
+webkit_web_frame_reload (WebKitWebFrame* frame);
+
+WEBKIT_API WebKitWebFrame*
+webkit_web_frame_find_frame (WebKitWebFrame* frame, const gchar* name);
+
+WEBKIT_API JSGlobalContextRef
+webkit_web_frame_get_global_context (WebKitWebFrame* frame);
+
+G_END_DECLS
+
+#endif
#include "config.h"
-#include "webkitgtkpage.h"
-#include "webkitgtk-marshal.h"
-#include "webkitgtkprivate.h"
+#include "webkitwebview.h"
+#include "webkit-marshal.h"
+#include "webkitprivate.h"
#include "NotImplemented.h"
#include "ChromeClientGtk.h"
LAST_SIGNAL
};
-static guint webkit_page_signals[LAST_SIGNAL] = { 0, };
+static guint webkit_web_view_signals[LAST_SIGNAL] = { 0, };
-G_DEFINE_TYPE(WebKitPage, webkit_page, GTK_TYPE_CONTAINER)
+G_DEFINE_TYPE(WebKitWebView, webkit_web_view, GTK_TYPE_CONTAINER)
-static gboolean webkit_page_expose_event(GtkWidget* widget, GdkEventExpose* event)
+static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
+ Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
GdkRectangle clip;
gdk_region_get_clipbox(event->region, &clip);
cairo_t* cr = gdk_cairo_create(event->window);
return FALSE;
}
-static gboolean webkit_page_key_event(GtkWidget* widget, GdkEventKey* event)
+static gboolean webkit_web_view_key_event(GtkWidget* widget, GdkEventKey* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
+ Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
PlatformKeyboardEvent keyboardEvent(event);
if (frame->eventHandler()->keyEvent(keyboardEvent))
return FALSE;
}
-static gboolean webkit_page_button_event(GtkWidget* widget, GdkEventButton* event)
+static gboolean webkit_web_view_button_event(GtkWidget* widget, GdkEventButton* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
+ Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
if (event->type == GDK_BUTTON_RELEASE)
return frame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(event));
return frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(event));
}
-static gboolean webkit_page_motion_event(GtkWidget* widget, GdkEventMotion* event)
+static gboolean webkit_web_view_motion_event(GtkWidget* widget, GdkEventMotion* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
+ Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
return frame->eventHandler()->mouseMoved(PlatformMouseEvent(event));
}
-static gboolean webkit_page_scroll_event(GtkWidget* widget, GdkEventScroll* event)
+static gboolean webkit_web_view_scroll_event(GtkWidget* widget, GdkEventScroll* event)
{
- Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
+ Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
PlatformWheelEvent wheelEvent(event);
return frame->eventHandler()->handleWheelEvent(wheelEvent);
}
-static void webkit_page_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
+static void webkit_web_view_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
{
- GTK_WIDGET_CLASS(webkit_page_parent_class)->size_allocate(widget,allocation);
+ GTK_WIDGET_CLASS(webkit_web_view_parent_class)->size_allocate(widget,allocation);
- Frame* frame = core(getFrameFromPage(WEBKIT_PAGE(widget)));
+ Frame* frame = core(getFrameFromView(WEBKIT_WEB_VIEW(widget)));
frame->view()->resize(allocation->width, allocation->height);
frame->forceLayout();
frame->view()->adjustViewSize();
frame->sendResizeEvent();
}
-static void webkit_page_realize(GtkWidget* widget)
+static void webkit_web_view_realize(GtkWidget* widget)
{
GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
gdk_window_set_user_data(widget->window, widget);
}
-static void webkit_page_set_scroll_adjustments(WebKitPage* page, GtkAdjustment* hadj, GtkAdjustment* vadj)
+static void webkit_web_view_set_scroll_adjustments(WebKitWebView* webView, GtkAdjustment* hadj, GtkAdjustment* vadj)
{
- FrameView* view = core(getFrameFromPage(page))->view();
+ FrameView* view = core(getFrameFromView(webView))->view();
view->setGtkAdjustments(hadj, vadj);
}
-static void webkit_page_container_add(GtkContainer* container, GtkWidget* widget)
+static void webkit_web_view_container_add(GtkContainer* container, GtkWidget* widget)
{
- WebKitPage* page = WEBKIT_PAGE(container);
- WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(page);
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(container);
+ WebKitWebViewPrivate* private_data = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
private_data->children.add(widget);
if (GTK_WIDGET_REALIZED(container))
- gtk_widget_set_parent_window(widget, GTK_WIDGET(page)->window);
+ gtk_widget_set_parent_window(widget, GTK_WIDGET(webView)->window);
gtk_widget_set_parent(widget, GTK_WIDGET(container));
}
-static void webkit_page_container_remove(GtkContainer* container, GtkWidget* widget)
+static void webkit_web_view_container_remove(GtkContainer* container, GtkWidget* widget)
{
- WebKitPagePrivate* private_data = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container));
+ WebKitWebViewPrivate* private_data = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(container));
if (private_data->children.contains(widget)) {
gtk_widget_unparent(widget);
}
}
-static void webkit_page_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
+static void webkit_web_view_container_forall(GtkContainer* container, gboolean, GtkCallback callback, gpointer callbackData)
{
- WebKitPagePrivate* privateData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(container));
+ WebKitWebViewPrivate* privateData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(container));
HashSet<GtkWidget*> children = privateData->children;
HashSet<GtkWidget*>::const_iterator end = children.end();
(*callback)(*current, callbackData);
}
-static WebKitPage* webkit_page_real_create_page(WebKitPage*)
+static WebKitWebView* webkit_web_view_real_create_web_view(WebKitWebView*)
{
notImplemented();
return 0;
}
-static WebKitNavigationResponse webkit_page_real_navigation_requested(WebKitPage*, WebKitFrame* frame, WebKitNetworkRequest*)
+static WebKitNavigationResponse webkit_web_view_real_navigation_requested(WebKitWebView*, WebKitWebFrame* frame, WebKitNetworkRequest*)
{
notImplemented();
return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
}
-static void webkit_page_real_window_object_cleared(WebKitPage*, WebKitFrame*, JSGlobalContextRef context, JSObjectRef window_object)
+static void webkit_web_view_real_window_object_cleared(WebKitWebView*, WebKitWebFrame*, JSGlobalContextRef context, JSObjectRef window_object)
{
notImplemented();
}
-static gchar* webkit_page_real_choose_file(WebKitPage*, WebKitFrame*, const gchar* old_name)
+static gchar* webkit_web_view_real_choose_file(WebKitWebView*, WebKitWebFrame*, const gchar* old_name)
{
notImplemented();
return g_strdup(old_name);
WEBKIT_SCRIPT_DIALOG_PROMPT
} WebKitScriptDialogType;
-static gboolean webkit_page_script_dialog(WebKitPage* page, WebKitFrame* frame, const gchar* message, WebKitScriptDialogType type, const gchar* defaultValue, gchar** value)
+static gboolean webkit_web_view_script_dialog(WebKitWebView* webView, WebKitWebFrame* frame, const gchar* message, WebKitScriptDialogType type, const gchar* defaultValue, gchar** value)
{
GtkMessageType messageType;
GtkButtonsType buttons;
return FALSE;
}
- window = gtk_widget_get_toplevel(GTK_WIDGET(page));
+ window = gtk_widget_get_toplevel(GTK_WIDGET(webView));
dialog = gtk_message_dialog_new(GTK_WIDGET_TOPLEVEL(window) ? GTK_WINDOW(window) : 0, GTK_DIALOG_DESTROY_WITH_PARENT, messageType, buttons, "%s", message);
- gchar* title = g_strconcat("JavaScript - ", webkit_frame_get_location(frame), NULL);
+ gchar* title = g_strconcat("JavaScript - ", webkit_web_frame_get_location(frame), NULL);
gtk_window_set_title(GTK_WINDOW(dialog), title);
g_free(title);
return didConfirm;
}
-static gboolean webkit_page_real_script_alert(WebKitPage* page, WebKitFrame* frame, const gchar* message)
+static gboolean webkit_web_view_real_script_alert(WebKitWebView* webView, WebKitWebFrame* frame, const gchar* message)
{
- webkit_page_script_dialog(page, frame, message, WEBKIT_SCRIPT_DIALOG_ALERT, 0, 0);
+ webkit_web_view_script_dialog(webView, frame, message, WEBKIT_SCRIPT_DIALOG_ALERT, 0, 0);
return TRUE;
}
-static gboolean webkit_page_real_script_confirm(WebKitPage* page, WebKitFrame* frame, const gchar* message, gboolean* didConfirm)
+static gboolean webkit_web_view_real_script_confirm(WebKitWebView* webView, WebKitWebFrame* frame, const gchar* message, gboolean* didConfirm)
{
- *didConfirm = webkit_page_script_dialog(page, frame, message, WEBKIT_SCRIPT_DIALOG_CONFIRM, 0, 0);
+ *didConfirm = webkit_web_view_script_dialog(webView, frame, message, WEBKIT_SCRIPT_DIALOG_CONFIRM, 0, 0);
return TRUE;
}
-static gboolean webkit_page_real_script_prompt(WebKitPage* page, WebKitFrame* frame, const gchar* message, const gchar* defaultValue, gchar** value)
+static gboolean webkit_web_view_real_script_prompt(WebKitWebView* webView, WebKitWebFrame* frame, const gchar* message, const gchar* defaultValue, gchar** value)
{
- if (!webkit_page_script_dialog(page, frame, message, WEBKIT_SCRIPT_DIALOG_PROMPT, defaultValue, value))
+ if (!webkit_web_view_script_dialog(webView, frame, message, WEBKIT_SCRIPT_DIALOG_PROMPT, defaultValue, value))
*value = NULL;
return TRUE;
}
-static gboolean webkit_page_real_console_message(WebKitPage* page, const gchar* message, unsigned int line, const gchar* sourceId)
+static gboolean webkit_web_view_real_console_message(WebKitWebView* webView, const gchar* message, unsigned int line, const gchar* sourceId)
{
g_print("console message: %s @%d: %s\n", sourceId, line, message);
return TRUE;
}
-static void webkit_page_finalize(GObject* object)
+static void webkit_web_view_finalize(GObject* object)
{
- webkit_page_stop_loading(WEBKIT_PAGE(object));
+ webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object));
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(object));
- delete pageData->page;
- delete pageData->settings;
- g_object_unref(pageData->mainFrame);
- delete pageData->userAgent;
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(object));
+ delete webViewData->corePage;
+ delete webViewData->settings;
+ g_object_unref(webViewData->mainFrame);
+ delete webViewData->userAgent;
- G_OBJECT_CLASS(webkit_page_parent_class)->finalize(object);
+ G_OBJECT_CLASS(webkit_web_view_parent_class)->finalize(object);
}
-static void webkit_page_class_init(WebKitPageClass* pageClass)
+static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
{
- g_type_class_add_private(pageClass, sizeof(WebKitPagePrivate));
+ g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
/*
* Signals
*/
- webkit_page_signals[NAVIGATION_REQUESTED] = g_signal_new("navigation_requested",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[NAVIGATION_REQUESTED] = g_signal_new("navigation_requested",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET (WebKitPageClass, navigation_requested),
+ G_STRUCT_OFFSET (WebKitWebViewClass, navigation_requested),
NULL,
NULL,
webkit_marshal_INT__OBJECT_OBJECT,
G_TYPE_OBJECT);
/**
- * WebKitPage::window-object-cleared:
- * @page: the object on which the signal is emitted
- * @frame: the #WebKitFrame to which @window_object belongs
+ * WebKitWebView::window-object-cleared:
+ * @web_view: the object on which the signal is emitted
+ * @frame: the #WebKitWebFrame to which @window_object belongs
* @context: the #JSGlobalContextRef holding the global object and other
* execution state; equivalent to the return value of
- * webkit_frame_get_global_context(@frame)
+ * webkit_web_frame_get_global_context(@frame)
*
* @window_object: the #JSObjectRef representing the frame's JavaScript
* window object
*
- * Emitted when the JavaScript window object in a #WebKitFrame has been
+ * Emitted when the JavaScript window object in a #WebKitWebFrame has been
* cleared in preparation for a new load. This is the preferred place to
* set custom properties on the window object using the JavaScriptCore API.
*/
- webkit_page_signals[WINDOW_OBJECT_CLEARED] = g_signal_new("window_object_cleared",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[WINDOW_OBJECT_CLEARED] = g_signal_new("window_object_cleared",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET (WebKitPageClass, window_object_cleared),
+ G_STRUCT_OFFSET (WebKitWebViewClass, window_object_cleared),
NULL,
NULL,
webkit_marshal_VOID__OBJECT_POINTER_POINTER,
G_TYPE_NONE, 3,
- WEBKIT_TYPE_FRAME,
+ WEBKIT_TYPE_WEB_FRAME,
G_TYPE_POINTER,
G_TYPE_POINTER);
/**
- * WebKitPage::load-started:
- *
- * @page: the object on which the signal is emitted
+ * WebKitWebView::load-started:
+ * @web_view: the object on which the signal is emitted
* @frame: the frame going to do the load
*
- * When a #WebKitFrame begins to load this signal is emitted.
+ * When a #WebKitWebFrame begins to load this signal is emitted.
*/
- webkit_page_signals[LOAD_STARTED] = g_signal_new("load_started",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[LOAD_STARTED] = g_signal_new("load_started",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- WEBKIT_TYPE_FRAME);
+ WEBKIT_TYPE_WEB_FRAME);
/**
- * WebKitPage::load-progress-changed:
- *
- * @page: the #WebKitPage
+ * WebKitWebView::load-progress-changed:
+ * @web_view: the #WebKitWebView
* @progress: the global progress
*/
- webkit_page_signals[LOAD_PROGRESS_CHANGED] = g_signal_new("load_progress_changed",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[LOAD_PROGRESS_CHANGED] = g_signal_new("load_progress_changed",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
G_TYPE_NONE, 1,
G_TYPE_INT);
- webkit_page_signals[LOAD_FINISHED] = g_signal_new("load_finished",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[LOAD_FINISHED] = g_signal_new("load_finished",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- WEBKIT_TYPE_FRAME);
+ WEBKIT_TYPE_WEB_FRAME);
- webkit_page_signals[TITLE_CHANGED] = g_signal_new("title_changed",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[TITLE_CHANGED] = g_signal_new("title_changed",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING);
- webkit_page_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[HOVERING_OVER_LINK] = g_signal_new("hovering_over_link",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
G_TYPE_STRING,
G_TYPE_STRING);
- webkit_page_signals[STATUS_BAR_TEXT_CHANGED] = g_signal_new("status_bar_text_changed",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[STATUS_BAR_TEXT_CHANGED] = g_signal_new("status_bar_text_changed",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
- webkit_page_signals[ICOND_LOADED] = g_signal_new("icon_loaded",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[ICOND_LOADED] = g_signal_new("icon_loaded",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- webkit_page_signals[SELECTION_CHANGED] = g_signal_new("selection_changed",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[SELECTION_CHANGED] = g_signal_new("selection_changed",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
NULL,
G_TYPE_NONE, 0);
/**
- * WebKitPage::console-message:
- *
- * @page: the object on which the signal is emitted
+ * WebKitWebView::console-message:
+ * @web_view: the object on which the signal is emitted
* @message: the message text
* @line: the line where the error occured
* @source_id: the source id
*
* A JavaScript console message was created.
*/
- webkit_page_signals[CONSOLE_MESSAGE] = g_signal_new("console_message",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[CONSOLE_MESSAGE] = g_signal_new("console_message",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitPageClass, console_message),
+ G_STRUCT_OFFSET(WebKitWebViewClass, console_message),
g_signal_accumulator_true_handled,
NULL,
webkit_marshal_BOOLEAN__STRING_INT_STRING,
G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
/**
- * WebKitPage::script-alert:
- *
- * @page: the object on which the signal is emitted
+ * WebKitWebView::script-alert:
+ * @web_view: the object on which the signal is emitted
* @frame: the relevant frame
* @message: the message text
* @return: TRUE to stop other handlers from being invoked for the event. FALSE to propagate the event further.
*
* A JavaScript alert dialog was created.
*/
- webkit_page_signals[SCRIPT_ALERT] = g_signal_new("script-alert",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[SCRIPT_ALERT] = g_signal_new("script-alert",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitPageClass, script_alert),
+ G_STRUCT_OFFSET(WebKitWebViewClass, script_alert),
g_signal_accumulator_true_handled,
NULL,
webkit_marshal_BOOLEAN__OBJECT_STRING,
G_TYPE_OBJECT, G_TYPE_STRING);
/**
- * WebKitPage::script-confirm:
- *
- * @page: the object on which the signal is emitted
+ * WebKitWebView::script-confirm:
+ * @web_view: the object on which the signal is emitted
* @frame: the relevant frame
* @message: the message text
* @confirmed: whether the dialog has been confirmed
*
* A JavaScript confirm dialog was created, providing Yes and No buttons.
*/
- webkit_page_signals[SCRIPT_CONFIRM] = g_signal_new("script_confirm",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[SCRIPT_CONFIRM] = g_signal_new("script_confirm",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitPageClass, script_confirm),
+ G_STRUCT_OFFSET(WebKitWebViewClass, script_confirm),
g_signal_accumulator_true_handled,
NULL,
webkit_marshal_BOOLEAN__OBJECT_STRING_BOOLEAN,
G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_BOOLEAN);
/**
- * WebKitPage::script-prompt:
- *
- * @page: the object on which the signal is emitted
+ * WebKitWebView::script-prompt:
+ * @web_view: the object on which the signal is emitted
* @frame: the relevant frame
* @message: the message text
* @default: the default value
*
* A JavaScript prompt dialog was created, providing an entry to input text.
*/
- webkit_page_signals[SCRIPT_PROMPT] = g_signal_new("script_prompt",
- G_TYPE_FROM_CLASS(pageClass),
+ webkit_web_view_signals[SCRIPT_PROMPT] = g_signal_new("script_prompt",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitPageClass, script_prompt),
+ G_STRUCT_OFFSET(WebKitWebViewClass, script_prompt),
g_signal_accumulator_true_handled,
NULL,
webkit_marshal_BOOLEAN__OBJECT_STRING_STRING_STRING,
/*
* implementations of virtual methods
*/
- pageClass->create_page = webkit_page_real_create_page;
- pageClass->navigation_requested = webkit_page_real_navigation_requested;
- pageClass->window_object_cleared = webkit_page_real_window_object_cleared;
- pageClass->choose_file = webkit_page_real_choose_file;
- pageClass->script_alert = webkit_page_real_script_alert;
- pageClass->script_confirm = webkit_page_real_script_confirm;
- pageClass->script_prompt = webkit_page_real_script_prompt;
- pageClass->console_message = webkit_page_real_console_message;
-
- G_OBJECT_CLASS(pageClass)->finalize = webkit_page_finalize;
-
- GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(pageClass);
- widgetClass->realize = webkit_page_realize;
- widgetClass->expose_event = webkit_page_expose_event;
- widgetClass->key_press_event = webkit_page_key_event;
- widgetClass->key_release_event = webkit_page_key_event;
- widgetClass->button_press_event = webkit_page_button_event;
- widgetClass->button_release_event = webkit_page_button_event;
- widgetClass->motion_notify_event = webkit_page_motion_event;
- widgetClass->scroll_event = webkit_page_scroll_event;
- widgetClass->size_allocate = webkit_page_size_allocate;
-
- GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(pageClass);
- containerClass->add = webkit_page_container_add;
- containerClass->remove = webkit_page_container_remove;
- containerClass->forall = webkit_page_container_forall;
+ webViewClass->create_web_view = webkit_web_view_real_create_web_view;
+ webViewClass->navigation_requested = webkit_web_view_real_navigation_requested;
+ webViewClass->window_object_cleared = webkit_web_view_real_window_object_cleared;
+ webViewClass->choose_file = webkit_web_view_real_choose_file;
+ webViewClass->script_alert = webkit_web_view_real_script_alert;
+ webViewClass->script_confirm = webkit_web_view_real_script_confirm;
+ webViewClass->script_prompt = webkit_web_view_real_script_prompt;
+ webViewClass->console_message = webkit_web_view_real_console_message;
+
+ G_OBJECT_CLASS(webViewClass)->finalize = webkit_web_view_finalize;
+
+ GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(webViewClass);
+ widgetClass->realize = webkit_web_view_realize;
+ widgetClass->expose_event = webkit_web_view_expose_event;
+ widgetClass->key_press_event = webkit_web_view_key_event;
+ widgetClass->key_release_event = webkit_web_view_key_event;
+ widgetClass->button_press_event = webkit_web_view_button_event;
+ widgetClass->button_release_event = webkit_web_view_button_event;
+ widgetClass->motion_notify_event = webkit_web_view_motion_event;
+ widgetClass->scroll_event = webkit_web_view_scroll_event;
+ widgetClass->size_allocate = webkit_web_view_size_allocate;
+
+ GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(webViewClass);
+ containerClass->add = webkit_web_view_container_add;
+ containerClass->remove = webkit_web_view_container_remove;
+ containerClass->forall = webkit_web_view_container_forall;
/*
* make us scrollable (e.g. addable to a GtkScrolledWindow)
*/
- pageClass->set_scroll_adjustments = webkit_page_set_scroll_adjustments;
- GTK_WIDGET_CLASS(pageClass)->set_scroll_adjustments_signal = g_signal_new("set_scroll_adjustments",
- G_TYPE_FROM_CLASS(pageClass),
+ webViewClass->set_scroll_adjustments = webkit_web_view_set_scroll_adjustments;
+ GTK_WIDGET_CLASS(webViewClass)->set_scroll_adjustments_signal = g_signal_new("set_scroll_adjustments",
+ G_TYPE_FROM_CLASS(webViewClass),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
- G_STRUCT_OFFSET(WebKitPageClass, set_scroll_adjustments),
+ G_STRUCT_OFFSET(WebKitWebViewClass, set_scroll_adjustments),
NULL, NULL,
webkit_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
}
-static void webkit_page_init(WebKitPage* page)
+static void webkit_web_view_init(WebKitWebView* webView)
{
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(WEBKIT_PAGE(page));
- pageData->page = new Page(new WebKit::ChromeClient(page), new WebKit::ContextMenuClient, new WebKit::EditorClient(page), new WebKit::DragClient, new WebKit::InspectorClient);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(webView));
+ webViewData->corePage = new Page(new WebKit::ChromeClient(webView), new WebKit::ContextMenuClient, new WebKit::EditorClient(webView), new WebKit::DragClient, new WebKit::InspectorClient);
- Settings* settings = pageData->page->settings();
+ Settings* settings = webViewData->corePage->settings();
settings->setLoadsImagesAutomatically(true);
settings->setMinimumFontSize(5);
settings->setMinimumLogicalFontSize(5);
settings->setFixedFontFamily("Courier New");
settings->setStandardFontFamily("Arial");
- GTK_WIDGET_SET_FLAGS(page, GTK_CAN_FOCUS);
- pageData->mainFrame = WEBKIT_FRAME(webkit_frame_new(page));
- pageData->editable = false;
+ GTK_WIDGET_SET_FLAGS(webView, GTK_CAN_FOCUS);
+ webViewData->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView));
+ webViewData->editable = false;
}
-GtkWidget* webkit_page_new(void)
+GtkWidget* webkit_web_view_new(void)
{
- WebKitPage* page = WEBKIT_PAGE(g_object_new(WEBKIT_TYPE_PAGE, NULL));
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW, NULL));
- return GTK_WIDGET(page);
+ return GTK_WIDGET(webView);
}
-void webkit_page_set_settings(WebKitPage* page, WebKitSettings* settings)
+void webkit_web_view_set_settings(WebKitWebView* webView, WebKitSettings* settings)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(settings);
notImplemented();
}
-WebKitSettings* webkit_page_get_settings(WebKitPage* page)
+WebKitSettings* webkit_web_view_get_settings(WebKitWebView* webView)
{
- g_return_val_if_fail(WEBKIT_IS_PAGE(page), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
notImplemented();
return NULL;
}
-void webkit_page_go_backward(WebKitPage* page)
+void webkit_web_view_go_backward(WebKitWebView* webView)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
frameData->frame->loader()->goBackOrForward(-1);
}
-void webkit_page_go_forward(WebKitPage* page)
+void webkit_web_view_go_forward(WebKitWebView* webView)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
frameData->frame->loader()->goBackOrForward(1);
}
-gboolean webkit_page_can_go_backward(WebKitPage* page)
+gboolean webkit_web_view_can_go_backward(WebKitWebView* webView)
{
- g_return_val_if_fail(WEBKIT_IS_PAGE(page), FALSE);
+ g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
return frameData->frame->loader()->canGoBackOrForward(-1);
}
-gboolean webkit_page_can_go_forward(WebKitPage* page)
+gboolean webkit_web_view_can_go_forward(WebKitWebView* webView)
{
- g_return_val_if_fail(WEBKIT_IS_PAGE(page), FALSE);
+ g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
return frameData->frame->loader()->canGoBackOrForward(1);
}
-void webkit_page_open(WebKitPage* page, const gchar* uri)
+void webkit_web_view_open(WebKitWebView* webView, const gchar* uri)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
DeprecatedString string = DeprecatedString::fromUtf8(uri);
frameData->frame->loader()->load(ResourceRequest(KURL(string)));
}
-void webkit_page_reload(WebKitPage* page)
+void webkit_web_view_reload(WebKitWebView* webView)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
frameData->frame->loader()->reload();
}
-void webkit_page_load_string(WebKitPage* page, const gchar* content, const gchar* contentMimeType, const gchar* contentEncoding, const gchar* baseUri)
+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_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
KURL url(DeprecatedString::fromUtf8(baseUri));
RefPtr<SharedBuffer> sharedBuffer = new SharedBuffer(strdup(content), strlen(content));
frameData->frame->loader()->load(ResourceRequest(url), substituteData);
}
-void webkit_page_load_html_string(WebKitPage* page, const gchar* content, const gchar* baseUrl)
+void webkit_web_view_load_html_string(WebKitWebView* webView, const gchar* content, const gchar* baseUrl)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- webkit_page_load_string(page, content, "text/html", "UTF-8", baseUrl);
+ webkit_web_view_load_string(webView, content, "text/html", "UTF-8", baseUrl);
}
-void webkit_page_stop_loading(WebKitPage* page)
+void webkit_web_view_stop_loading(WebKitWebView* webView)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
if (FrameLoader* loader = frameData->frame->loader())
loader->stopAllLoaders();
}
-WebKitFrame* webkit_page_get_main_frame(WebKitPage* page)
+WebKitWebFrame* webkit_web_view_get_main_frame(WebKitWebView* webView)
{
- g_return_val_if_fail(WEBKIT_IS_PAGE(page), NULL);
+ g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- return pageData->mainFrame;
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ return webViewData->mainFrame;
}
-void webkit_page_execute_script(WebKitPage* page, const gchar* script)
+void webkit_web_view_execute_script(WebKitWebView* webView, const gchar* script)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
g_return_if_fail(script);
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- WebKitFramePrivate* frameData = WEBKIT_FRAME_GET_PRIVATE(pageData->mainFrame);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ WebKitWebFramePrivate* frameData = WEBKIT_WEB_FRAME_GET_PRIVATE(webViewData->mainFrame);
if (FrameLoader* loader = frameData->frame->loader())
loader->executeScript(String::fromUTF8(script), true);
}
/**
- * webkit_page_get_editable:
- * @page: a #WebKitPage
+ * webkit_web_view_get_editable:
+ * @web_view: a #WebKitWebView
*
* Returns whether the user is allowed to edit the document.
*
- * Returns %TRUE if @page allows the user to edit the HTML document, %FALSE if
- * it doesn't. You can change @page's document programmatically regardless of
+ * Returns %TRUE if @web_view allows the user to edit the HTML document, %FALSE if
+ * it doesn't. You can change @web_view's document programmatically regardless of
* this setting.
*
* Return value: a #gboolean indicating the editable state
*/
-gboolean webkit_page_get_editable(WebKitPage* page)
+gboolean webkit_web_view_get_editable(WebKitWebView* webView)
{
- g_return_val_if_fail(WEBKIT_IS_PAGE(page), FALSE);
+ g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- ASSERT(pageData);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ ASSERT(webViewData);
- return pageData->editable;
+ return webViewData->editable;
}
/**
- * webkit_page_set_editable:
- * @page: a #WebKitPage
+ * webkit_web_view_set_editable:
+ * @web_view: a #WebKitWebView
* @flag: a #gboolean indicating the editable state
*
- * Sets whether @page allows the user to edit its HTML document.
+ * Sets whether @web_view allows the user to edit its HTML document.
*
- * If @flag is %TRUE, @page allows the user to edit the document. If @flag is
- * %FALSE, an element in @page's document can only be edited if the
+ * If @flag is %TRUE, @web_view allows the user to edit the document. If @flag is
+ * %FALSE, an element in @web_view's document can only be edited if the
* CONTENTEDITABLE attribute has been set on the element or one of its parent
- * elements. You can change @page's document programmatically regardless of
- * this setting. By default a #WebKitPage is not editable.
+ * elements. You can change @web_view's document programmatically regardless of
+ * this setting. By default a #WebKitWebView is not editable.
* Normally, an HTML document is not editable unless the elements within the
* document are editable. This function provides a low-level way to make the
- * contents of a #WebKitPage editable without altering the document or DOM
+ * contents of a #WebKitWebView editable without altering the document or DOM
* structure.
*/
-void webkit_page_set_editable(WebKitPage* page, gboolean flag)
+void webkit_web_view_set_editable(WebKitWebView* webView, gboolean flag)
{
- g_return_if_fail(WEBKIT_IS_PAGE(page));
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
flag = flag != FALSE;
- WebKitPagePrivate* pageData = WEBKIT_PAGE_GET_PRIVATE(page);
- ASSERT(pageData);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
+ ASSERT(webViewData);
- Frame* mainFrame = core(pageData->mainFrame);
+ Frame* mainFrame = core(webViewData->mainFrame);
g_return_if_fail(mainFrame);
// TODO: What happens when the frame is replaced?
- if (flag == pageData->editable)
+ if (flag == webViewData->editable)
return;
- pageData->editable = flag;
+ webViewData->editable = flag;
if (flag) {
mainFrame->applyEditingStyleToBodyElement();
- // TODO: If the WebKitPage is made editable and the selection is empty, set it to something.
- //if (!webkit_page_get_selected_dom_range(page))
+ // 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();
--- /dev/null
+/*
+ * Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WEBKIT_WEB_VIEW_H
+#define WEBKIT_WEB_VIEW_H
+
+#include <gtk/gtk.h>
+
+#include "webkitdefines.h"
+#include "webkitsettings.h"
+
+G_BEGIN_DECLS
+
+#define WEBKIT_TYPE_WEB_VIEW (webkit_web_view_get_type())
+#define WEBKIT_WEB_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_WEB_VIEW, WebKitWebView))
+#define WEBKIT_WEB_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
+#define WEBKIT_IS_WEB_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_WEB_VIEW))
+#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 enum {
+ WEBKIT_NAVIGATION_RESPONSE_ACCEPT,
+ WEBKIT_NAVIGATION_RESPONSE_IGNORE,
+ WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD
+} WebKitNavigationResponse;
+
+
+
+struct _WebKitWebView {
+ GtkContainer parent;
+};
+
+struct _WebKitWebViewClass {
+ GtkContainerClass parent;
+
+ /*
+ * default handler/virtual methods
+ * DISCUSS: create_web_view needs a request and should we make this a signal with default handler? this would
+ * require someone doing a g_signal_stop_emission_by_name
+ * WebUIDelegate has nothing for create_frame, WebPolicyDelegate as well...
+ */
+ WebKitWebView* (*create_web_view) (WebKitWebView* web_view);
+
+ /*
+ * TODO: FIXME: Create something like WebPolicyDecisionListener_Protocol instead
+ */
+ WebKitNavigationResponse (*navigation_requested) (WebKitWebView* web_view, WebKitWebFrame* frame, WebKitNetworkRequest* request);
+
+ void (*window_object_cleared) (WebKitWebView* web_view, WebKitWebFrame* frame, JSGlobalContextRef context, JSObjectRef window_object);
+ gchar* (*choose_file) (WebKitWebView* web_view, WebKitWebFrame* frame, const gchar* old_file);
+ gboolean (*script_alert) (WebKitWebView* web_view, WebKitWebFrame* frame, const gchar* alert_message);
+ gboolean (*script_confirm) (WebKitWebView* web_view, WebKitWebFrame* frame, const gchar* confirm_message, gboolean* did_confirm);
+ gboolean (*script_prompt) (WebKitWebView* web_view, WebKitWebFrame* frame, const gchar* message, const gchar* default_value, gchar** value);
+ gboolean (*console_message) (WebKitWebView* web_view, const gchar* message, unsigned int line_number, const gchar* source_id);
+
+ /*
+ * internal
+ */
+ void (*set_scroll_adjustments) (WebKitWebView*, GtkAdjustment*, GtkAdjustment*);
+};
+
+WEBKIT_API GType
+webkit_web_view_get_type (void);
+
+WEBKIT_API GtkWidget*
+webkit_web_view_new (void);
+
+WEBKIT_API gboolean
+webkit_web_view_can_go_backward (WebKitWebView* web_view);
+
+WEBKIT_API gboolean
+webkit_web_view_can_go_forward (WebKitWebView* web_view);
+
+WEBKIT_API void
+webkit_web_view_go_backward (WebKitWebView* web_view);
+
+WEBKIT_API void
+webkit_web_view_go_forward (WebKitWebView* web_view);
+
+WEBKIT_API void
+webkit_web_view_stop_loading (WebKitWebView* web_view);
+
+WEBKIT_API void
+webkit_web_view_open (WebKitWebView* web_view, const gchar* uri);
+
+WEBKIT_API void
+webkit_web_view_reload (WebKitWebView *web_view);
+
+WEBKIT_API void
+webkit_web_view_load_string (WebKitWebView* web_view, const gchar* content, const gchar* content_mime_type, const gchar* content_encoding, const gchar* base_uri);
+
+WEBKIT_API void
+webkit_web_view_load_html_string (WebKitWebView* web_view, const gchar* content, const gchar* base_uri);
+
+WEBKIT_API WebKitWebFrame*
+webkit_web_view_get_main_frame (WebKitWebView* web_view);
+
+WEBKIT_API void
+webkit_web_view_execute_script (WebKitWebView* web_view, const gchar* script);
+
+WEBKIT_API gboolean
+webkit_web_view_get_editable (WebKitWebView* web_view);
+
+WEBKIT_API void
+webkit_web_view_set_editable (WebKitWebView* web_view, gboolean flag);
+
+G_END_DECLS
+
+#endif
+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.
+
+ * GtkLauncher/main.c:
+ (activate_uri_entry_cb):
+ (link_hover_cb):
+ (title_change_cb):
+ (progress_change_cb):
+ (go_back_cb):
+ (go_forward_cb):
+ (create_browser):
+ (main):
+
2007-11-30 Adam Roben <aroben@apple.com>
Hopefully the final build fix
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "webkitgtkpage.h"
-#include "webkitgtkglobal.h"
+#include "webkitwebview.h"
+#include "webkitglobal.h"
#include <gtk/gtk.h>
static GtkWidget* main_window;
static GtkWidget* uri_entry;
static GtkStatusbar* main_statusbar;
-static WebKitPage* web_page;
+static WebKitWebView* web_view;
static gchar* main_title;
static gint load_progress;
static guint status_context_id;
{
const gchar* uri = gtk_entry_get_text (GTK_ENTRY (entry));
g_assert (uri);
- webkit_page_open (web_page, uri);
+ webkit_web_view_open (web_view, uri);
}
static void
}
static void
-link_hover_cb (WebKitPage* page, const gchar* title, const gchar* link, gpointer data)
+link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data)
{
/* underflow is allowed */
gtk_statusbar_pop (main_statusbar, status_context_id);
}
static void
-title_change_cb (WebKitPage* page, const gchar* title, const gchar* uri, gpointer data)
+title_change_cb (WebKitWebView* page, const gchar* title, const gchar* uri, gpointer data)
{
gtk_entry_set_text (GTK_ENTRY (uri_entry), uri);
}
static void
-progress_change_cb (WebKitPage* page, gint progress, gpointer data)
+progress_change_cb (WebKitWebView* page, gint progress, gpointer data)
{
load_progress = progress;
update_title (GTK_WINDOW (main_window));
static void
go_back_cb (GtkWidget* widget, gpointer data)
{
- webkit_page_go_backward (web_page);
+ webkit_web_view_go_backward (web_view);
}
static void
go_forward_cb (GtkWidget* widget, gpointer data)
{
- webkit_page_go_forward (web_page);
+ webkit_web_view_go_forward (web_view);
}
static GtkWidget*
GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- web_page = WEBKIT_PAGE (webkit_page_new ());
- gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_page));
+ web_view = WEBKIT_WEB_VIEW (webkit_web_view_new ());
+ gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_view));
- g_signal_connect (G_OBJECT (web_page), "title-changed", G_CALLBACK (title_change_cb), web_page);
- g_signal_connect (G_OBJECT (web_page), "load-progress-changed", G_CALLBACK (progress_change_cb), web_page);
- g_signal_connect (G_OBJECT (web_page), "hovering-over-link", G_CALLBACK (link_hover_cb), web_page);
+ g_signal_connect (G_OBJECT (web_view), "title-changed", G_CALLBACK (title_change_cb), web_view);
+ g_signal_connect (G_OBJECT (web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), web_view);
+ g_signal_connect (G_OBJECT (web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), web_view);
return scrolled_window;
}
gtk_container_add (GTK_CONTAINER (main_window), vbox);
gchar* uri = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/");
- webkit_page_open (web_page, uri);
+ webkit_web_view_open (web_view, uri);
- gtk_widget_grab_focus (GTK_WIDGET (web_page));
+ gtk_widget_grab_focus (GTK_WIDGET (web_view));
gtk_widget_show_all (main_window);
gtk_main ();
git://git.webkit.org / WebKit-https.git / commitdiff