Changeset 73701 in webkit


Ignore:
Timestamp:
Dec 10, 2010 2:26:17 AM (13 years ago)
Author:
kov@webkit.org
Message:

2010-12-09 Gustavo Noronha Silva <gustavo.noronha@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:
Location:
trunk/WebKit/gtk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/gtk/ChangeLog

    r73696 r73701  
     12010-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Split webkitprivate.{cpp,h} in more manageable chunks
     6        https://bugs.webkit.org/show_bug.cgi?id=50698
     7
     8        Split private bits of WebKitNetworkRequest to its own private
     9        header, and to its implementation file. Also take the opportunity
     10        to use PlatformRefPtr for NetworkRequest where it makes sense, and
     11        make the creation less verbose by adding kitNew.
     12
     13        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     14        (WebKit::FrameLoaderClient::dispatchWillSendRequest):
     15        (WebKit::FrameLoaderClient::dispatchDecidePolicyForMIMEType):
     16        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
     17        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
     18        (WebKit::FrameLoaderClient::download):
     19        (WebKit::FrameLoaderClient::startDownload):
     20        * webkit/webkitdownload.cpp:
     21        * webkit/webkitnetworkrequest.cpp:
     22        (WebKit::kitNew):
     23        (WebKit::core):
     24        * webkit/webkitnetworkrequestprivate.h: Added.
     25        * webkit/webkitprivate.cpp:
     26        * webkit/webkitprivate.h:
     27        * webkit/webkitwebdatasource.cpp:
     28        (webkit_web_data_source_get_initial_request):
     29        (webkit_web_data_source_get_request):
     30        * webkit/webkitwebframe.cpp:
     31
    1322010-12-09  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    233
  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r73696 r73701  
    6161#include "webkiterror.h"
    6262#include "webkitnetworkrequest.h"
     63#include "webkitnetworkrequestprivate.h"
    6364#include "webkitnetworkresponse.h"
    6465#include "webkitprivate.h"
     
    314315    GOwnPtr<gchar> identifierString(toString(identifier));
    315316    WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
    316     PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(webkit_network_request_new_with_core_request(request)));
     317    PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(kitNew(request)));
    317318
    318319    if (!redirectResponse.isNull()) {
     
    408409
    409410    WebKitWebView* page = getViewFromFrame(m_frame);
    410     WebKitNetworkRequest* request = webkit_network_request_new_with_core_request(resourceRequest);
     411    PlatformRefPtr<WebKitNetworkRequest> request(adoptPlatformRef(kitNew(resourceRequest)));
    411412
    412413    WebKitWebPolicyDecision* policyDecision = webkit_web_policy_decision_new(m_frame, policyFunction);
     
    416417
    417418    gboolean isHandled = false;
    418     g_signal_emit_by_name(page, "mime-type-policy-decision-requested", m_frame, request, mimeType.utf8().data(), policyDecision, &isHandled);
    419 
    420     g_object_unref(request);
     419    g_signal_emit_by_name(page, "mime-type-policy-decision-requested", m_frame, request.get(), mimeType.utf8().data(), policyDecision, &isHandled);
    421420
    422421    if (isHandled)
     
    490489
    491490    WebKitWebView* webView = getViewFromFrame(m_frame);
    492     WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().string().utf8().data());
    493     WebKitWebNavigationAction* navigationAction = getNavigationAction(action, frameName.utf8().data());
     491    PlatformRefPtr<WebKitNetworkRequest> request(adoptPlatformRef(webkit_network_request_new(resourceRequest.url().string().utf8().data())));
     492    PlatformRefPtr<WebKitWebNavigationAction> navigationAction(adoptPlatformRef(getNavigationAction(action, frameName.utf8().data())));
    494493    gboolean isHandled = false;
    495494
    496     g_signal_emit_by_name(webView, "new-window-policy-decision-requested", m_frame, request, navigationAction, policyDecision, &isHandled);
    497 
    498     g_object_unref(navigationAction);
    499     g_object_unref(request);
     495    g_signal_emit_by_name(webView, "new-window-policy-decision-requested", m_frame, request.get(), navigationAction.get(), policyDecision, &isHandled);
    500496
    501497    // FIXME: I think Qt version marshals this to another thread so when we
     
    517513
    518514    WebKitWebView* webView = getViewFromFrame(m_frame);
    519     WebKitNetworkRequest* request = webkit_network_request_new_with_core_request(resourceRequest);
     515    PlatformRefPtr<WebKitNetworkRequest> request(adoptPlatformRef(kitNew(resourceRequest)));
    520516    WebKitNavigationResponse response;
    521517    /*
     
    526522     * navigation-requested as the policy decision can be async.
    527523     */
    528     g_signal_emit_by_name(webView, "navigation-requested", m_frame, request, &response);
     524    g_signal_emit_by_name(webView, "navigation-requested", m_frame, request.get(), &response);
    529525
    530526    if (response == WEBKIT_NAVIGATION_RESPONSE_IGNORE) {
    531527        (core(m_frame)->loader()->policyChecker()->*policyFunction)(PolicyIgnore);
    532         g_object_unref(request);
    533528        return;
    534529    }
     
    539534    m_policyDecision = policyDecision;
    540535
    541     WebKitWebNavigationAction* navigationAction = getNavigationAction(action, NULL);
     536    PlatformRefPtr<WebKitWebNavigationAction> navigationAction(adoptPlatformRef(getNavigationAction(action, 0)));
    542537    gboolean isHandled = false;
    543     g_signal_emit_by_name(webView, "navigation-policy-decision-requested", m_frame, request, navigationAction, policyDecision, &isHandled);
    544 
    545     g_object_unref(navigationAction);
    546     g_object_unref(request);
     538    g_signal_emit_by_name(webView, "navigation-policy-decision-requested", m_frame, request.get(), navigationAction.get(), policyDecision, &isHandled);
    547539
    548540    // FIXME Implement default behavior when we can query the backend what protocols it supports
     
    11701162void FrameLoaderClient::download(ResourceHandle* handle, const ResourceRequest& request, const ResourceRequest&, const ResourceResponse& response)
    11711163{
    1172     WebKitNetworkRequest* networkRequest = webkit_network_request_new_with_core_request(request);
     1164    PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(kitNew(request)));
    11731165    WebKitWebView* view = getViewFromFrame(m_frame);
    11741166
    1175     webkit_web_view_request_download(view, networkRequest, response, handle);
    1176     g_object_unref(networkRequest);
     1167    webkit_web_view_request_download(view, networkRequest.get(), response, handle);
    11771168}
    11781169
     
    12591250void FrameLoaderClient::startDownload(const ResourceRequest& request)
    12601251{
    1261     WebKitNetworkRequest* networkRequest = webkit_network_request_new_with_core_request(request);
     1252    PlatformRefPtr<WebKitNetworkRequest> networkRequest(adoptPlatformRef(kitNew(request)));
    12621253    WebKitWebView* view = getViewFromFrame(m_frame);
    12631254
    1264     webkit_web_view_request_download(view, networkRequest);
    1265     g_object_unref(networkRequest);
     1255    webkit_web_view_request_download(view, networkRequest.get());
    12661256}
    12671257
  • trunk/WebKit/gtk/webkit/webkitdownload.cpp

    r69742 r73701  
    3232#include "webkitenumtypes.h"
    3333#include "webkitmarshal.h"
     34#include "webkitnetworkrequestprivate.h"
    3435#include "webkitnetworkresponse.h"
    3536#include "webkitprivate.h"
  • trunk/WebKit/gtk/webkit/webkitnetworkrequest.cpp

    r68040 r73701  
    162162}
    163163
    164 // for internal use only
    165 WebKitNetworkRequest* webkit_network_request_new_with_core_request(const WebCore::ResourceRequest& resourceRequest)
    166 {
    167     PlatformRefPtr<SoupMessage> soupMessage(adoptPlatformRef(resourceRequest.toSoupMessage()));
    168     if (soupMessage)
    169         return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "message", soupMessage.get(), NULL));
    170 
    171     return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "uri", resourceRequest.url().string().utf8().data(), NULL));
    172 }
    173 
    174164/**
    175165 * webkit_network_request_new:
     
    261251    return priv->message;
    262252}
     253
     254namespace WebKit {
     255
     256WebKitNetworkRequest* kitNew(const WebCore::ResourceRequest& resourceRequest)
     257{
     258    PlatformRefPtr<SoupMessage> soupMessage(adoptPlatformRef(resourceRequest.toSoupMessage()));
     259    if (soupMessage)
     260        return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "message", soupMessage.get(), NULL));
     261
     262    return WEBKIT_NETWORK_REQUEST(g_object_new(WEBKIT_TYPE_NETWORK_REQUEST, "uri", resourceRequest.url().string().utf8().data(), NULL));
     263}
     264
     265WebCore::ResourceRequest core(WebKitNetworkRequest* request)
     266{
     267    SoupMessage* soupMessage = webkit_network_request_get_message(request);
     268    if (soupMessage)
     269        return WebCore::ResourceRequest(soupMessage);
     270
     271    WebCore::KURL url = WebCore::KURL(WebCore::KURL(), String::fromUTF8(webkit_network_request_get_uri(request)));
     272    return WebCore::ResourceRequest(url);
     273}
     274
     275}
  • trunk/WebKit/gtk/webkit/webkitprivate.cpp

    r73696 r73701  
    7676}
    7777
    78 WebCore::ResourceRequest core(WebKitNetworkRequest* request)
    79 {
    80     SoupMessage* soupMessage = webkit_network_request_get_message(request);
    81     if (soupMessage)
    82         return ResourceRequest(soupMessage);
    83 
    84     KURL url = KURL(KURL(), String::fromUTF8(webkit_network_request_get_uri(request)));
    85     return ResourceRequest(url);
    86 }
    87 
    8878WebCore::ResourceResponse core(WebKitNetworkResponse* response)
    8979{
  • trunk/WebKit/gtk/webkit/webkitprivate.h

    r73696 r73701  
    9191    WebCore::NavigationType core(WebKitWebNavigationReason reason);
    9292
    93     WebCore::ResourceRequest core(WebKitNetworkRequest* request);
    94 
    9593    WebCore::ResourceResponse core(WebKitNetworkResponse* response);
    9694
     
    209207    webkit_web_policy_decision_cancel (WebKitWebPolicyDecision* decision);
    210208
    211     WebKitNetworkRequest*
    212     webkit_network_request_new_with_core_request(const WebCore::ResourceRequest& resourceRequest);
    213209
    214210    WebKitNetworkResponse*
     
    217213    WebKitGeolocationPolicyDecision*
    218214    webkit_geolocation_policy_decision_new(WebKitWebFrame*, WebCore::Geolocation*);
    219 
    220     // FIXME: move this to webkitnetworkrequest.h once the API is agreed upon.
    221     WEBKIT_API SoupMessage*
    222     webkit_network_request_get_message(WebKitNetworkRequest* request);
    223215
    224216    // FIXME: Move these to webkitwebframe.h once their API has been discussed.
  • trunk/WebKit/gtk/webkit/webkitwebdatasource.cpp

    r73696 r73701  
    3131#include "SubstituteData.h"
    3232#include "runtime/InitializeThreading.h"
     33#include "webkitnetworkrequestprivate.h"
    3334#include "webkitprivate.h"
    3435#include "webkitwebframeprivate.h"
     
    244245        g_object_unref(priv->initialRequest);
    245246
    246     priv->initialRequest = webkit_network_request_new_with_core_request(request);
     247    priv->initialRequest = kitNew(request);
    247248    return priv->initialRequest;
    248249}
     
    277278         g_object_unref(priv->networkRequest);
    278279
    279      priv->networkRequest = webkit_network_request_new_with_core_request(request);
     280     priv->networkRequest = kitNew(request);
    280281     return priv->networkRequest;
    281282}
  • trunk/WebKit/gtk/webkit/webkitwebframe.cpp

    r73696 r73701  
    5252#include "SubstituteData.h"
    5353#include "webkitenumtypes.h"
     54#include "webkitnetworkrequestprivate.h"
    5455#include "webkitmarshal.h"
    5556#include "webkitprivate.h"
Note: See TracChangeset for help on using the changeset viewer.