Changeset 269858 in webkit


Ignore:
Timestamp:
Nov 16, 2020 10:08:07 AM (3 years ago)
Author:
commit-queue@webkit.org
Message:

Add didReceiveResponseForResource to WKWebProcessPlugInLoadDelegate
​https://bugs.webkit.org/show_bug.cgi?id=218925

Patch by Trevor Stevenson <​trevor_s@apple.com> on 2020-11-16
Reviewed by Alex Christensen.

Expose the callback for didReceiveResponseForResource in WKWebProcessPlugInLoadDelegate
for use in the injected bundle.

  • WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h:
  • WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:

(didReceiveResponseForResource):
(setUpResourceLoadClient):

Location:
trunk/Source/WebKit
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r269851 r269858  
     12020-11-16  Trevor Stevenson  <trevor_s@apple.com>
     2
     3        Add didReceiveResponseForResource to WKWebProcessPlugInLoadDelegate
     4        https://bugs.webkit.org/show_bug.cgi?id=218925
     5
     6        Reviewed by Alex Christensen.
     7
     8        Expose the callback for didReceiveResponseForResource in WKWebProcessPlugInLoadDelegate
     9        for use in the injected bundle.
     10
     11        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h:
     12        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
     13        (didReceiveResponseForResource):
     14        (setUpResourceLoadClient):
     15
    1162020-11-16  Carlos Garcia Campos  <cgarcia@igalia.com>
    217

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h

    r253723 r269858  
    6363- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didInitiateLoadForResource:(uint64_t)resource request:(NSURLRequest *)request pageIsProvisionallyLoading:(BOOL)pageIsProvisionallyLoading;
    6464- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didInitiateLoadForResource:(uint64_t)resource request:(NSURLRequest *)request;
     65- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didReceiveResponse:(NSURLResponse *)response forResource:(uint64_t)resource;
    6566- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didFinishLoadForResource:(uint64_t)resource;
    6667- (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didFailLoadForResource:(uint64_t)resource error:(NSError *)error;

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

    r266557 r269858  
    295295}
    296296
     297static void didReceiveResponseForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKURLResponseRef response, const void* clientInfo)
     298{
     299    auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
     300    auto loadDelegate = pluginContextController->_loadDelegate.get();
     301
     302    if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didReceiveResponse:forResource:)])
     303        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*WebKit::toImpl(frame)) didReceiveResponse:WebKit::toImpl(response)->resourceResponse().nsURLResponse() forResource:resourceIdentifier];
     304}
     305
    297306static void didFinishLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, const void* clientInfo)
    298307{
    … …  
    324333    client.willSendRequestForFrame = willSendRequestForFrame;
    325334    client.didInitiateLoadForResource = didInitiateLoadForResource;
     335    client.didReceiveResponseForResource = didReceiveResponseForResource;
    326336    client.didFinishLoadForResource = didFinishLoadForResource;
    327337    client.didFailLoadForResource = didFailLoadForResource;
Note: See TracChangeset for help on using the changeset viewer.