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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 400a32a935d9ec6c78e5ec0ff34317c1f48e1e2e..508d6229181260a4fd8df2116ce9c273cc50e32d 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,27 @@
+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

diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
index b7f2e28753659335e87c7cc7c32b37468e93c53c..f871cddf1e5ed247572f7fc7815d65ac4496c337 100644 (file)
--- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
@@ -36,8 +36,8 @@ namespace WebKit {
 
 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);
 }
 
@@ -139,7 +139,7 @@ void EditorClient::didSetSelectionTypesForPasteboard()
 
 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>)
@@ -207,7 +207,7 @@ void EditorClient::toggleGrammarChecking()
 
 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;
 
@@ -350,31 +350,31 @@ void EditorClient::handleInputMethodKeydown(KeyboardEvent*)
     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
 }
 

diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
index ce741a9a3e43308ea35b37d1c773ad5b1868ab5d..f2bc194ddb011b071ad2fc15f961673953432620 100644 (file)
--- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
@@ -109,7 +109,7 @@ namespace WebKit {
         virtual void getGuessesForWord(const WebCore::String&, WTF::Vector<WebCore::String>& guesses);
         virtual void setInputMethodState(bool enabled);
 
-        WebKitWebView* m_page;
+        WebKitWebView* m_webView;
     };
 }
 

diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index a47e9893b7b8cf919e27e8d0413f8e4d66104386..0e561d102be3606416fb25a573764c80bc6cea12 100644 (file)
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -187,23 +187,23 @@ void FrameLoaderClient::assignIdentifierToInitialRequest(unsigned long identifie
 
 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()
@@ -242,11 +242,11 @@ void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunct
     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);
 
@@ -354,8 +354,8 @@ void FrameLoaderClient::windowObjectCleared()
     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.
@@ -492,9 +492,9 @@ void FrameLoaderClient::dispatchWillClose()
 
 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()
@@ -505,9 +505,9 @@ void FrameLoaderClient::dispatchDidReceiveTitle(const String& title)
 {
     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()
@@ -521,9 +521,9 @@ 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()