Changeset 140285 in webkit


Ignore:
Timestamp:
Jan 20, 2013 5:01:40 PM (11 years ago)
Author:
weinig@apple.com
Message:

Remove support getting per-resource callbacks in the UIProcess
​https://bugs.webkit.org/show_bug.cgi?id=107405

Reviewed by Anders Carlsson.

Removes support for the WKPageResourceLoadClient. Access to per-resource
callbacks are still available in the bundle, and via the WebInspector.

  • UIProcess/API/C/WKPage.cpp:
  • UIProcess/API/C/WKPage.h:
  • UIProcess/WebPageProxy.cpp:
  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:

Stop handling per-resource messages and forwarding them to the API.

  • UIProcess/WebResourceLoadClient.cpp: Removed.
  • UIProcess/WebResourceLoadClient.h: Removed.
  • WebKit2.xcodeproj/project.pbxproj:

Remove the files.

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::assignIdentifierToInitialRequest):
(WebKit::WebFrameLoaderClient::dispatchWillSendRequest):
(WebKit::WebFrameLoaderClient::dispatchDidReceiveResponse):
(WebKit::WebFrameLoaderClient::dispatchDidReceiveContentLength):
(WebKit::WebFrameLoaderClient::dispatchDidFinishLoading):
(WebKit::WebFrameLoaderClient::dispatchDidFailLoading):
Stop sending per-resource messages to the UIProcess.

