+2007-12-22 Xan Lopez <xan@gnome.org>
+
+ Reviewed by Alp Toker.
+
+ Use webView, web_view, etc for variable names instead of page, which
+ was left over from the old API.
+
+ * WebCoreSupport/EditorClientGtk.cpp:
+ (WebKit::imContextCommitted):
+ (WebKit::EditorClient::EditorClient):
+ (WebKit::EditorClient::~EditorClient):
+ (WebKit::EditorClient::textFieldDidBeginEditing):
+ (WebKit::EditorClient::textFieldDidEndEditing):
+ * WebCoreSupport/EditorClientGtk.h:
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::postProgressStartedNotification):
+ (WebKit::FrameLoaderClient::postProgressEstimateChangedNotification):
+ (WebKit::FrameLoaderClient::postProgressFinishedNotification):
+ (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+ (WebKit::FrameLoaderClient::windowObjectCleared):
+ (WebKit::FrameLoaderClient::dispatchDidReceiveIcon):
+ (WebKit::FrameLoaderClient::dispatchDidReceiveTitle):
+ (WebKit::FrameLoaderClient::dispatchDidCommitLoad):
+
2007-12-22 Alp Toker <alp@atoker.com>
GTK+ build fix
static void imContextCommitted(GtkIMContext* context, const char* str, EditorClient* client)
{
- WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(client->m_page);
- Frame* frame = pageData->corePage->focusController()->focusedOrMainFrame();
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(client->m_webView);
+ Frame* frame = webViewData->corePage->focusController()->focusedOrMainFrame();
frame->editor()->insertTextWithoutSendingTextEvent(str, false);
}
bool EditorClient::isEditable()
{
- return webkit_web_view_get_editable(m_page);
+ return webkit_web_view_get_editable(m_webView);
}
void EditorClient::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>)
void EditorClient::handleKeyboardEvent(KeyboardEvent* event)
{
- Frame* frame = core(m_page)->focusController()->focusedOrMainFrame();
+ Frame* frame = core(m_webView)->focusController()->focusedOrMainFrame();
if (!frame || !frame->document()->focusedNode())
return;
notImplemented();
}
-EditorClient::EditorClient(WebKitWebView* page)
- : m_page(page)
+EditorClient::EditorClient(WebKitWebView* webView)
+ : m_webView(webView)
{
- WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_page);
- g_signal_connect(pageData->imContext, "commit", G_CALLBACK(imContextCommitted), this);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
+ g_signal_connect(webViewData->imContext, "commit", G_CALLBACK(imContextCommitted), this);
}
EditorClient::~EditorClient()
{
- WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_page);
- g_signal_handlers_disconnect_by_func(pageData->imContext, (gpointer)imContextCommitted, this);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
+ g_signal_handlers_disconnect_by_func(webViewData->imContext, (gpointer)imContextCommitted, this);
}
void EditorClient::textFieldDidBeginEditing(Element*)
{
- gtk_im_context_focus_in(WEBKIT_WEB_VIEW_GET_PRIVATE(m_page)->imContext);
+ gtk_im_context_focus_in(WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView)->imContext);
}
void EditorClient::textFieldDidEndEditing(Element*)
{
- WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_page);
+ WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
- gtk_im_context_focus_out(pageData->imContext);
+ gtk_im_context_focus_out(webViewData->imContext);
#ifdef MAEMO_CHANGES
- hildon_gtk_im_context_hide(pageData->imContext);
+ hildon_gtk_im_context_hide(webViewData->imContext);
#endif
}
void FrameLoaderClient::postProgressStartedNotification()
{
- WebKitWebView* page = getViewFromFrame(m_frame);
- g_signal_emit_by_name(page, "load-started", m_frame);
+ WebKitWebView* webView = getViewFromFrame(m_frame);
+ g_signal_emit_by_name(webView, "load-started", m_frame);
}
void FrameLoaderClient::postProgressEstimateChangedNotification()
{
- WebKitWebView* kitPage = getViewFromFrame(m_frame);
- Page* corePage = core(kitPage);
+ WebKitWebView* webView = getViewFromFrame(m_frame);
+ Page* corePage = core(webView);
- g_signal_emit_by_name(kitPage, "load-progress-changed", lround(corePage->progress()->estimatedProgress()*100));
+ g_signal_emit_by_name(webView, "load-progress-changed", lround(corePage->progress()->estimatedProgress()*100));
}
void FrameLoaderClient::postProgressFinishedNotification()
{
- WebKitWebView* page = getViewFromFrame(m_frame);
+ WebKitWebView* webView = getViewFromFrame(m_frame);
- g_signal_emit_by_name(page, "load-finished", m_frame);
+ g_signal_emit_by_name(webView, "load-finished", m_frame);
}
void FrameLoaderClient::frameLoaderDestroyed()
if (!policyFunction)
return;
- WebKitWebView* page = getViewFromFrame(m_frame);
+ WebKitWebView* webView = getViewFromFrame(m_frame);
WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().string().utf8().data());
WebKitNavigationResponse response;
- g_signal_emit_by_name(page, "navigation-requested", m_frame, request, &response);
+ g_signal_emit_by_name(webView, "navigation-requested", m_frame, request, &response);
g_object_unref(request);
JSObjectRef windowObject = toRef(KJS::Window::retrieve(coreFrame)->getObject());
ASSERT(windowObject);
- WebKitWebView* page = getViewFromFrame(m_frame);
- g_signal_emit_by_name(page, "window-object-cleared", m_frame, context, windowObject);
+ WebKitWebView* webView = getViewFromFrame(m_frame);
+ g_signal_emit_by_name(webView, "window-object-cleared", m_frame, context, windowObject);
// TODO: Re-attach debug clients if present.
// The Win port has an example of how we might do this.
void FrameLoaderClient::dispatchDidReceiveIcon()
{
- WebKitWebView* page = getViewFromFrame(m_frame);
+ WebKitWebView* webView = getViewFromFrame(m_frame);
- g_signal_emit_by_name(page, "icon-loaded", m_frame);
+ g_signal_emit_by_name(webView, "icon-loaded", m_frame);
}
void FrameLoaderClient::dispatchDidStartProvisionalLoad()
{
g_signal_emit_by_name(m_frame, "title-changed", title.utf8().data());
- WebKitWebView* page = getViewFromFrame(m_frame);
- if (m_frame == webkit_web_view_get_main_frame(page))
- g_signal_emit_by_name(page, "title-changed", m_frame, title.utf8().data());
+ WebKitWebView* webView = getViewFromFrame(m_frame);
+ if (m_frame == webkit_web_view_get_main_frame(webView))
+ g_signal_emit_by_name(webView, "title-changed", m_frame, title.utf8().data());
}
void FrameLoaderClient::dispatchDidCommitLoad()
g_signal_emit_by_name(m_frame, "load-committed");
- WebKitWebView* page = getViewFromFrame(m_frame);
- if (m_frame == webkit_web_view_get_main_frame(page))
- g_signal_emit_by_name(page, "load-committed", m_frame);
+ WebKitWebView* webView = getViewFromFrame(m_frame);
+ if (m_frame == webkit_web_view_get_main_frame(webView))
+ g_signal_emit_by_name(webView, "load-committed", m_frame);
}
void FrameLoaderClient::dispatchDidFinishDocumentLoad()