[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 800deb6b7b03057af8a79cca67a7e9641b1c3ef3
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 10:26:17 2010 +0000

    2010-12-09 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Martin Robinson.
    
            [GTK] Split webkitprivate.{cpp,h} in more manageable chunks
            https://bugs.webkit.org/show_bug.cgi?id=50698
    
            Split private bits of WebKitNetworkRequest to its own private
            header, and to its implementation file. Also take the opportunity
            to use PlatformRefPtr for NetworkRequest where it makes sense, and
            make the creation less verbose by adding kitNew.
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::dispatchWillSendRequest):
            (WebKit::FrameLoaderClient::dispatchDecidePolicyForMIMEType):
            (WebKit::FrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
            (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
            (WebKit::FrameLoaderClient::download):
            (WebKit::FrameLoaderClient::startDownload):
            * webkit/webkitdownload.cpp:
            * webkit/webkitnetworkrequest.cpp:
            (WebKit::kitNew):
            (WebKit::core):
            * webkit/webkitnetworkrequestprivate.h: Added.
            * webkit/webkitprivate.cpp:
            * webkit/webkitprivate.h:
            * webkit/webkitwebdatasource.cpp:
            (webkit_web_data_source_get_initial_request):
            (webkit_web_data_source_get_request):
            * webkit/webkitwebframe.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index ca39e08..53bd0a1 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -5,6 +5,37 @@
         [GTK] Split webkitprivate.{cpp,h} in more manageable chunks
         https://bugs.webkit.org/show_bug.cgi?id=50698
 
+        Split private bits of WebKitNetworkRequest to its own private
+        header, and to its implementation file. Also take the opportunity
+        to use PlatformRefPtr for NetworkRequest where it makes sense, and
+        make the creation less verbose by adding kitNew.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchWillSendRequest):
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForMIMEType):
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+        (WebKit::FrameLoaderClient::download):
+        (WebKit::FrameLoaderClient::startDownload):
+        * webkit/webkitdownload.cpp:
+        * webkit/webkitnetworkrequest.cpp:
+        (WebKit::kitNew):
+        (WebKit::core):
+        * webkit/webkitnetworkrequestprivate.h: Added.
+        * webkit/webkitprivate.cpp:
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebdatasource.cpp:
+        (webkit_web_data_source_get_initial_request):
+        (webkit_web_data_source_get_request):
+        * webkit/webkitwebframe.cpp:
+
+2010-12-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Split webkitprivate.{cpp,h} in more manageable chunks
+        https://bugs.webkit.org/show_bug.cgi?id=50698
+
         Split private bits of WebKitWebFrame to its own private header, and
         to its implementation file.
 
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index e67575b..48ee134 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -60,6 +60,7 @@
 #include "ScriptController.h"
 #include "webkiterror.h"
 #include "webkitnetworkrequest.h"
+#include "webkitnetworkrequestprivate.h"
 #include "webkitnetworkresponse.h"
 #include "webkitprivate.h"
 #include "webkitwebframe.h"