Location:
trunk/Source/WebKit2
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r140280 r140285  
     12013-01-20  Sam Weinig  <sam@webkit.org>
     2
     3        Remove support getting per-resource callbacks in the UIProcess
     4        https://bugs.webkit.org/show_bug.cgi?id=107405
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Removes support for the WKPageResourceLoadClient. Access to per-resource
     9        callbacks are still available in the bundle, and via the WebInspector.
     10
     11        * UIProcess/API/C/WKPage.cpp:
     12        * UIProcess/API/C/WKPage.h:
     13        * UIProcess/WebPageProxy.cpp:
     14        * UIProcess/WebPageProxy.h:
     15        * UIProcess/WebPageProxy.messages.in:
     16        Stop handling per-resource messages and forwarding them to the API.
     17
     18        * UIProcess/WebResourceLoadClient.cpp: Removed.
     19        * UIProcess/WebResourceLoadClient.h: Removed.
     20        * WebKit2.xcodeproj/project.pbxproj:
     21        Remove the files.
     22
     23        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     24        (WebKit::WebFrameLoaderClient::assignIdentifierToInitialRequest):
     25        (WebKit::WebFrameLoaderClient::dispatchWillSendRequest):
     26        (WebKit::WebFrameLoaderClient::dispatchDidReceiveResponse):
     27        (WebKit::WebFrameLoaderClient::dispatchDidReceiveContentLength):
     28        (WebKit::WebFrameLoaderClient::dispatchDidFinishLoading):
     29        (WebKit::WebFrameLoaderClient::dispatchDidFailLoading):
     30        Stop sending per-resource messages to the UIProcess.
     31
    1322013-01-20  Gustavo Noronha Silva  <gns@gnome.org>
    233

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r139796 r140285  
    556556}
    557557
    558 void WKPageSetPageResourceLoadClient(WKPageRef pageRef, const WKPageResourceLoadClient* wkClient)
    559 {
    560     toImpl(pageRef)->initializeResourceLoadClient(wkClient);
    561 }
    562 
    563558void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient)
    564559{

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r139796 r140285  
    165165
    166166enum { kWKPageFormClientCurrentVersion = 0 };
    167 
    168 // Resource Load Client.
    169 typedef void (*WKPageDidInitiateLoadForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, bool pageIsProvisionallyLoading, const void* clientInfo);
    170 typedef void (*WKPageDidSendRequestForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, WKURLResponseRef redirectResponse, const void* clientInfo);
    171 typedef void (*WKPageDidReceiveResponseForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLResponseRef response, const void* clientInfo);
    172 typedef void (*WKPageDidReceiveContentLengthForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, uint64_t contentLength, const void* clientInfo);
    173 typedef void (*WKPageDidFinishLoadForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, const void* clientInfo);
    174 typedef void (*WKPageDidFailLoadForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKErrorRef error, const void* clientInfo);
    175 
    176 struct WKPageResourceLoadClient {
    177     int                                                                 version;
    178     const void *                                                        clientInfo;
    179     WKPageDidInitiateLoadForResourceCallback                            didInitiateLoadForResource;
    180     WKPageDidSendRequestForResourceCallback                             didSendRequestForResource;
    181     WKPageDidReceiveResponseForResourceCallback                         didReceiveResponseForResource;
    182     WKPageDidReceiveContentLengthForResourceCallback                    didReceiveContentLengthForResource;
    183     WKPageDidFinishLoadForResourceCallback                              didFinishLoadForResource;
    184     WKPageDidFailLoadForResourceCallback                                didFailLoadForResource;
    185 };
    186 typedef struct WKPageResourceLoadClient WKPageResourceLoadClient;
    187 
    188 enum { kWKPageResourceLoadClientCurrentVersion = 0 };
    189167
    190168enum {
    … …  
    477455WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClient* client);
    478456WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClient* client);
    479 WK_EXPORT void WKPageSetPageResourceLoadClient(WKPageRef page, const WKPageResourceLoadClient* client);
    480457WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
    481458

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r140087 r140285  
    348348}
    349349
    350 void WebPageProxy::initializeResourceLoadClient(const WKPageResourceLoadClient* client)
    351 {
    352     m_resourceLoadClient.initialize(client);
    353 }
    354 
    355350void WebPageProxy::initializeUIClient(const WKPageUIClient* client)
    356351{
    … …  
    25182513    if (!m_formClient.willSubmitForm(this, frame, sourceFrame, textFieldValues.stringPairVector(), userData.get(), listener.get()))
    25192514        listener->continueSubmission();
    2520 }
    2521 
    2522 // ResourceLoad Client
    2523 
    2524 void WebPageProxy::didInitiateLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceRequest& request, bool pageIsProvisionallyLoading)
    2525 {
    2526     WebFrameProxy* frame = m_process->webFrame(frameID);
    2527     MESSAGE_CHECK(frame);
    2528     MESSAGE_CHECK_URL(request.url());
    2529 
    2530     m_resourceLoadClient.didInitiateLoadForResource(this, frame, resourceIdentifier, request, pageIsProvisionallyLoading);
    2531 }
    2532 
    2533 void WebPageProxy::didSendRequestForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceRequest& request, const ResourceResponse& redirectResponse)
    2534 {
    2535     WebFrameProxy* frame = m_process->webFrame(frameID);
    2536     MESSAGE_CHECK(frame);
    2537     MESSAGE_CHECK_URL(request.url());
    2538 
    2539     m_resourceLoadClient.didSendRequestForResource(this, frame, resourceIdentifier, request, redirectResponse);
    2540 }
    2541 
    2542 void WebPageProxy::didReceiveResponseForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceResponse& response)
    2543 {
    2544     WebFrameProxy* frame = m_process->webFrame(frameID);
    2545     MESSAGE_CHECK(frame);
    2546     MESSAGE_CHECK_URL(response.url());
    2547 
    2548     m_resourceLoadClient.didReceiveResponseForResource(this, frame, resourceIdentifier, response);
    2549 }
    2550 
    2551 void WebPageProxy::didReceiveContentLengthForResource(uint64_t frameID, uint64_t resourceIdentifier, uint64_t contentLength)
    2552 {
    2553     WebFrameProxy* frame = m_process->webFrame(frameID);
    2554     MESSAGE_CHECK(frame);
    2555 
    2556     m_resourceLoadClient.didReceiveContentLengthForResource(this, frame, resourceIdentifier, contentLength);
    2557 }
    2558 
    2559 void WebPageProxy::didFinishLoadForResource(uint64_t frameID, uint64_t resourceIdentifier)
    2560 {
    2561     WebFrameProxy* frame = m_process->webFrame(frameID);
    2562     MESSAGE_CHECK(frame);
    2563 
    2564     m_resourceLoadClient.didFinishLoadForResource(this, frame, resourceIdentifier);
    2565 }
    2566 
    2567 void WebPageProxy::didFailLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceError& error)
    2568 {
    2569     WebFrameProxy* frame = m_process->webFrame(frameID);
    2570     MESSAGE_CHECK(frame);
    2571 
    2572     m_resourceLoadClient.didFailLoadForResource(this, frame, resourceIdentifier, error);
    25732515}
    25742516

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r139822 r140285  
    5858#include "WebPolicyClient.h"
    5959#include "WebPopupMenuProxy.h"
    60 #include "WebResourceLoadClient.h"
    6160#include "WebUIClient.h"
    6261#include <WebCore/AlternativeTextClient.h>
    … …  
    282281    void initializeLoaderClient(const WKPageLoaderClient*);
    283282    void initializePolicyClient(const WKPagePolicyClient*);
    284     void initializeResourceLoadClient(const WKPageResourceLoadClient*);
    285283    void initializeUIClient(const WKPageUIClient*);
    286284
    … …  
    819817
    820818    void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const StringPairVector& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder&);
    821 
    822     // Resource load client
    823     void didInitiateLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, bool pageIsProvisionallyLoading);
    824     void didSendRequestForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
    825     void didReceiveResponseForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceResponse&);
    826     void didReceiveContentLengthForResource(uint64_t frameID, uint64_t resourceIdentifier, uint64_t contentLength);
    827     void didFinishLoadForResource(uint64_t frameID, uint64_t resourceIdentifier);
    828     void didFailLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceError&);
    829819
    830820    // UI client
    … …  
    10471037    WebPolicyClient m_policyClient;
    10481038    WebFormClient m_formClient;
    1049     WebResourceLoadClient m_resourceLoadClient;
    10501039    WebUIClient m_uiClient;
    10511040    WebFindClient m_findClient;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r139796 r140285  
    145145    FrameDidBecomeFrameSet(uint64_t frameID, bool value)
    146146
    147     # Resource load messages
    148     DidInitiateLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceRequest request, bool pageIsProvisionallyLoading)
    149     DidSendRequestForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
    150     DidReceiveResponseForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceResponse response)
    151     DidReceiveContentLengthForResource(uint64_t frameID, uint64_t resourceIdentifier, uint64_t contentLength)
    152     DidFinishLoadForResource(uint64_t frameID, uint64_t resourceIdentifier)
    153     DidFailLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceError error)
    154147#if PLATFORM(QT)
    155148    ResolveApplicationSchemeRequest(WebKit::QtNetworkRequestData request)
    156149#endif
    157 
    158150
    159151    # Custom representations

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r140274 r140285  
    807807                BC85806212B8505700EDEB2E /* WKOpenPanelResultListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1DFE8E12B31CA8005DF730 /* WKOpenPanelResultListener.cpp */; };
    808808                BC85806312B8505700EDEB2E /* WKOpenPanelParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC857FE512B843D800EDEB2E /* WKOpenPanelParameters.cpp */; };
    809                 BC858A2012C0357B00EDEB2E /* WebResourceLoadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC858A1E12C0357B00EDEB2E /* WebResourceLoadClient.h */; };
    810                 BC858A2112C0357B00EDEB2E /* WebResourceLoadClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC858A1F12C0357B00EDEB2E /* WebResourceLoadClient.cpp */; };
    811809                BC8699B5116AADAA002A925B /* WKView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B2116AADAA002A925B /* WKView.h */; settings = {ATTRIBUTES = (Public, ); }; };
    812810                BC8699B6116AADAA002A925B /* WKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8699B3116AADAA002A925B /* WKView.mm */; };
    … …  
    20972095                BC857FE412B843D800EDEB2E /* WKOpenPanelParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOpenPanelParameters.h; sourceTree = "<group>"; };
    20982096                BC857FE512B843D800EDEB2E /* WKOpenPanelParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKOpenPanelParameters.cpp; sourceTree = "<group>"; };
    2099                 BC858A1E12C0357B00EDEB2E /* WebResourceLoadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadClient.h; sourceTree = "<group>"; };
    2100                 BC858A1F12C0357B00EDEB2E /* WebResourceLoadClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoadClient.cpp; sourceTree = "<group>"; };
    21012097                BC8699B2116AADAA002A925B /* WKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKView.h; sourceTree = "<group>"; };
    21022098                BC8699B3116AADAA002A925B /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKView.mm; sourceTree = "<group>"; };
    … …  
    36423638                                33367633130C99B2006C9DE2 /* WebResourceCacheManagerProxy.h */,
    36433639                                33367634130C99B2006C9DE2 /* WebResourceCacheManagerProxy.messages.in */,
    3644                                 BC858A1F12C0357B00EDEB2E /* WebResourceLoadClient.cpp */,
    3645                                 BC858A1E12C0357B00EDEB2E /* WebResourceLoadClient.h */,
    36463640                                1A594AB8112A1FB6009DE7C7 /* WebUIClient.cpp */,
    36473641                                1A594AB9112A1FB6009DE7C7 /* WebUIClient.h */,
    … …  
    49054899                                33367636130C99B2006C9DE2 /* WebResourceCacheManagerProxy.h in Headers */,
    49064900                                33367658130C9ECB006C9DE2 /* WebResourceCacheManagerProxyMessages.h in Headers */,
    4907                                 BC858A2012C0357B00EDEB2E /* WebResourceLoadClient.h in Headers */,
    49084901                                510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */,
    49094902                                51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */,
    … …  
    59165909                                33367635130C99B2006C9DE2 /* WebResourceCacheManagerProxy.cpp in Sources */,
    59175910                                33367657130C9ECA006C9DE2 /* WebResourceCacheManagerProxyMessageReceiver.cpp in Sources */,
    5918                                 BC858A2112C0357B00EDEB2E /* WebResourceLoadClient.cpp in Sources */,
    59195911                                510AFFB916542048001BA05E /* WebResourceLoader.cpp in Sources */,
    59205912                                51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r140228 r140285  
    175175
    176176    webPage->injectedBundleResourceLoadClient().didInitiateLoadForResource(webPage, m_frame, identifier, request, pageIsProvisionallyLoading);
    177     webPage->send(Messages::WebPageProxy::DidInitiateLoadForResource(m_frame->frameID(), identifier, request, pageIsProvisionallyLoading));
    178177}
    179178
    … …  
    185184
    186185    webPage->injectedBundleResourceLoadClient().willSendRequestForFrame(webPage, m_frame, identifier, request, redirectResponse);
    187 
    188     if (request.isNull()) {
    189         // FIXME: We should probably send a message saying we cancelled the request for the resource.
    190         return;
    191     }
    192 
    193     webPage->send(Messages::WebPageProxy::DidSendRequestForResource(m_frame->frameID(), identifier, request, redirectResponse));
    194186}
    195187
    … …  
    245237
    246238    webPage->injectedBundleResourceLoadClient().didReceiveResponseForResource(webPage, m_frame, identifier, response);
    247     webPage->send(Messages::WebPageProxy::DidReceiveResponseForResource(m_frame->frameID(), identifier, response));
    248239}
    249240
    … …  
    255246
    256247    webPage->injectedBundleResourceLoadClient().didReceiveContentLengthForResource(webPage, m_frame, identifier, dataLength);
    257     webPage->send(Messages::WebPageProxy::DidReceiveContentLengthForResource(m_frame->frameID(), identifier, dataLength));
    258248}
    259249
    … …  
    265255
    266256    webPage->injectedBundleResourceLoadClient().didFinishLoadForResource(webPage, m_frame, identifier);
    267     webPage->send(Messages::WebPageProxy::DidFinishLoadForResource(m_frame->frameID(), identifier));
    268257}
    269258
    … …  
    275264
    276265    webPage->injectedBundleResourceLoadClient().didFailLoadForResource(webPage, m_frame, identifier, error);
    277     webPage->send(Messages::WebPageProxy::DidFailLoadForResource(m_frame->frameID(), identifier, error));
    278266}
    279267
Note: See TracChangeset for help on using the changeset viewer.