Attachment 347588 Details for Bug 188771 – Patch

[patch] Patch

bug-188771-20180820175059.patch (text/plain), 71.44 KB, created by Alex Christensen on 2018-08-20 17:51:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-20 17:51:00 PDT

Size: 71.44 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235100)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,188 @@
>+2018-08-20  Alex Christensen  <achristensen@webkit.org>
>+
>+        Replace WKPageLoaderClient with WKPageNavigationClient in many API tests
>+        https://bugs.webkit.org/show_bug.cgi?id=188771
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2018-08-20  Jonathan Bedard  <jbedard@apple.com>
> 
>         WebKitTestRunner: Add watchOS entitlements
>Index: Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp	(working copy)
>@@ -34,7 +34,7 @@ namespace TestWebKitAPI {
>     
> static bool loaded;
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     loaded = true;
> }
>@@ -47,13 +47,13 @@ TEST(WebKit, CloseThenTerminate)
>     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0 , sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>     
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp	(working copy)
>@@ -64,7 +64,7 @@ static void didGetUserHTTPCookieAcceptPo
>     WKCookieManagerGetHTTPCookieAcceptPolicy(cookieManager, reinterpret_cast<void*>(0x1234578), didGetTestHTTPCookieAcceptPolicy);
> }
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     WKCookieManagerRef cookieManager = WKContextGetCookieManager(wkContext.get());
>     WKCookieManagerGetHTTPCookieAcceptPolicy(cookieManager, reinterpret_cast<void*>(0x1234578), didGetUserHTTPCookieAcceptPolicy);
>@@ -75,13 +75,13 @@ TEST(WebKit, CookieManager)
>     wkContext.adopt(WKContextCreate());
>     PlatformWebView webView(wkContext.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());
> 
>Index: Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm	(working copy)
>@@ -36,20 +36,20 @@ namespace TestWebKitAPI {
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> TEST(WebKit, DeferredViewInWindowStateChange)
>Index: Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp	(working copy)
>@@ -37,10 +37,6 @@ namespace TestWebKitAPI {
> static bool didFinishTest;
> static bool didNotHandleKeyDownEvent;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>-{
>-}
>-
> static void didNotHandleKeyEventCallback(WKPageRef, WKNativeEventPtr event, const void*)
> {
>     if (Util::isKeyDown(event))
>@@ -53,14 +49,6 @@ TEST(WebKit, DidNotHandleKeyDown)
>     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>-    memset(&loaderClient, 0, sizeof(loaderClient));
>-    
>-    loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>-
>     WKPageUIClientV0 uiClient;
>     memset(&uiClient, 0, sizeof(uiClient));
> 
>Index: Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp	(working copy)
>@@ -38,24 +38,20 @@ namespace TestWebKitAPI {
> static bool finished = false;
> static int didRemoveFrameFromHierarchyCount;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>-    // Only mark finished when the main frame loads
>-    if (!WKFrameIsMainFrame(frame))
>-        return;
>-
>     finished = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV1 loaderClient;
>+    WKPageNavigationClientV1 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 1;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> static void didReceivePageMessageFromInjectedBundle(WKPageRef, WKStringRef messageName, WKTypeRef, const void*)
>Index: Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp	(working copy)
>@@ -36,7 +36,7 @@ namespace TestWebKitAPI {
> static bool didFinishLoad { false };
> static bool mouseMoveCallbackFinished { false };
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -49,11 +49,11 @@ static void mouseDidMoveOverElement(WKPa
> 
> static void setClients(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
>     
>     WKPageUIClientV1 uiClient;
>     memset(&uiClient, 0, sizeof(uiClient));
>Index: Tools/TestWebKitAPI/Tests/WebKit/Find.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/Find.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/Find.cpp	(working copy)
>@@ -36,7 +36,7 @@ namespace TestWebKitAPI {
> static bool didFinishLoad = false;
> static bool didCallCountStringMatches = false;
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     didFinishLoad = true;
> }
>@@ -54,13 +54,13 @@ TEST(WebKit, Find)
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     PlatformWebView webView(context.get());
>     
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageFindClientV0 findClient;
>     memset(&findClient, 0, sizeof(findClient));
>Index: Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm	(working copy)
>@@ -58,7 +58,7 @@ static WKFindOptions findOptions = kWKFi
> 
> RetainPtr<WebView> webkit1View;
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     didFinishLoad = true;
> }
>@@ -121,13 +121,13 @@ TEST(WebKit, FindMatches)
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     PlatformWebView webView(context.get());
>     
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageFindMatchesClientV0 findMatchesClient;
>     memset(&findMatchesClient, 0, sizeof(findMatchesClient));
>Index: Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp	(working copy)
>@@ -43,7 +43,7 @@ void didForceRepaint(WKErrorRef error, v
>     test2Done = true;
> }
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     test1Done = true;
>     WKPageForceRepaint(page, 0, didForceRepaint);
>@@ -54,13 +54,13 @@ TEST(WebKit, ForceRepaint)
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-accelerated-compositing", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp	(working copy)
>@@ -38,7 +38,7 @@ namespace TestWebKitAPI {
> 
> static bool done;
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     done = true;
> }
>@@ -48,11 +48,11 @@ TEST(WebKit, FrameHandle)
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());
>     Util::run(&done);
>Index: Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp	(working copy)
>@@ -307,7 +307,7 @@ struct GeolocationTransitionToLowAccurac
>     }
> };
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     *static_cast<bool*>(const_cast<void*>(clientInfo)) = true;
> }
>@@ -331,14 +331,14 @@ TEST(WebKit, GeolocationTransitionToLowA
> 
>     bool finishedSecondStep = false;
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>     loaderClient.base.clientInfo = &finishedSecondStep;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(lowAccuracyWebView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(lowAccuracyWebView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> lowAccuracyURL(AdoptWK, Util::createURLForResource("geolocationWatchPosition", "html"));
>     WKPageLoadURL(lowAccuracyWebView.page(), lowAccuracyURL.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp	(working copy)
>@@ -37,7 +37,7 @@ static bool done;
> static bool messageReceived;
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -51,13 +51,13 @@ static void didReceiveMessageFromInjecte
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> static void setInjectedBundleClient(WKContextRef context)
>Index: Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp	(working copy)
>@@ -44,7 +44,7 @@ static void didReceiveMessageFromInjecte
>         done = true;
> }
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     loadDone = true;
>     if (messageReceived)
>@@ -65,13 +65,13 @@ TEST(WebKit, InjectedBundleBasic)
>  
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp	(working copy)
>@@ -38,7 +38,7 @@ static bool waitUntilLongTitleReceived =
> static bool didFinishLoad = false;
> static size_t maxTitleLength = 4096;
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo)
> {
>     didFinishLoad = true;
> }
>Index: Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp	(working copy)
>@@ -40,7 +40,7 @@ namespace TestWebKitAPI {
>     
> static bool didFinishLoad = false;
>     
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     didFinishLoad = true;
> }
>@@ -50,12 +50,12 @@ static void loadAlternateHTMLString(WKUR
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKStringRef> alternateHTMLString(AdoptWK, WKStringCreateWithUTF8CString("<html><body><img src='icon.png'></body></html>"));
>     WKPageLoadAlternateHTMLString(webView.page(), alternateHTMLString.get(), baseURL, unreachableURL);
>Index: Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp	(working copy)
>@@ -37,20 +37,13 @@
> 
> namespace TestWebKitAPI {
> 
>-static bool loadedMainFrame;
>-static bool loadedIFrame;
> static bool loadedAllFrames;
> 
> static bool performedServerRedirect;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>-    if (WKFrameIsMainFrame(frame))
>-        loadedMainFrame = true;
>-    else
>-        loadedIFrame = true;
>-
>-    loadedAllFrames = loadedMainFrame && loadedIFrame;
>+    loadedAllFrames = true;
> }
> 
> static void didPerformServerRedirect(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo)
>@@ -71,13 +64,13 @@ TEST(WebKit, LoadCanceledNoServerRedirec
> 
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
>     
>     WKContextHistoryClientV0 historyClient;
>     memset(&historyClient, 0, sizeof(historyClient));
>Index: Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp	(working copy)
>@@ -34,7 +34,7 @@
> 
> namespace TestWebKitAPI {
> 
>-static void didFinishLoad(WKPageRef, WKFrameRef, WKTypeRef, const void*);
>+static void didFinishLoad(WKPageRef, WKNavigationRef, WKTypeRef, const void*);
> 
> class WebKit2CrashLoader {
> public:
>@@ -49,9 +49,9 @@ public:
> 
>         loaderClient.base.version = 0;
>         loaderClient.base.clientInfo = this;
>-        loaderClient.didFinishLoadForFrame = didFinishLoad;
>+        loaderClient.didFinishNavigation = didFinishLoad;
> 
>-        WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+        WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
>     }
> 
>     void loadUrl()
>@@ -65,7 +65,7 @@ public:
>     }
> 
>     WKRetainPtr<WKContextRef> context;
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     PlatformWebView webView;
>     WKRetainPtr<WKURLRef> url;
> 
>@@ -75,7 +75,7 @@ public:
> 
> // We are going to have 2 load events intertwined by a simulated crash
> // (i.e. Load -> Crash -> Load).
>-void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     WebKit2CrashLoader* testHelper = const_cast<WebKit2CrashLoader*>(static_cast<const WebKit2CrashLoader*>(clientInfo));
> 
>Index: Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp	(working copy)
>@@ -35,20 +35,20 @@ namespace TestWebKitAPI {
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> static void buildAndPerformTest(WKEventMouseButton button, WKEventModifiers modifiers, const char* expectedButton, const char* expectedMenuType)
>Index: Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp	(working copy)
>@@ -35,20 +35,20 @@ namespace TestWebKitAPI {
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> TEST(WebKit, MouseMoveAfterCrash)
>Index: Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp	(working copy)
>@@ -45,7 +45,7 @@ static void didForceRepaint(WKErrorRef e
>     test2Done = true;
> }
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo)
> {
>     test1Done = true;
>     WKPageForceRepaint(page, 0, didForceRepaint);
>Index: Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp	(working copy)
>@@ -182,22 +182,22 @@ TEST(WebKit, PageLoadTwiceAndReload)
>     test1Done = false;
>     static unsigned loadsCount = 0;
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>     loaderClient.base.clientInfo = nullptr;
>-    loaderClient.didFailProvisionalLoadWithErrorForFrame = [](WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void *clientInfo) {
>+    loaderClient.didFailProvisionalNavigation = [](WKPageRef page, WKNavigationRef, WKErrorRef error, WKTypeRef userData, const void *clientInfo) {
>         loadsCount++;
>         WKPageReload(page);
>     };
>-    loaderClient.didFinishLoadForFrame = [](WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo) {
>+    loaderClient.didFinishNavigation = [](WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) {
>         if (++loadsCount == 3) {
>             test1Done = true;
>             return;
>         }
>         WKPageReload(page);
>     };
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url1(AdoptWK, Util::createURLForResource("simple", "html"));
>     WKRetainPtr<WKURLRef> url2(AdoptWK, Util::createURLForResource("simple2", "html"));
>Index: Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp	(working copy)
>@@ -41,11 +41,13 @@ TEST(WebKit, PendingAPIRequestURL)
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = [](WKPageRef, WKFrameRef, WKTypeRef, const void*) { done = true; };
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = [](auto...) {
>+        done = true;
>+    };
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> activeURL = adoptWK(WKPageCopyActiveURL(webView.page()));
>     EXPECT_NULL(activeURL.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp	(working copy)
>@@ -47,7 +47,7 @@ struct TestStatesData {
>     bool resizeAfterCrash;
> };
> 
>-static void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     TestStatesData* states = const_cast<TestStatesData*>(static_cast<const TestStatesData*>(clientInfo));
>     if (!states->firstLoad) {
>@@ -78,15 +78,15 @@ TEST(WebKit, ResizeWindowAfterCrash)
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     TestStatesData states(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>     loaderClient.base.clientInfo = &states;
>-    loaderClient.didFinishLoadForFrame = didFinishLoad;
>-    loaderClient.processDidCrash = didCrash;
>+    loaderClient.didFinishNavigation = didFinishLoad;
>+    loaderClient.webProcessDidCrash = didCrash;
> 
>-    WKPageSetPageLoaderClient(states.webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(states.webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
>     // Load a blank page and next kills WebProcess.
>Index: Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp	(working copy)
>@@ -38,7 +38,7 @@ namespace TestWebKitAPI {
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -61,13 +61,13 @@ static void decidePolicyForResponse(WKPa
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> static WKRetainPtr<WKDataRef> createSessionStateData(WKContextRef context)
>Index: Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp	(working copy)
>@@ -37,20 +37,20 @@ namespace TestWebKitAPI {
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> static WKRetainPtr<WKDataRef> createSessionStateDataContainingFormData(WKContextRef context)
>Index: Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp	(working copy)
>@@ -41,7 +41,7 @@ namespace TestWebKitAPI {
> 
> static bool testDone;
> 
>-static void didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void *clientInfo)
> {
>     WKPageSetScrollPinningBehavior(page, kWKScrollPinningBehaviorPinToBottom);
> 
>@@ -82,14 +82,14 @@ TEST(WebKit, ScrollPinningBehaviors)
> 
>     PlatformWebView webView(context.get(), pageGroup.get());
> 
>-    WKPageLoaderClientV3 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>-    loaderClient.base.version = 3;
>+    loaderClient.base.version = 0;
>     loaderClient.base.clientInfo = &webView;
>-    loaderClient.didFinishDocumentLoadForFrame = didFinishDocumentLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple-tall", "html")).get());
> 
>Index: Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp	(working copy)
>@@ -38,7 +38,7 @@ namespace TestWebKitAPI {
> static bool didFinishLoad;
> static bool didNotHandleKeyDownEvent;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -61,13 +61,13 @@ TEST(WebKit, SpacebarScrolling)
> 
>     PlatformWebView webView(context.get(), pageGroup.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageUIClientV0 uiClient;
>     memset(&uiClient, 0, sizeof(uiClient));
>Index: Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp	(working copy)
>@@ -53,7 +53,7 @@ static void setInjectedBundleClient(WKCo
>     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
> }
> 
>-static void didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef, WKErrorRef, WKTypeRef, const void*)
>+static void didFailProvisionalNavigation(WKPageRef, WKNavigationRef, WKErrorRef, WKTypeRef, const void*)
> {
>     // The injected bundle is notified of the failed load first. If we also receive this callback, the test didn't crash.
>     EXPECT_TRUE(receivedMessageFromBundle);
>@@ -67,10 +67,10 @@ TEST(WebKit, StopLoadingDuringDidFailPro
> 
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>-    loaderClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFailProvisionalNavigation = didFailProvisionalNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::URLForNonExistentResource());
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp	(working copy)
>@@ -34,7 +34,7 @@ namespace TestWebKitAPI {
> 
> static bool loaded;
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     loaded = true;
> }
>@@ -44,13 +44,13 @@ TEST(WebKit, TerminateTwice)
>     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp	(working copy)
>@@ -49,7 +49,7 @@ struct WebKit2TextFieldBeginAndEditEditi
>         client.didReceiveMessage = true;
>     }
> 
>-    static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)
>+    static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo)
>     {
>         WebKit2TextFieldBeginAndEditEditingTest& client = *static_cast<WebKit2TextFieldBeginAndEditEditingTest*>(const_cast<void*>(clientInfo));
>         client.didFinishLoad = true;
>@@ -69,14 +69,14 @@ struct WebKit2TextFieldBeginAndEditEditi
> 
>     static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
>     {
>-        WKPageLoaderClientV6 loaderClient;
>+        WKPageNavigationClientV0 loaderClient;
>         memset(&loaderClient, 0, sizeof(loaderClient));
> 
>-        loaderClient.base.version = 6;
>+        loaderClient.base.version = 0;
>         loaderClient.base.clientInfo = clientInfo;
>-        loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+        loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-        WKPageSetPageLoaderClient(page, &loaderClient.base);
>+        WKPageSetPageNavigationClient(page, &loaderClient.base);
>     }
> 
>     static void nullJavaScriptCallback(WKSerializedScriptValueRef, WKErrorRef, void*)
>Index: Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp	(working copy)
>@@ -59,7 +59,7 @@ public:
>         ((WebKit2UserMessageRoundTripTest*)clientInfo)->didReceiveMessage = true;
>     }
> 
>-    static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)
>+    static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo)
>     {
>         ((WebKit2UserMessageRoundTripTest*)clientInfo)->didFinishLoad = true;
>     }
>@@ -78,14 +78,14 @@ public:
> 
>     static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
>     {
>-        WKPageLoaderClientV3 loaderClient;
>+        WKPageNavigationClientV3 loaderClient;
>         memset(&loaderClient, 0, sizeof(loaderClient));
> 
>         loaderClient.base.version = 3;
>         loaderClient.base.clientInfo = clientInfo;
>-        loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+        loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-        WKPageSetPageLoaderClient(page, &loaderClient.base);
>+        WKPageSetPageNavigationClient(page, &loaderClient.base);
>     }
> 
>     virtual void SetUp()
>Index: Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp	(working copy)
>@@ -48,20 +48,20 @@ TEST(WebKit, WKPageConfigurationEmpty)
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> TEST(WebKit, WKPageConfigurationBasic)
>Index: Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp	(working copy)
>@@ -37,20 +37,20 @@ static bool didFinishLoad;
> static WKRetainPtr<WKSessionStateRef> sessionStateWithFirstItemRemoved;
> static WKRetainPtr<WKSessionStateRef> sessionStateWithAllItemsRemoved;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> static bool filterFirstItemCallback(WKPageRef page, WKStringRef valueType, WKTypeRef value, void* context)
>Index: Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp	(working copy)
>@@ -35,20 +35,20 @@ namespace TestWebKitAPI {
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> static WKRetainPtr<WKSessionStateRef> createSessionState(WKContextRef context)
>Index: Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp	(working copy)
>@@ -66,7 +66,7 @@ static void isMSEEnabledCallback(WKSeria
>     JSGlobalContextRelease(scriptContext);
> }
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -78,13 +78,13 @@ static void isPlayingAudioDidChangeCallb
> 
> static void setUpClients(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> 
>     WKPageUIClientV5 uiClient;
>     memset(&uiClient, 0, sizeof(uiClient));
>Index: Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm	(working copy)
>@@ -78,20 +78,20 @@ namespace TestWebKitAPI {
> 
> #if WK_HAVE_C_SPI
>     
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> TEST(WebKit, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
>Index: Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp	(working copy)
>@@ -100,7 +100,7 @@ static void setInjectedBundleClient(WKCo
>     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
> }
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -112,13 +112,13 @@ TEST(WebKit, WebArchive)
> 
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV3 loaderClient;
>+    WKPageNavigationClientV3 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     
>     loaderClient.base.version = 3;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple", "html")).get());
> 
>Index: Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm	(working copy)
>@@ -40,7 +40,7 @@ static bool didFinishTest = false;
> static bool didObserveWebProcessToCrash = false;
> static bool didReceiveInvalidMessage = false;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -61,12 +61,12 @@ TEST(WebKit, AttributedSubstringForPropo
>     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("AttributedSubstringForProposedRangeWithImagePageGroup").get()));
>     PlatformWebView webView(context.get(), pageGroup.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    loaderClient.processDidCrash = processDidCrash;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    loaderClient.webProcessDidCrash = processDidCrash;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKContextSetInvalidMessageFunction(invalidMessageFunction);
> 
>Index: Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm	(working copy)
>@@ -41,7 +41,7 @@ static bool didFinishLoad;
> static bool didDecideDownloadDestination;
> static WKPageRef expectedOriginatingPage;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -91,11 +91,11 @@ TEST(WebKit, ContextMenuDownloadHTMLDown
>     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("MyGroup").get()));
>     PlatformWebView webView(context.get(), pageGroup.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageContextMenuClientV3 contextMenuClient;
>     memset(&contextMenuClient, 0, sizeof(contextMenuClient));
>@@ -138,11 +138,11 @@ TEST(WebKit, ContextMenuDownloadHTMLDown
>     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("MyGroup").get()));
>     PlatformWebView webView(context.get(), pageGroup.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKPageContextMenuClientV3 contextMenuClient;
>     memset(&contextMenuClient, 0, sizeof(contextMenuClient));
>Index: Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm	(working copy)
>@@ -67,7 +67,7 @@ static void didReceiveMessageFromInjecte
>         done = true;
> }
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     loadDone = true;
>     if (messageReceived)
>@@ -88,13 +88,13 @@ TEST(WebKit, CustomBundleParameter)
> 
>     PlatformWebView webView(context.get());
>     
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>     
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
>     
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm	(working copy)
>@@ -35,7 +35,7 @@ namespace TestWebKitAPI {
> 
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -52,13 +52,13 @@ TEST(WebKit, ScrollByLineCommands)
> 
>     PlatformWebView webView(context.get(), pageGroup.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-tall", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp	(working copy)
>@@ -35,7 +35,7 @@ namespace TestWebKitAPI {
> 
> static bool loaded;
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     loaded = true;
> }
>@@ -46,13 +46,13 @@ TEST(WebKit, GetPIDAfterAbortedProcessLa
> 
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp	(working copy)
>@@ -58,7 +58,7 @@ static void didReceiveMessageFromInjecte
>         done = true;
> }
> 
>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
> {
>     loadDone = true;
>     if (messageReceived)
>@@ -79,13 +79,13 @@ TEST(WebKit, InjectedBundleAppleEvent)
> 
>     PlatformWebView webView(context.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
>     WKPageLoadURL(webView.page(), url.get());
>Index: Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm	(working copy)
>@@ -44,7 +44,7 @@ static bool receivedDidEnterFullscreenMe
> static bool receivedWillExitFullscreenMessage;
> static bool receivedDidExitFullscreenMessage;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     receivedLoadedMessage = true;
> }
>@@ -127,12 +127,12 @@ TEST(Fullscreen, WKViewDelegate)
>     RetainPtr<FullscreenDelegateMessageHandler> handler = adoptNS([[FullscreenDelegateMessageHandler alloc] init]);
>     WKPageSetFullscreenDelegate(webView.page(), handler.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0 , sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
> 
>     receivedLoadedMessage = false;
>     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("FullscreenDelegate", "html"));
>Index: Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm	(working copy)
>@@ -78,7 +78,7 @@ static void waitUntilOnLoadIsCompleted(W
>     }
> }
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     receivedLoadedMessage = true;
> }
>@@ -165,11 +165,11 @@ TEST(PictureInPicture, WKPageUIClient)
>     uiClient.hasVideoInPictureInPictureDidChange = hasVideoInPictureInPictureDidChange;
>     WKPageSetPageUIClient(webView.page(), &uiClient.base);
>     
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0 , sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
>     
>     RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
>     [window.get() makeKeyAndOrderFront:nil];
>Index: Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm	(working copy)
>@@ -36,7 +36,7 @@ namespace TestWebKitAPI {
>     
> static bool didFinishLoad;
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
> {
>     didFinishLoad = true;
> }
>@@ -58,11 +58,11 @@ TEST(WebKit, FirstResponderScrollingPosi
> 
>     PlatformWebView webView(context.get(), pageGroup.get());
> 
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>     loaderClient.base.version = 0;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
>+    loaderClient.didFinishNavigation = didFinishNavigation;
>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
>     
>     [window.get().contentView addSubview:webView.platformView()];
>     [window.get() makeFirstResponder:webView.platformView()];
>@@ -83,7 +83,7 @@ TEST(WebKit, FirstResponderScrollingPosi
>     EXPECT_JS_EQ(webView.page(), "window.scrollY", "40");
> 
>     PlatformWebView newWebView(context.get(), pageGroup.get());
>-    WKPageSetPageLoaderClient(newWebView.page(), &loaderClient.base);
>+    WKPageSetPageNavigationClient(newWebView.page(), &loaderClient.base);
> 
>     [window.get().contentView addSubview:newWebView.platformView()];
>     [window.get() makeFirstResponder:newWebView.platformView()];
>Index: Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm
>===================================================================
>--- Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm	(revision 235090)
>+++ Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm	(working copy)
>@@ -59,21 +59,21 @@ - (void)webView:(WebView *)webView didFi
> 
> namespace TestWebKitAPI {
> 
>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* context)
>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* context)
> {
>     *static_cast<bool*>(const_cast<void*>(context)) = true;
> }
> 
> static void setPageLoaderClient(WKPageRef page, bool* didFinishLoad)
> {
>-    WKPageLoaderClientV0 loaderClient;
>+    WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
> 
>     loaderClient.base.version = 0;
>     loaderClient.base.clientInfo = didFinishLoad;
>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
>+    loaderClient.didFinishNavigation = didFinishNavigation;
> 
>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
> }
> 
> WebKitAgnosticTest::WebKitAgnosticTest()

Flags:

thorton: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188771: 347588 | 347644