@@ -313,7 +314,7 @@ void FrameLoaderClient::dispatchWillSendRequest(WebCore::DocumentLoader* loader,
     WebKitWebView* webView = getViewFromFrame(m_frame);
     GOwnPtr<gchar> identifierString(toString(identifier));
     WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
-    PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(webkit_network_request_new_with_core_request(request)));
+    PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(kitNew(request)));
 
     if (!redirectResponse.isNull()) {
         // This is a redirect, so we need to update the WebResource's knowledge
@@ -407,7 +408,7 @@ void FrameLoaderClient::dispatchDecidePolicyForMIMEType(FramePolicyFunction poli
     }
 
     WebKitWebView* page = getViewFromFrame(m_frame);
-    WebKitNetworkRequest* request = webkit_network_request_new_with_core_request(resourceRequest);
+    PlatformRefPtr<WebKitNetworkRequest> request(adoptPlatformRef(kitNew(resourceRequest)));
 
     WebKitWebPolicyDecision* policyDecision = webkit_web_policy_decision_new(m_frame, policyFunction);
     if (m_policyDecision)
@@ -415,9 +416,7 @@ void FrameLoaderClient::dispatchDecidePolicyForMIMEType(FramePolicyFunction poli
     m_policyDecision = policyDecision;
 
     gboolean isHandled = false;
-    g_signal_emit_by_name(page, "mime-type-policy-decision-requested", m_frame, request, mimeType.utf8().data(), policyDecision, &isHandled);
-
-    g_object_unref(request);
+    g_signal_emit_by_name(page, "mime-type-policy-decision-requested", m_frame, request.get(), mimeType.utf8().data(), policyDecision, &isHandled);
 
     if (isHandled)
         return;
@@ -489,14 +488,11 @@ void FrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFuncti
     m_policyDecision = policyDecision;
 
     WebKitWebView* webView = getViewFromFrame(m_frame);
-    WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().string().utf8().data());
-    WebKitWebNavigationAction* navigationAction = getNavigationAction(action, frameName.utf8().data());
+    PlatformRefPtr<WebKitNetworkRequest> request(adoptPlatformRef(webkit_network_request_new(resourceRequest.url().string().utf8().data())));
+    PlatformRefPtr<WebKitWebNavigationAction> navigationAction(adoptPlatformRef(getNavigationAction(action, frameName.utf8().data())));
     gboolean isHandled = false;
 
-    g_signal_emit_by_name(webView, "new-window-policy-decision-requested", m_frame, request, navigationAction, policyDecision, &isHandled);
-
-    g_object_unref(navigationAction);
-    g_object_unref(request);
+    g_signal_emit_by_name(webView, "new-window-policy-decision-requested", m_frame, request.get(), navigationAction.get(), policyDecision, &isHandled);
 
     // FIXME: I think Qt version marshals this to another thread so when we
     // have multi-threaded download, we might need to do the same
@@ -516,7 +512,7 @@ void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunct
     }
 
     WebKitWebView* webView = getViewFromFrame(m_frame);
-    WebKitNetworkRequest* request = webkit_network_request_new_with_core_request(resourceRequest);
+    PlatformRefPtr<WebKitNetworkRequest> request(adoptPlatformRef(kitNew(resourceRequest)));
     WebKitNavigationResponse response;
     /*
      * We still support the deprecated navigation-requested signal, if the
@@ -525,11 +521,10 @@ void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunct
      * navigation-policy-decision-requested must be emitted after
      * navigation-requested as the policy decision can be async.
      */
-    g_signal_emit_by_name(webView, "navigation-requested", m_frame, request, &response);
+    g_signal_emit_by_name(webView, "navigation-requested", m_frame, request.get(), &response);
 
     if (response == WEBKIT_NAVIGATION_RESPONSE_IGNORE) {
         (core(m_frame)->loader()->policyChecker()->*policyFunction)(PolicyIgnore);
-        g_object_unref(request);
         return;
     }
 
@@ -538,12 +533,9 @@ void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunct
         g_object_unref(m_policyDecision);
     m_policyDecision = policyDecision;
 
-    WebKitWebNavigationAction* navigationAction = getNavigationAction(action, NULL);
+    PlatformRefPtr<WebKitWebNavigationAction> navigationAction(adoptPlatformRef(getNavigationAction(action, 0)));
     gboolean isHandled = false;
-    g_signal_emit_by_name(webView, "navigation-policy-decision-requested", m_frame, request, navigationAction, policyDecision, &isHandled);
-
-    g_object_unref(navigationAction);
-    g_object_unref(request);
+    g_signal_emit_by_name(webView, "navigation-policy-decision-requested", m_frame, request.get(), navigationAction.get(), policyDecision, &isHandled);
 
     // FIXME Implement default behavior when we can query the backend what protocols it supports
     if (!isHandled)
@@ -1169,11 +1161,10 @@ void FrameLoaderClient::dispatchDidFailLoad(const ResourceError& error)
 
 void FrameLoaderClient::download(ResourceHandle* handle, const ResourceRequest& request, const ResourceRequest&, const ResourceResponse& response)
 {
-    WebKitNetworkRequest* networkRequest = webkit_network_request_new_with_core_request(request);
+    PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(kitNew(request)));
     WebKitWebView* view = getViewFromFrame(m_frame);
 
