Changeset 235117 in webkit


Ignore:
Timestamp:
Aug 21, 2018 9:16:54 AM (6 years ago)
Author:
achristensen@apple.com
Message:

Replace WKPageLoaderClient with WKPageNavigationClient in many API tests
​https://bugs.webkit.org/show_bug.cgi?id=188771

Reviewed by Tim Horton.

  • TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/CookieManager.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp:

(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/EventModifiers.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setClients):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/Find.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/FindMatches.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/FrameHandle.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/Geolocation.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp:

(TestWebKitAPI::didFinishLoadForFrame):

  • TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::loadAlternateHTMLString):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp:

(TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):
(TestWebKitAPI::didFinishLoad):

  • TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp:

(TestWebKitAPI::didFinishLoadForFrame):

  • TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp:

(TestWebKitAPI::didFinishLoad):
(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishDocumentLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp:

(TestWebKitAPI::didFailProvisionalNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp:

(TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishNavigation):
(TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::setPageLoaderClient):
(TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/UserMessage.cpp:

(TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishNavigation):
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setUpClients):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/WebArchive.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:

(didFinishNavigation):
(TestWebKitAPI::TEST):
(didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:

(didFinishNavigation):
(TestWebKitAPI::TEST):
(didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

  • TestWebKitAPI/mac/WebKitAgnosticTest.mm:

(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.

Location:
trunk/Tools
Files:
48 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r235116 r235117  
     12018-08-20  Alex Christensen  <achristensen@webkit.org>
     2
     3        Replace WKPageLoaderClient with WKPageNavigationClient in many API tests
     4        https://bugs.webkit.org/show_bug.cgi?id=188771
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp:
     9        (TestWebKitAPI::didFinishNavigation):
     10        (TestWebKitAPI::TEST):
     11        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     12        * TestWebKitAPI/Tests/WebKit/CookieManager.cpp:
     13        (TestWebKitAPI::didFinishNavigation):
     14        (TestWebKitAPI::TEST):
     15        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     16        * TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm:
     17        (TestWebKitAPI::didFinishNavigation):
     18        (TestWebKitAPI::setPageLoaderClient):
     19        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     20        * TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp:
     21        (TestWebKitAPI::TEST):
     22        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     23        * TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp:
     24        (TestWebKitAPI::didFinishNavigation):
     25        (TestWebKitAPI::setPageLoaderClient):
     26        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     27        * TestWebKitAPI/Tests/WebKit/EventModifiers.cpp:
     28        (TestWebKitAPI::didFinishNavigation):
     29        (TestWebKitAPI::setClients):
     30        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     31        * TestWebKitAPI/Tests/WebKit/Find.cpp:
     32        (TestWebKitAPI::didFinishNavigation):
     33        (TestWebKitAPI::TEST):
     34        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     35        * TestWebKitAPI/Tests/WebKit/FindMatches.mm:
     36        (TestWebKitAPI::didFinishNavigation):
     37        (TestWebKitAPI::TEST):
     38        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     39        * TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp:
     40        (TestWebKitAPI::didFinishNavigation):
     41        (TestWebKitAPI::TEST):
     42        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     43        * TestWebKitAPI/Tests/WebKit/FrameHandle.cpp:
     44        (TestWebKitAPI::didFinishNavigation):
     45        (TestWebKitAPI::TEST):
     46        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     47        * TestWebKitAPI/Tests/WebKit/Geolocation.cpp:
     48        (TestWebKitAPI::didFinishNavigation):
     49        (TestWebKitAPI::TEST):
     50        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     51        * TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp:
     52        (TestWebKitAPI::didFinishNavigation):
     53        (TestWebKitAPI::setPageLoaderClient):
     54        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     55        * TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp:
     56        (TestWebKitAPI::didFinishNavigation):
     57        (TestWebKitAPI::TEST):
     58        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     59        * TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp:
     60        (TestWebKitAPI::didFinishLoadForFrame):
     61        * TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
     62        (TestWebKitAPI::didFinishNavigation):
     63        (TestWebKitAPI::loadAlternateHTMLString):
     64        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     65        * TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp:
     66        (TestWebKitAPI::didFinishNavigation):
     67        (TestWebKitAPI::TEST):
     68        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     69        * TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp:
     70        (TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):
     71        (TestWebKitAPI::didFinishLoad):
     72        * TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp:
     73        (TestWebKitAPI::didFinishNavigation):
     74        (TestWebKitAPI::setPageLoaderClient):
     75        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     76        * TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp:
     77        (TestWebKitAPI::didFinishNavigation):
     78        (TestWebKitAPI::setPageLoaderClient):
     79        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     80        * TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp:
     81        (TestWebKitAPI::didFinishLoadForFrame):
     82        * TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp:
     83        (TestWebKitAPI::TEST):
     84        * TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp:
     85        (TestWebKitAPI::TEST):
     86        * TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp:
     87        (TestWebKitAPI::didFinishLoad):
     88        (TestWebKitAPI::TEST):
     89        * TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp:
     90        (TestWebKitAPI::didFinishNavigation):
     91        (TestWebKitAPI::setPageLoaderClient):
     92        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     93        * TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp:
     94        (TestWebKitAPI::didFinishNavigation):
     95        (TestWebKitAPI::setPageLoaderClient):
     96        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     97        * TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp:
     98        (TestWebKitAPI::didFinishNavigation):
     99        (TestWebKitAPI::TEST):
     100        (TestWebKitAPI::didFinishDocumentLoadForFrame): Deleted.
     101        * TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp:
     102        (TestWebKitAPI::didFinishNavigation):
     103        (TestWebKitAPI::TEST):
     104        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     105        * TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp:
     106        (TestWebKitAPI::didFailProvisionalNavigation):
     107        (TestWebKitAPI::TEST):
     108        (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame): Deleted.
     109        * TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp:
     110        (TestWebKitAPI::didFinishNavigation):
     111        (TestWebKitAPI::TEST):
     112        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     113        * TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp:
     114        (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishNavigation):
     115        (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::setPageLoaderClient):
     116        (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishLoadForFrame): Deleted.
     117        * TestWebKitAPI/Tests/WebKit/UserMessage.cpp:
     118        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishNavigation):
     119        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
     120        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishLoadForFrame): Deleted.
     121        * TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp:
     122        (TestWebKitAPI::didFinishNavigation):
     123        (TestWebKitAPI::setPageLoaderClient):
     124        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     125        * TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp:
     126        (TestWebKitAPI::didFinishNavigation):
     127        (TestWebKitAPI::setPageLoaderClient):
     128        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     129        * TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp:
     130        (TestWebKitAPI::didFinishNavigation):
     131        (TestWebKitAPI::setPageLoaderClient):
     132        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     133        * TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp:
     134        (TestWebKitAPI::didFinishNavigation):
     135        (TestWebKitAPI::setUpClients):
     136        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     137        * TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm:
     138        (TestWebKitAPI::didFinishNavigation):
     139        (TestWebKitAPI::setPageLoaderClient):
     140        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     141        * TestWebKitAPI/Tests/WebKit/WebArchive.cpp:
     142        (TestWebKitAPI::didFinishNavigation):
     143        (TestWebKitAPI::TEST):
     144        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     145        * TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm:
     146        (TestWebKitAPI::didFinishNavigation):
     147        (TestWebKitAPI::TEST):
     148        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     149        * TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm:
     150        (TestWebKitAPI::didFinishNavigation):
     151        (TestWebKitAPI::TEST):
     152        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     153        * TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm:
     154        (TestWebKitAPI::didFinishNavigation):
     155        (TestWebKitAPI::TEST):
     156        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     157        * TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm:
     158        (TestWebKitAPI::didFinishNavigation):
     159        (TestWebKitAPI::TEST):
     160        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     161        * TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp:
     162        (TestWebKitAPI::didFinishNavigation):
     163        (TestWebKitAPI::TEST):
     164        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     165        * TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp:
     166        (TestWebKitAPI::didFinishNavigation):
     167        (TestWebKitAPI::TEST):
     168        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     169        * TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:
     170        (didFinishNavigation):
     171        (TestWebKitAPI::TEST):
     172        (didFinishLoadForFrame): Deleted.
     173        * TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:
     174        (didFinishNavigation):
     175        (TestWebKitAPI::TEST):
     176        (didFinishLoadForFrame): Deleted.
     177        * TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm:
     178        (TestWebKitAPI::didFinishNavigation):
     179        (TestWebKitAPI::TEST):
     180        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     181        * TestWebKitAPI/mac/WebKitAgnosticTest.mm:
     182        (TestWebKitAPI::didFinishNavigation):
     183        (TestWebKitAPI::setPageLoaderClient):
     184        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
     185
    11862018-08-21  Adrian Perez de Castro  <aperez@igalia.com>
    2187

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp

    r221505 r235117  
    3535static bool loaded;
    3636
    37 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     37static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    3838{
    3939    loaded = true;
    … …  
    4848    PlatformWebView webView(context.get());
    4949
    50     WKPageLoaderClientV0 loaderClient;
     50    WKPageNavigationClientV0 loaderClient;
    5151    memset(&loaderClient, 0 , sizeof(loaderClient));
    5252
    5353    loaderClient.base.version = 0;
    54     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     54    loaderClient.didFinishNavigation = didFinishNavigation;
    5555   
    56     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     56    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    5757
    5858    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp

    r221505 r235117  
    6565}
    6666
    67 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     67static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    6868{
    6969    WKCookieManagerRef cookieManager = WKContextGetCookieManager(wkContext.get());
    … …  
    7676    PlatformWebView webView(wkContext.get());
    7777
    78     WKPageLoaderClientV0 loaderClient;
     78    WKPageNavigationClientV0 loaderClient;
    7979    memset(&loaderClient, 0, sizeof(loaderClient));
    8080
    8181    loaderClient.base.version = 0;
    82     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     82    loaderClient.didFinishNavigation = didFinishNavigation;
    8383
    84     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     84    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    8585
    8686    WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm

    r221505 r235117  
    3737static bool didFinishLoad;
    3838
    39 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     39static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4040{
    4141    didFinishLoad = true;
    … …  
    4444static void setPageLoaderClient(WKPageRef page)
    4545{
    46     WKPageLoaderClientV0 loaderClient;
     46    WKPageNavigationClientV0 loaderClient;
    4747    memset(&loaderClient, 0, sizeof(loaderClient));
    4848
    4949    loaderClient.base.version = 0;
    50     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     50    loaderClient.didFinishNavigation = didFinishNavigation;
    5151
    52     WKPageSetPageLoaderClient(page, &loaderClient.base);
     52    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5353}
    5454

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp

    r221505 r235117  
    3838static bool didNotHandleKeyDownEvent;
    3939
    40 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
    41 {
    42 }
    43 
    4440static void didNotHandleKeyEventCallback(WKPageRef, WKNativeEventPtr event, const void*)
    4541{
    … …  
    5349    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
    5450    PlatformWebView webView(context.get());
    55 
    56     WKPageLoaderClientV0 loaderClient;
    57     memset(&loaderClient, 0, sizeof(loaderClient));
    58    
    59     loaderClient.base.version = 0;
    60     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    61 
    62     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
    6351
    6452    WKPageUIClientV0 uiClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp

    r221505 r235117  
    3939static int didRemoveFrameFromHierarchyCount;
    4040
    41 static void didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)
     41static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4242{
    43     // Only mark finished when the main frame loads
    44     if (!WKFrameIsMainFrame(frame))
    45         return;
    46 
    4743    finished = true;
    4844}
    … …  
    5046static void setPageLoaderClient(WKPageRef page)
    5147{
    52     WKPageLoaderClientV1 loaderClient;
     48    WKPageNavigationClientV1 loaderClient;
    5349    memset(&loaderClient, 0, sizeof(loaderClient));
    5450
    5551    loaderClient.base.version = 1;
    56     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     52    loaderClient.didFinishNavigation = didFinishNavigation;
    5753
    58     WKPageSetPageLoaderClient(page, &loaderClient.base);
     54    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5955}
    6056

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp

    r221505 r235117  
    3737static bool mouseMoveCallbackFinished { false };
    3838
    39 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     39static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4040{
    4141    didFinishLoad = true;
    … …  
    5050static void setClients(WKPageRef page)
    5151{
    52     WKPageLoaderClientV0 loaderClient;
     52    WKPageNavigationClientV0 loaderClient;
    5353    memset(&loaderClient, 0, sizeof(loaderClient));
    5454    loaderClient.base.version = 0;
    55     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    56     WKPageSetPageLoaderClient(page, &loaderClient.base);
     55    loaderClient.didFinishNavigation = didFinishNavigation;
     56    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5757   
    5858    WKPageUIClientV1 uiClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp

    r221505 r235117  
    3737static bool didCallCountStringMatches = false;
    3838
    39 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     39static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    4040{
    4141    didFinishLoad = true;
    … …  
    5555    PlatformWebView webView(context.get());
    5656   
    57     WKPageLoaderClientV0 loaderClient;
     57    WKPageNavigationClientV0 loaderClient;
    5858    memset(&loaderClient, 0, sizeof(loaderClient));
    5959   
    6060    loaderClient.base.version = 0;
    61     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     61    loaderClient.didFinishNavigation = didFinishNavigation;
    6262
    63     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     63    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    6464
    6565    WKPageFindClientV0 findClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm

    r231806 r235117  
    5959RetainPtr<WebView> webkit1View;
    6060
    61 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     61static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    6262{
    6363    didFinishLoad = true;
    … …  
    122122    PlatformWebView webView(context.get());
    123123   
    124     WKPageLoaderClientV0 loaderClient;
     124    WKPageNavigationClientV0 loaderClient;
    125125    memset(&loaderClient, 0, sizeof(loaderClient));
    126126   
    127127    loaderClient.base.version = 0;
    128     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     128    loaderClient.didFinishNavigation = didFinishNavigation;
    129129
    130     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     130    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    131131
    132132    WKPageFindMatchesClientV0 findMatchesClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp

    r221505 r235117  
    4444}
    4545
    46 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     46static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    4747{
    4848    test1Done = true;
    … …  
    5555    PlatformWebView webView(context.get());
    5656
    57     WKPageLoaderClientV0 loaderClient;
     57    WKPageNavigationClientV0 loaderClient;
    5858    memset(&loaderClient, 0, sizeof(loaderClient));
    5959
    6060    loaderClient.base.version = 0;
    61     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     61    loaderClient.didFinishNavigation = didFinishNavigation;
    6262
    63     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     63    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    6464
    6565    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-accelerated-compositing", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp

    r221505 r235117  
    3939static bool done;
    4040
    41 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     41static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    4242{
    4343    done = true;
    … …  
    4949    PlatformWebView webView(context.get());
    5050
    51     WKPageLoaderClientV0 loaderClient;
     51    WKPageNavigationClientV0 loaderClient;
    5252    memset(&loaderClient, 0, sizeof(loaderClient));
    5353    loaderClient.base.version = 0;
    54     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    55     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     54    loaderClient.didFinishNavigation = didFinishNavigation;
     55    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    5656
    5757    WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp

    r221505 r235117  
    308308};
    309309
    310 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     310static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    311311{
    312312    *static_cast<bool*>(const_cast<void*>(clientInfo)) = true;
    … …  
    332332    bool finishedSecondStep = false;
    333333
    334     WKPageLoaderClientV0 loaderClient;
     334    WKPageNavigationClientV0 loaderClient;
    335335    memset(&loaderClient, 0, sizeof(loaderClient));
    336336
    337337    loaderClient.base.version = 0;
    338338    loaderClient.base.clientInfo = &finishedSecondStep;
    339     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    340 
    341     WKPageSetPageLoaderClient(lowAccuracyWebView.page(), &loaderClient.base);
     339    loaderClient.didFinishNavigation = didFinishNavigation;
     340
     341    WKPageSetPageNavigationClient(lowAccuracyWebView.page(), &loaderClient.base);
    342342
    343343    WKRetainPtr<WKURLRef> lowAccuracyURL(AdoptWK, Util::createURLForResource("geolocationWatchPosition", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp

    r221505 r235117  
    3838static bool didFinishLoad;
    3939
    40 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     40static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4141{
    4242    didFinishLoad = true;
    … …  
    5252static void setPageLoaderClient(WKPageRef page)
    5353{
    54     WKPageLoaderClientV0 loaderClient;
     54    WKPageNavigationClientV0 loaderClient;
    5555    memset(&loaderClient, 0, sizeof(loaderClient));
    5656
    5757    loaderClient.base.version = 0;
    58     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     58    loaderClient.didFinishNavigation = didFinishNavigation;
    5959
    60     WKPageSetPageLoaderClient(page, &loaderClient.base);
     60    WKPageSetPageNavigationClient(page, &loaderClient.base);
    6161}
    6262

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp

    r221505 r235117  
    4545}
    4646
    47 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     47static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    4848{
    4949    loadDone = true;
    … …  
    6666    PlatformWebView webView(context.get());
    6767
    68     WKPageLoaderClientV0 loaderClient;
     68    WKPageNavigationClientV0 loaderClient;
    6969    memset(&loaderClient, 0, sizeof(loaderClient));
    7070
    7171    loaderClient.base.version = 0;
    72     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     72    loaderClient.didFinishNavigation = didFinishNavigation;
    7373
    74     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     74    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    7575
    7676    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp

    r221505 r235117  
    3939static size_t maxTitleLength = 4096;
    4040
    41 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     41static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo)
    4242{
    4343    didFinishLoad = true;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp

    r221505 r235117  
    4141static bool didFinishLoad = false;
    4242   
    43 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     43static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    4444{
    4545    didFinishLoad = true;
    … …  
    5151    PlatformWebView webView(context.get());
    5252
    53     WKPageLoaderClientV0 loaderClient;
     53    WKPageNavigationClientV0 loaderClient;
    5454    memset(&loaderClient, 0, sizeof(loaderClient));
    5555   
    5656    loaderClient.base.version = 0;
    57     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    58     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     57    loaderClient.didFinishNavigation = didFinishNavigation;
     58    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    5959
    6060    WKRetainPtr<WKStringRef> alternateHTMLString(AdoptWK, WKStringCreateWithUTF8CString("<html><body><img src='icon.png'></body></html>"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp

    r221505 r235117  
    3838namespace TestWebKitAPI {
    3939
    40 static bool loadedMainFrame;
    41 static bool loadedIFrame;
    4240static bool loadedAllFrames;
    4341
    4442static bool performedServerRedirect;
    4543
    46 static void didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)
     44static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4745{
    48     if (WKFrameIsMainFrame(frame))
    49         loadedMainFrame = true;
    50     else
    51         loadedIFrame = true;
    52 
    53     loadedAllFrames = loadedMainFrame && loadedIFrame;
     46    loadedAllFrames = true;
    5447}
    5548
    … …  
    7265    PlatformWebView webView(context.get());
    7366
    74     WKPageLoaderClientV0 loaderClient;
     67    WKPageNavigationClientV0 loaderClient;
    7568    memset(&loaderClient, 0, sizeof(loaderClient));
    7669   
    7770    loaderClient.base.version = 0;
    78     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     71    loaderClient.didFinishNavigation = didFinishNavigation;
    7972
    80     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     73    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    8174   
    8275    WKContextHistoryClientV0 historyClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp

    r221505 r235117  
    3535namespace TestWebKitAPI {
    3636
    37 static void didFinishLoad(WKPageRef, WKFrameRef, WKTypeRef, const void*);
     37static void didFinishLoad(WKPageRef, WKNavigationRef, WKTypeRef, const void*);
    3838
    3939class WebKit2CrashLoader {
    … …  
    5050        loaderClient.base.version = 0;
    5151        loaderClient.base.clientInfo = this;
    52         loaderClient.didFinishLoadForFrame = didFinishLoad;
     52        loaderClient.didFinishNavigation = didFinishLoad;
    5353
    54         WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     54        WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    5555    }
    5656
    … …  
    6666
    6767    WKRetainPtr<WKContextRef> context;
    68     WKPageLoaderClientV0 loaderClient;
     68    WKPageNavigationClientV0 loaderClient;
    6969    PlatformWebView webView;
    7070    WKRetainPtr<WKURLRef> url;
    … …  
    7676// We are going to have 2 load events intertwined by a simulated crash
    7777// (i.e. Load -> Crash -> Load).
    78 void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     78void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    7979{
    8080    WebKit2CrashLoader* testHelper = const_cast<WebKit2CrashLoader*>(static_cast<const WebKit2CrashLoader*>(clientInfo));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp

    r221505 r235117  
    3636static bool didFinishLoad;
    3737
    38 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     38static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    3939{
    4040    didFinishLoad = true;
    … …  
    4343static void setPageLoaderClient(WKPageRef page)
    4444{
    45     WKPageLoaderClientV0 loaderClient;
     45    WKPageNavigationClientV0 loaderClient;
    4646    memset(&loaderClient, 0, sizeof(loaderClient));
    4747
    4848    loaderClient.base.version = 0;
    49     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     49    loaderClient.didFinishNavigation = didFinishNavigation;
    5050
    51     WKPageSetPageLoaderClient(page, &loaderClient.base);
     51    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5252}
    5353

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp

    r221505 r235117  
    3636static bool didFinishLoad;
    3737
    38 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     38static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    3939{
    4040    didFinishLoad = true;
    … …  
    4343static void setPageLoaderClient(WKPageRef page)
    4444{
    45     WKPageLoaderClientV0 loaderClient;
     45    WKPageNavigationClientV0 loaderClient;
    4646    memset(&loaderClient, 0, sizeof(loaderClient));
    4747
    4848    loaderClient.base.version = 0;
    49     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     49    loaderClient.didFinishNavigation = didFinishNavigation;
    5050
    51     WKPageSetPageLoaderClient(page, &loaderClient.base);
     51    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5252}
    5353

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp

    r221505 r235117  
    4646}
    4747
    48 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     48static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo)
    4949{
    5050    test1Done = true;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp

    r230245 r235117  
    183183    static unsigned loadsCount = 0;
    184184
    185     WKPageLoaderClientV0 loaderClient;
     185    WKPageNavigationClientV0 loaderClient;
    186186    memset(&loaderClient, 0, sizeof(loaderClient));
    187187    loaderClient.base.version = 0;
    188188    loaderClient.base.clientInfo = nullptr;
    189     loaderClient.didFailProvisionalLoadWithErrorForFrame = [](WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void *clientInfo) {
     189    loaderClient.didFailProvisionalNavigation = [](WKPageRef page, WKNavigationRef, WKErrorRef error, WKTypeRef userData, const void *clientInfo) {
    190190        loadsCount++;
    191191        WKPageReload(page);
    192192    };
    193     loaderClient.didFinishLoadForFrame = [](WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo) {
     193    loaderClient.didFinishNavigation = [](WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) {
    194194        if (++loadsCount == 3) {
    195195            test1Done = true;
    … …  
    198198        WKPageReload(page);
    199199    };
    200     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     200    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    201201
    202202    WKRetainPtr<WKURLRef> url1(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp

    r221505 r235117  
    4242    PlatformWebView webView(context.get());
    4343
    44     WKPageLoaderClientV0 loaderClient;
     44    WKPageNavigationClientV0 loaderClient;
    4545    memset(&loaderClient, 0, sizeof(loaderClient));
    4646    loaderClient.base.version = 0;
    47     loaderClient.didFinishLoadForFrame = [](WKPageRef, WKFrameRef, WKTypeRef, const void*) { done = true; };
    48     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     47    loaderClient.didFinishNavigation = [](WKPageRef, WKNavigationRef, WKTypeRef, const void*) {
     48        done = true;
     49    };
     50    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    4951
    5052    WKRetainPtr<WKURLRef> activeURL = adoptWK(WKPageCopyActiveURL(webView.page()));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp

    r221505 r235117  
    4848};
    4949
    50 static void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     50static void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    5151{
    5252    TestStatesData* states = const_cast<TestStatesData*>(static_cast<const TestStatesData*>(clientInfo));
    … …  
    7979    TestStatesData states(context.get());
    8080
    81     WKPageLoaderClientV0 loaderClient;
     81    WKPageNavigationClientV0 loaderClient;
    8282    memset(&loaderClient, 0, sizeof(loaderClient));
    8383
    8484    loaderClient.base.version = 0;
    8585    loaderClient.base.clientInfo = &states;
    86     loaderClient.didFinishLoadForFrame = didFinishLoad;
    87     loaderClient.processDidCrash = didCrash;
     86    loaderClient.didFinishNavigation = didFinishLoad;
     87    loaderClient.webProcessDidCrash = didCrash;
    8888
    89     WKPageSetPageLoaderClient(states.webView.page(), &loaderClient.base);
     89    WKPageSetPageNavigationClient(states.webView.page(), &loaderClient.base);
    9090
    9191    WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp

    r234714 r235117  
    3939static bool didFinishLoad;
    4040
    41 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     41static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4242{
    4343    didFinishLoad = true;
    … …  
    6262static void setPageLoaderClient(WKPageRef page)
    6363{
    64     WKPageLoaderClientV0 loaderClient;
     64    WKPageNavigationClientV0 loaderClient;
    6565    memset(&loaderClient, 0, sizeof(loaderClient));
    6666
    6767    loaderClient.base.version = 0;
    68     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     68    loaderClient.didFinishNavigation = didFinishNavigation;
    6969
    70     WKPageSetPageLoaderClient(page, &loaderClient.base);
     70    WKPageSetPageNavigationClient(page, &loaderClient.base);
    7171}
    7272

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp

    r221505 r235117  
    3838static bool didFinishLoad;
    3939
    40 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     40static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4141{
    4242    didFinishLoad = true;
    … …  
    4545static void setPageLoaderClient(WKPageRef page)
    4646{
    47     WKPageLoaderClientV0 loaderClient;
     47    WKPageNavigationClientV0 loaderClient;
    4848    memset(&loaderClient, 0, sizeof(loaderClient));
    4949
    5050    loaderClient.base.version = 0;
    51     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     51    loaderClient.didFinishNavigation = didFinishNavigation;
    5252
    53     WKPageSetPageLoaderClient(page, &loaderClient.base);
     53    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5454}
    5555

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp

    r221505 r235117  
    4242static bool testDone;
    4343
    44 static void didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
     44static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void *clientInfo)
    4545{
    4646    WKPageSetScrollPinningBehavior(page, kWKScrollPinningBehaviorPinToBottom);
    … …  
    8383    PlatformWebView webView(context.get(), pageGroup.get());
    8484
    85     WKPageLoaderClientV3 loaderClient;
     85    WKPageNavigationClientV0 loaderClient;
    8686    memset(&loaderClient, 0, sizeof(loaderClient));
    8787
    88     loaderClient.base.version = 3;
     88    loaderClient.base.version = 0;
    8989    loaderClient.base.clientInfo = &webView;
    90     loaderClient.didFinishDocumentLoadForFrame = didFinishDocumentLoadForFrame;
     90    loaderClient.didFinishNavigation = didFinishNavigation;
    9191
    92     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     92    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    9393
    9494    WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple-tall", "html")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp

    r221505 r235117  
    3939static bool didNotHandleKeyDownEvent;
    4040
    41 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     41static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4242{
    4343    didFinishLoad = true;
    … …  
    6262    PlatformWebView webView(context.get(), pageGroup.get());
    6363
    64     WKPageLoaderClientV0 loaderClient;
     64    WKPageNavigationClientV0 loaderClient;
    6565    memset(&loaderClient, 0, sizeof(loaderClient));
    6666
    6767    loaderClient.base.version = 0;
    68     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     68    loaderClient.didFinishNavigation = didFinishNavigation;
    6969
    70     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     70    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    7171
    7272    WKPageUIClientV0 uiClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp

    r221505 r235117  
    5454}
    5555
    56 static void didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef, WKErrorRef, WKTypeRef, const void*)
     56static void didFailProvisionalNavigation(WKPageRef, WKNavigationRef, WKErrorRef, WKTypeRef, const void*)
    5757{
    5858    // The injected bundle is notified of the failed load first. If we also receive this callback, the test didn't crash.
    … …  
    6868    PlatformWebView webView(context.get());
    6969
    70     WKPageLoaderClientV0 loaderClient;
     70    WKPageNavigationClientV0 loaderClient;
    7171    memset(&loaderClient, 0, sizeof(loaderClient));
    72     loaderClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
    73     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     72    loaderClient.didFailProvisionalNavigation = didFailProvisionalNavigation;
     73    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    7474
    7575    WKRetainPtr<WKURLRef> url(AdoptWK, Util::URLForNonExistentResource());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp

    r221505 r235117  
    3535static bool loaded;
    3636
    37 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     37static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    3838{
    3939    loaded = true;
    … …  
    4545    PlatformWebView webView(context.get());
    4646
    47     WKPageLoaderClientV0 loaderClient;
     47    WKPageNavigationClientV0 loaderClient;
    4848    memset(&loaderClient, 0, sizeof(loaderClient));
    4949
    5050    loaderClient.base.version = 0;
    51     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     51    loaderClient.didFinishNavigation = didFinishNavigation;
    5252
    53     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     53    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    5454
    5555    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp

    r202578 r235117  
    5050    }
    5151
    52     static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)
     52    static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo)
    5353    {
    5454        WebKit2TextFieldBeginAndEditEditingTest& client = *static_cast<WebKit2TextFieldBeginAndEditEditingTest*>(const_cast<void*>(clientInfo));
    … …  
    7070    static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
    7171    {
    72         WKPageLoaderClientV6 loaderClient;
     72        WKPageNavigationClientV0 loaderClient;
    7373        memset(&loaderClient, 0, sizeof(loaderClient));
    7474
    75         loaderClient.base.version = 6;
     75        loaderClient.base.version = 0;
    7676        loaderClient.base.clientInfo = clientInfo;
    77         loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     77        loaderClient.didFinishNavigation = didFinishNavigation;
    7878
    79         WKPageSetPageLoaderClient(page, &loaderClient.base);
     79        WKPageSetPageNavigationClient(page, &loaderClient.base);
    8080    }
    8181

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp

    r185496 r235117  
    6060    }
    6161
    62     static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)
     62    static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo)
    6363    {
    6464        ((WebKit2UserMessageRoundTripTest*)clientInfo)->didFinishLoad = true;
    … …  
    7979    static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
    8080    {
    81         WKPageLoaderClientV3 loaderClient;
     81        WKPageNavigationClientV3 loaderClient;
    8282        memset(&loaderClient, 0, sizeof(loaderClient));
    8383
    8484        loaderClient.base.version = 3;
    8585        loaderClient.base.clientInfo = clientInfo;
    86         loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     86        loaderClient.didFinishNavigation = didFinishNavigation;
    8787
    88         WKPageSetPageLoaderClient(page, &loaderClient.base);
     88        WKPageSetPageNavigationClient(page, &loaderClient.base);
    8989    }
    9090

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp

    r221505 r235117  
    4949static bool didFinishLoad;
    5050
    51 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     51static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    5252{
    5353    didFinishLoad = true;
    … …  
    5656static void setPageLoaderClient(WKPageRef page)
    5757{
    58     WKPageLoaderClientV0 loaderClient;
     58    WKPageNavigationClientV0 loaderClient;
    5959    memset(&loaderClient, 0, sizeof(loaderClient));
    6060
    6161    loaderClient.base.version = 0;
    62     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     62    loaderClient.didFinishNavigation = didFinishNavigation;
    6363
    64     WKPageSetPageLoaderClient(page, &loaderClient.base);
     64    WKPageSetPageNavigationClient(page, &loaderClient.base);
    6565}
    6666

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp

    r221505 r235117  
    3838static WKRetainPtr<WKSessionStateRef> sessionStateWithAllItemsRemoved;
    3939
    40 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     40static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4141{
    4242    didFinishLoad = true;
    … …  
    4545static void setPageLoaderClient(WKPageRef page)
    4646{
    47     WKPageLoaderClientV0 loaderClient;
     47    WKPageNavigationClientV0 loaderClient;
    4848    memset(&loaderClient, 0, sizeof(loaderClient));
    4949
    5050    loaderClient.base.version = 0;
    51     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     51    loaderClient.didFinishNavigation = didFinishNavigation;
    5252
    53     WKPageSetPageLoaderClient(page, &loaderClient.base);
     53    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5454}
    5555

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp

    r221505 r235117  
    3636static bool didFinishLoad;
    3737
    38 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     38static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    3939{
    4040    didFinishLoad = true;
    … …  
    4343static void setPageLoaderClient(WKPageRef page)
    4444{
    45     WKPageLoaderClientV0 loaderClient;
     45    WKPageNavigationClientV0 loaderClient;
    4646    memset(&loaderClient, 0, sizeof(loaderClient));
    4747
    4848    loaderClient.base.version = 0;
    49     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     49    loaderClient.didFinishNavigation = didFinishNavigation;
    5050
    51     WKPageSetPageLoaderClient(page, &loaderClient.base);
     51    WKPageSetPageNavigationClient(page, &loaderClient.base);
    5252}
    5353

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp

    r221505 r235117  
    6767}
    6868
    69 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
     69static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef, const void*)
    7070{
    7171    didFinishLoad = true;
    … …  
    7979static void setUpClients(WKPageRef page)
    8080{
    81     WKPageLoaderClientV0 loaderClient;
     81    WKPageNavigationClientV0 loaderClient;
    8282    memset(&loaderClient, 0, sizeof(loaderClient));
    8383
    8484    loaderClient.base.version = 0;
    85     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     85    loaderClient.didFinishNavigation = didFinishNavigation;
    8686
    87     WKPageSetPageLoaderClient(page, &loaderClient.base);
     87    WKPageSetPageNavigationClient(page, &loaderClient.base);
    8888
    8989    WKPageUIClientV5 uiClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm

    r224696 r235117  
    7979#if WK_HAVE_C_SPI
    8080   
    81 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     81static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    8282{
    8383    didFinishLoad = true;
    … …  
    8686static void setPageLoaderClient(WKPageRef page)
    8787{
    88     WKPageLoaderClientV0 loaderClient;
     88    WKPageNavigationClientV0 loaderClient;
    8989    memset(&loaderClient, 0, sizeof(loaderClient));
    9090
    9191    loaderClient.base.version = 0;
    92     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    93 
    94     WKPageSetPageLoaderClient(page, &loaderClient.base);
     92    loaderClient.didFinishNavigation = didFinishNavigation;
     93
     94    WKPageSetPageNavigationClient(page, &loaderClient.base);
    9595}
    9696

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp

    r221505 r235117  
    101101}
    102102
    103 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
     103static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    104104{
    105105    didFinishLoad = true;
    … …  
    113113    PlatformWebView webView(context.get());
    114114
    115     WKPageLoaderClientV3 loaderClient;
     115    WKPageNavigationClientV3 loaderClient;
    116116    memset(&loaderClient, 0, sizeof(loaderClient));
    117117   
    118118    loaderClient.base.version = 3;
    119     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     119    loaderClient.didFinishNavigation = didFinishNavigation;
    120120
    121     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     121    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    122122
    123123    WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple", "html")).get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm

    r221505 r235117  
    4141static bool didReceiveInvalidMessage = false;
    4242
    43 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     43static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4444{
    4545    didFinishLoad = true;
    … …  
    6262    PlatformWebView webView(context.get(), pageGroup.get());
    6363
    64     WKPageLoaderClientV0 loaderClient;
     64    WKPageNavigationClientV0 loaderClient;
    6565    memset(&loaderClient, 0, sizeof(loaderClient));
    6666    loaderClient.base.version = 0;
    67     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    68     loaderClient.processDidCrash = processDidCrash;
    69     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     67    loaderClient.didFinishNavigation = didFinishNavigation;
     68    loaderClient.webProcessDidCrash = processDidCrash;
     69    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    7070
    7171    WKContextSetInvalidMessageFunction(invalidMessageFunction);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm

    r222468 r235117  
    4242static WKPageRef expectedOriginatingPage;
    4343
    44 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     44static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4545{
    4646    didFinishLoad = true;
    … …  
    9292    PlatformWebView webView(context.get(), pageGroup.get());
    9393
    94     WKPageLoaderClientV0 loaderClient;
     94    WKPageNavigationClientV0 loaderClient;
    9595    memset(&loaderClient, 0, sizeof(loaderClient));
    9696    loaderClient.base.version = 0;
    97     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    98     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     97    loaderClient.didFinishNavigation = didFinishNavigation;
     98    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    9999
    100100    WKPageContextMenuClientV3 contextMenuClient;
    … …  
    139139    PlatformWebView webView(context.get(), pageGroup.get());
    140140
    141     WKPageLoaderClientV0 loaderClient;
     141    WKPageNavigationClientV0 loaderClient;
    142142    memset(&loaderClient, 0, sizeof(loaderClient));
    143143    loaderClient.base.version = 0;
    144     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    145     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     144    loaderClient.didFinishNavigation = didFinishNavigation;
     145    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    146146
    147147    WKPageContextMenuClientV3 contextMenuClient;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm

    r233207 r235117  
    6868}
    6969
    70 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     70static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    7171{
    7272    loadDone = true;
    … …  
    8989    PlatformWebView webView(context.get());
    9090   
    91     WKPageLoaderClientV0 loaderClient;
     91    WKPageNavigationClientV0 loaderClient;
    9292    memset(&loaderClient, 0, sizeof(loaderClient));
    9393   
    9494    loaderClient.base.version = 0;
    95     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     95    loaderClient.didFinishNavigation = didFinishNavigation;
    9696   
    97     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     97    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    9898   
    9999    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm

    r221505 r235117  
    3636static bool didFinishLoad;
    3737
    38 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     38static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    3939{
    4040    didFinishLoad = true;
    … …  
    5353    PlatformWebView webView(context.get(), pageGroup.get());
    5454
    55     WKPageLoaderClientV0 loaderClient;
     55    WKPageNavigationClientV0 loaderClient;
    5656    memset(&loaderClient, 0, sizeof(loaderClient));
    5757
    5858    loaderClient.base.version = 0;
    59     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     59    loaderClient.didFinishNavigation = didFinishNavigation;
    6060
    61     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     61    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    6262
    6363    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-tall", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp

    r221505 r235117  
    3636static bool loaded;
    3737
    38 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     38static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    3939{
    4040    loaded = true;
    … …  
    4747    PlatformWebView webView(context.get());
    4848
    49     WKPageLoaderClientV0 loaderClient;
     49    WKPageNavigationClientV0 loaderClient;
    5050    memset(&loaderClient, 0, sizeof(loaderClient));
    5151
    5252    loaderClient.base.version = 0;
    53     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     53    loaderClient.didFinishNavigation = didFinishNavigation;
    5454
    55     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     55    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    5656
    5757    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp

    r221505 r235117  
    5959}
    6060
    61 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
     61static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
    6262{
    6363    loadDone = true;
    … …  
    8080    PlatformWebView webView(context.get());
    8181
    82     WKPageLoaderClientV0 loaderClient;
     82    WKPageNavigationClientV0 loaderClient;
    8383    memset(&loaderClient, 0, sizeof(loaderClient));
    8484
    8585    loaderClient.base.version = 0;
    86     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     86    loaderClient.didFinishNavigation = didFinishNavigation;
    8787
    88     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     88    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    8989
    9090    WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm

    r233878 r235117  
    4545static bool receivedDidExitFullscreenMessage;
    4646
    47 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     47static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4848{
    4949    receivedLoadedMessage = true;
    … …  
    128128    WKPageSetFullscreenDelegate(webView.page(), handler.get());
    129129
    130     WKPageLoaderClientV0 loaderClient;
     130    WKPageNavigationClientV0 loaderClient;
    131131    memset(&loaderClient, 0 , sizeof(loaderClient));
    132132
    133133    loaderClient.base.version = 0;
    134     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    135     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     134    loaderClient.didFinishNavigation = didFinishNavigation;
     135    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    136136
    137137    receivedLoadedMessage = false;

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm

    r233889 r235117  
    7979}
    8080
    81 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     81static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    8282{
    8383    receivedLoadedMessage = true;
    … …  
    166166    WKPageSetPageUIClient(webView.page(), &uiClient.base);
    167167   
    168     WKPageLoaderClientV0 loaderClient;
     168    WKPageNavigationClientV0 loaderClient;
    169169    memset(&loaderClient, 0 , sizeof(loaderClient));
    170170    loaderClient.base.version = 0;
    171     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    172     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     171    loaderClient.didFinishNavigation = didFinishNavigation;
     172    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    173173   
    174174    RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);

  • trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm

    r221505 r235117  
    3737static bool didFinishLoad;
    3838
    39 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     39static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
    4040{
    4141    didFinishLoad = true;
    … …  
    5959    PlatformWebView webView(context.get(), pageGroup.get());
    6060
    61     WKPageLoaderClientV0 loaderClient;
     61    WKPageNavigationClientV0 loaderClient;
    6262    memset(&loaderClient, 0, sizeof(loaderClient));
    6363    loaderClient.base.version = 0;
    64     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
    65     WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
     64    loaderClient.didFinishNavigation = didFinishNavigation;
     65    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
    6666   
    6767    [window.get().contentView addSubview:webView.platformView()];
    … …  
    8484
    8585    PlatformWebView newWebView(context.get(), pageGroup.get());
    86     WKPageSetPageLoaderClient(newWebView.page(), &loaderClient.base);
     86    WKPageSetPageNavigationClient(newWebView.page(), &loaderClient.base);
    8787
    8888    [window.get().contentView addSubview:newWebView.platformView()];

  • trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm

    r221064 r235117  
    6060namespace TestWebKitAPI {
    6161
    62 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* context)
     62static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* context)
    6363{
    6464    *static_cast<bool*>(const_cast<void*>(context)) = true;
    … …  
    6767static void setPageLoaderClient(WKPageRef page, bool* didFinishLoad)
    6868{
    69     WKPageLoaderClientV0 loaderClient;
     69    WKPageNavigationClientV0 loaderClient;
    7070    memset(&loaderClient, 0, sizeof(loaderClient));
    7171
    7272    loaderClient.base.version = 0;
    7373    loaderClient.base.clientInfo = didFinishLoad;
    74     loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
     74    loaderClient.didFinishNavigation = didFinishNavigation;
    7575
    76     WKPageSetPageLoaderClient(page, &loaderClient.base);
     76    WKPageSetPageNavigationClient(page, &loaderClient.base);
    7777}
    7878
Note: See TracChangeset for help on using the changeset viewer.