<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[28965] trunk/WebKit/gtk</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28965">28965</a></dd>
<dt>Author</dt> <dd>alp@webkit.org</dd>
<dt>Date</dt> <dd>2007-12-22 18:18:42 -0800 (Sat, 22 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>2007-12-22  Xan Lopez  &lt;xan@gnome.org&gt;

        Reviewed by Alp Toker.

        Use webView, web_view, etc for variable names instead of page, which
        was left over from the old API.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitgtkChangeLog">trunk/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkWebKitgtkWebCoreSupportEditorClientGtkcpp">trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp</a></li>
<li><a href="#trunkWebKitgtkWebCoreSupportEditorClientGtkh">trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h</a></li>
<li><a href="#trunkWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp">trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/ChangeLog (28964 => 28965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/ChangeLog        2007-12-22 23:54:16 UTC (rev 28964)
+++ trunk/WebKit/gtk/ChangeLog        2007-12-23 02:18:42 UTC (rev 28965)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2007-12-22  Xan Lopez  &lt;xan@gnome.org&gt;
+
+        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):
+
</ins><span class="cx"> 2007-12-22  Alp Toker  &lt;alp@atoker.com&gt;
</span><span class="cx"> 
</span><span class="cx">         GTK+ build fix
</span></span></pre></div>
<a id="trunkWebKitgtkWebCoreSupportEditorClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (28964 => 28965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp        2007-12-22 23:54:16 UTC (rev 28964)
+++ trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp        2007-12-23 02:18:42 UTC (rev 28965)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> 
</span><span class="cx"> static void imContextCommitted(GtkIMContext* context, const char* str, EditorClient* client)
</span><span class="cx"> {
</span><del>-    WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(client-&gt;m_page);
-    Frame* frame = pageData-&gt;corePage-&gt;focusController()-&gt;focusedOrMainFrame();
</del><ins>+    WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(client-&gt;m_webView);
+    Frame* frame = webViewData-&gt;corePage-&gt;focusController()-&gt;focusedOrMainFrame();
</ins><span class="cx">     frame-&gt;editor()-&gt;insertTextWithoutSendingTextEvent(str, false);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool EditorClient::isEditable()
</span><span class="cx"> {
</span><del>-    return webkit_web_view_get_editable(m_page);
</del><ins>+    return webkit_web_view_get_editable(m_webView);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void EditorClient::registerCommandForUndo(WTF::PassRefPtr&lt;WebCore::EditCommand&gt;)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> 
</span><span class="cx"> void EditorClient::handleKeyboardEvent(KeyboardEvent* event)
</span><span class="cx"> {
</span><del>-    Frame* frame = core(m_page)-&gt;focusController()-&gt;focusedOrMainFrame();
</del><ins>+    Frame* frame = core(m_webView)-&gt;focusController()-&gt;focusedOrMainFrame();
</ins><span class="cx">     if (!frame || !frame-&gt;document()-&gt;focusedNode())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -350,31 +350,31 @@
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-EditorClient::EditorClient(WebKitWebView* page)
-    : m_page(page)
</del><ins>+EditorClient::EditorClient(WebKitWebView* webView)
+    : m_webView(webView)
</ins><span class="cx"> {
</span><del>-    WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_page);
-    g_signal_connect(pageData-&gt;imContext, &quot;commit&quot;, G_CALLBACK(imContextCommitted), this);
</del><ins>+    WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
+    g_signal_connect(webViewData-&gt;imContext, &quot;commit&quot;, G_CALLBACK(imContextCommitted), this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> EditorClient::~EditorClient()
</span><span class="cx"> {
</span><del>-    WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_page);
-    g_signal_handlers_disconnect_by_func(pageData-&gt;imContext, (gpointer)imContextCommitted, this);
</del><ins>+    WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
+    g_signal_handlers_disconnect_by_func(webViewData-&gt;imContext, (gpointer)imContextCommitted, this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void EditorClient::textFieldDidBeginEditing(Element*)
</span><span class="cx"> {
</span><del>-    gtk_im_context_focus_in(WEBKIT_WEB_VIEW_GET_PRIVATE(m_page)-&gt;imContext);
</del><ins>+    gtk_im_context_focus_in(WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView)-&gt;imContext);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void EditorClient::textFieldDidEndEditing(Element*)
</span><span class="cx"> {
</span><del>-    WebKitWebViewPrivate* pageData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_page);
</del><ins>+    WebKitWebViewPrivate* webViewData = WEBKIT_WEB_VIEW_GET_PRIVATE(m_webView);
</ins><span class="cx"> 
</span><del>-    gtk_im_context_focus_out(pageData-&gt;imContext);
</del><ins>+    gtk_im_context_focus_out(webViewData-&gt;imContext);
</ins><span class="cx"> #ifdef MAEMO_CHANGES
</span><del>-    hildon_gtk_im_context_hide(pageData-&gt;imContext);
</del><ins>+    hildon_gtk_im_context_hide(webViewData-&gt;imContext);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitgtkWebCoreSupportEditorClientGtkh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h (28964 => 28965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h        2007-12-22 23:54:16 UTC (rev 28964)
+++ trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h        2007-12-23 02:18:42 UTC (rev 28965)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">         virtual void getGuessesForWord(const WebCore::String&amp;, WTF::Vector&lt;WebCore::String&gt;&amp; guesses);
</span><span class="cx">         virtual void setInputMethodState(bool enabled);
</span><span class="cx"> 
</span><del>-        WebKitWebView* m_page;
</del><ins>+        WebKitWebView* m_webView;
</ins><span class="cx">     };
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (28964 => 28965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp        2007-12-22 23:54:16 UTC (rev 28964)
+++ trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp        2007-12-23 02:18:42 UTC (rev 28965)
</span><span class="lines">@@ -187,23 +187,23 @@
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::postProgressStartedNotification()
</span><span class="cx"> {
</span><del>-    WebKitWebView* page = getViewFromFrame(m_frame);
-    g_signal_emit_by_name(page, &quot;load-started&quot;, m_frame);
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
+    g_signal_emit_by_name(webView, &quot;load-started&quot;, m_frame);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::postProgressEstimateChangedNotification()
</span><span class="cx"> {
</span><del>-    WebKitWebView* kitPage = getViewFromFrame(m_frame);
-    Page* corePage = core(kitPage);
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
+    Page* corePage = core(webView);
</ins><span class="cx"> 
</span><del>-    g_signal_emit_by_name(kitPage, &quot;load-progress-changed&quot;, lround(corePage-&gt;progress()-&gt;estimatedProgress()*100));
</del><ins>+    g_signal_emit_by_name(webView, &quot;load-progress-changed&quot;, lround(corePage-&gt;progress()-&gt;estimatedProgress()*100));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::postProgressFinishedNotification()
</span><span class="cx"> {
</span><del>-    WebKitWebView* page = getViewFromFrame(m_frame);
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
</ins><span class="cx"> 
</span><del>-    g_signal_emit_by_name(page, &quot;load-finished&quot;, m_frame);
</del><ins>+    g_signal_emit_by_name(webView, &quot;load-finished&quot;, m_frame);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::frameLoaderDestroyed()
</span><span class="lines">@@ -242,11 +242,11 @@
</span><span class="cx">     if (!policyFunction)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    WebKitWebView* page = getViewFromFrame(m_frame);
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
</ins><span class="cx">     WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().string().utf8().data());
</span><span class="cx">     WebKitNavigationResponse response;
</span><span class="cx"> 
</span><del>-    g_signal_emit_by_name(page, &quot;navigation-requested&quot;, m_frame, request, &amp;response);
</del><ins>+    g_signal_emit_by_name(webView, &quot;navigation-requested&quot;, m_frame, request, &amp;response);
</ins><span class="cx"> 
</span><span class="cx">     g_object_unref(request);
</span><span class="cx"> 
</span><span class="lines">@@ -354,8 +354,8 @@
</span><span class="cx">     JSObjectRef windowObject = toRef(KJS::Window::retrieve(coreFrame)-&gt;getObject());
</span><span class="cx">     ASSERT(windowObject);
</span><span class="cx"> 
</span><del>-    WebKitWebView* page = getViewFromFrame(m_frame);
-    g_signal_emit_by_name(page, &quot;window-object-cleared&quot;, m_frame, context, windowObject);
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
+    g_signal_emit_by_name(webView, &quot;window-object-cleared&quot;, m_frame, context, windowObject);
</ins><span class="cx"> 
</span><span class="cx">     // TODO: Re-attach debug clients if present.
</span><span class="cx">     // The Win port has an example of how we might do this.
</span><span class="lines">@@ -492,9 +492,9 @@
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::dispatchDidReceiveIcon()
</span><span class="cx"> {
</span><del>-    WebKitWebView* page = getViewFromFrame(m_frame);
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
</ins><span class="cx"> 
</span><del>-    g_signal_emit_by_name(page, &quot;icon-loaded&quot;, m_frame);
</del><ins>+    g_signal_emit_by_name(webView, &quot;icon-loaded&quot;, m_frame);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::dispatchDidStartProvisionalLoad()
</span><span class="lines">@@ -505,9 +505,9 @@
</span><span class="cx"> {
</span><span class="cx">     g_signal_emit_by_name(m_frame, &quot;title-changed&quot;, title.utf8().data());
</span><span class="cx"> 
</span><del>-    WebKitWebView* page = getViewFromFrame(m_frame);
-    if (m_frame == webkit_web_view_get_main_frame(page))
-        g_signal_emit_by_name(page, &quot;title-changed&quot;, m_frame, title.utf8().data());
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
+    if (m_frame == webkit_web_view_get_main_frame(webView))
+        g_signal_emit_by_name(webView, &quot;title-changed&quot;, m_frame, title.utf8().data());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::dispatchDidCommitLoad()
</span><span class="lines">@@ -521,9 +521,9 @@
</span><span class="cx"> 
</span><span class="cx">     g_signal_emit_by_name(m_frame, &quot;load-committed&quot;);
</span><span class="cx"> 
</span><del>-    WebKitWebView* page = getViewFromFrame(m_frame);
-    if (m_frame == webkit_web_view_get_main_frame(page))
-        g_signal_emit_by_name(page, &quot;load-committed&quot;, m_frame);
</del><ins>+    WebKitWebView* webView = getViewFromFrame(m_frame);
+    if (m_frame == webkit_web_view_get_main_frame(webView))
+        g_signal_emit_by_name(webView, &quot;load-committed&quot;, m_frame);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClient::dispatchDidFinishDocumentLoad()
</span></span></pre>
</div>
</div>

</body>
</html>