-    webkit_web_view_request_download(view, networkRequest, response, handle);
-    g_object_unref(networkRequest);
+    webkit_web_view_request_download(view, networkRequest.get(), response, handle);
 }
 
 ResourceError FrameLoaderClient::cancelledError(const ResourceRequest& request)
@@ -1258,11 +1249,10 @@ void FrameLoaderClient::setMainDocumentError(WebCore::DocumentLoader*, const Res
 
 void FrameLoaderClient::startDownload(const ResourceRequest& request)
 {
-    WebKitNetworkRequest* networkRequest = webkit_network_request_new_with_core_request(request);
+    PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(kitNew(request)));
     WebKitWebView* view = getViewFromFrame(m_frame);
 
-    webkit_web_view_request_download(view, networkRequest);
-    g_object_unref(networkRequest);
+    webkit_web_view_request_download(view, networkRequest.get());
 }
 
 void FrameLoaderClient::updateGlobalHistory()
diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp
index 18b64ab..2abd0be 100644
--- a/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/WebKit/gtk/webkit/webkitdownload.cpp
@@ -31,6 +31,7 @@
 #include "webkitdownload.h"
 #include "webkitenumtypes.h"
 #include "webkitmarshal.h"
+#include "webkitnetworkrequestprivate.h"
 #include "webkitnetworkresponse.h"
 #include "webkitprivate.h"
 #include <wtf/text/CString.h>
diff --git a/WebKit/gtk/webkit/webkitnetworkrequest.cpp b/WebKit/gtk/webkit/webkitnetworkrequest.cpp
index 6180efa..7196631 100644
--- a/WebKit/gtk/webkit/webkitnetworkrequest.cpp
+++ b/WebKit/gtk/webkit/webkitnetworkrequest.cpp
@@ -161,16 +161,6 @@ static void webkit_network_request_init(WebKitNetworkRequest* request)
     request->priv = priv;
 }
 
-// for internal use only
-WebKitNetworkRequest* webkit_network_request_new_with_core_request(const WebCore::ResourceRequest& resourceRequest)
-{
-    PlatformRefPtr<SoupMessage> soupMessage(adoptPlatformRef(resourceRequest.toSoupMessage()));
-    if (soupMessage)
-        return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "message", soupMessage.get(), NULL));
-
-    return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "uri", resourceRequest.url().string().utf8().data(), NULL));
-}
-
 /**
  * webkit_network_request_new:
  * @uri: an URI
@@ -260,3 +250,26 @@ SoupMessage* webkit_network_request_get_message(WebKitNetworkRequest* request)
 
     return priv->message;
 }
+
+namespace WebKit {
+
+WebKitNetworkRequest* kitNew(const WebCore::ResourceRequest& resourceRequest)
+{
+    PlatformRefPtr<SoupMessage> soupMessage(adoptPlatformRef(resourceRequest.toSoupMessage()));
+    if (soupMessage)
+        return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "message", soupMessage.get(), NULL));
+
+    return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "uri", resourceRequest.url().string().utf8().data(), NULL));
+}
+
+WebCore::ResourceRequest core(WebKitNetworkRequest* request)
+{
+    SoupMessage* soupMessage = webkit_network_request_get_message(request);
+    if (soupMessage)
+        return WebCore::ResourceRequest(soupMessage);
+
+    WebCore::KURL url = WebCore::KURL(WebCore::KURL(), String::fromUTF8(webkit_network_request_get_uri(request)));
+    return WebCore::ResourceRequest(url);
+}
+
+}
diff --git a/WebKit/gtk/webkit/webkitnetworkrequestprivate.h b/WebKit/gtk/webkit/webkitnetworkrequestprivate.h
new file mode 100644
index 0000000..84b4593
--- /dev/null
+++ b/WebKit/gtk/webkit/webkitnetworkrequestprivate.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
+ * Copyright (C) 2008 Jan Michael C. Alonzo
+ * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2010 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef webkitnetworkrequestprivate_h
+#define webkitnetworkrequestprivate_h
+
+namespace WebKit {
+
+WebCore::ResourceRequest core(WebKitNetworkRequest*);
+WebKitNetworkRequest* kitNew(const WebCore::ResourceRequest&);
+
+}
+
+#endif
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index 40a9b25..605f5df 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -75,16 +75,6 @@ WebCore::NavigationType core(WebKitWebNavigationReason type)
     return static_cast<WebCore::NavigationType>(type);
 }
 
-WebCore::ResourceRequest core(WebKitNetworkRequest* request)
-{
-    SoupMessage* soupMessage = webkit_network_request_get_message(request);
-    if (soupMessage)
-        return ResourceRequest(soupMessage);
-
-    KURL url = KURL(KURL(), String::fromUTF8(webkit_network_request_get_uri(request)));
-    return ResourceRequest(url);
-}
-
 WebCore::ResourceResponse core(WebKitNetworkResponse* response)
 {
     SoupMessage* soupMessage = webkit_network_response_get_message(response);
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 8e3d520..bed8e49 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -90,8 +90,6 @@ namespace WebKit {
     WebKitWebNavigationReason kit(WebCore::NavigationType type);
     WebCore::NavigationType core(WebKitWebNavigationReason reason);
 
-    WebCore::ResourceRequest core(WebKitNetworkRequest* request);
-
     WebCore::ResourceResponse core(WebKitNetworkResponse* response);
 
     WebCore::EditingBehaviorType core(WebKitEditingBehavior type);
@@ -208,8 +206,6 @@ extern "C" {
     void
     webkit_web_policy_decision_cancel (WebKitWebPolicyDecision* decision);
 
-    WebKitNetworkRequest*
-    webkit_network_request_new_with_core_request(const WebCore::ResourceRequest& resourceRequest);
 
     WebKitNetworkResponse*
     webkit_network_response_new_with_core_response(const WebCore::ResourceResponse& resourceResponse);
@@ -217,10 +213,6 @@ extern "C" {
     WebKitGeolocationPolicyDecision*
     webkit_geolocation_policy_decision_new(WebKitWebFrame*, WebCore::Geolocation*);
 
-    // FIXME: move this to webkitnetworkrequest.h once the API is agreed upon.
-    WEBKIT_API SoupMessage*
-    webkit_network_request_get_message(WebKitNetworkRequest* request);
-
     // FIXME: Move these to webkitwebframe.h once their API has been discussed.
 
     WEBKIT_API void
diff --git a/WebKit/gtk/webkit/webkitwebdatasource.cpp b/WebKit/gtk/webkit/webkitwebdatasource.cpp
index 150415b..72981f0 100644
--- a/WebKit/gtk/webkit/webkitwebdatasource.cpp
+++ b/WebKit/gtk/webkit/webkitwebdatasource.cpp
@@ -30,6 +30,7 @@
 #include "SharedBuffer.h"
 #include "SubstituteData.h"
 #include "runtime/InitializeThreading.h"
+#include "webkitnetworkrequestprivate.h"
 #include "webkitprivate.h"
 #include "webkitwebframeprivate.h"
 #include "webkitwebresource.h"
@@ -243,7 +244,7 @@ WebKitNetworkRequest* webkit_web_data_source_get_initial_request(WebKitWebDataSo
     if (priv->initialRequest)
         g_object_unref(priv->initialRequest);
 
-    priv->initialRequest = webkit_network_request_new_with_core_request(request);
+    priv->initialRequest = kitNew(request);
     return priv->initialRequest;
 }
 
@@ -276,7 +277,7 @@ WebKitNetworkRequest* webkit_web_data_source_get_request(WebKitWebDataSource* we
      if (priv->networkRequest)
          g_object_unref(priv->networkRequest);
 
-     priv->networkRequest = webkit_network_request_new_with_core_request(request);
+     priv->networkRequest = kitNew(request);
      return priv->networkRequest;
 }
 
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index 36fc230..2fa25b5 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -51,6 +51,7 @@
 #include "ScriptController.h"
 #include "SubstituteData.h"
 #include "webkitenumtypes.h"
+#include "webkitnetworkrequestprivate.h"
 #include "webkitmarshal.h"
 #include "webkitprivate.h"
 #include "webkitwebframeprivate.h"

-- 
WebKit Debian packaging