Diff
Modified: trunk/Tools/ChangeLog (235116 => 235117)
--- trunk/Tools/ChangeLog 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/ChangeLog 2018-08-21 16:16:54 UTC (rev 235117)
@@ -1,3 +1,188 @@
+2018-08-20 Alex Christensen <achristen...@webkit.org>
+
+ 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.
+
2018-08-21 Adrian Perez de Castro <ape...@igalia.com>
[WPE] Update to use libwpe-1.0.0 and WPEBackend-fdo-1.0.0
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -34,7 +34,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -64,7 +64,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -36,7 +36,7 @@
static bool didFinishLoad;
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
didFinishLoad = true;
}
@@ -43,13 +43,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -37,10 +37,6 @@
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 @@
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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -38,24 +38,20 @@
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*)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -36,7 +36,7 @@
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 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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -36,7 +36,7 @@
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 @@
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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -58,7 +58,7 @@
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 @@
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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -43,7 +43,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -38,7 +38,7 @@
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 @@
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);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -307,7 +307,7 @@
}
};
-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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -37,7 +37,7 @@
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 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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -44,7 +44,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -38,7 +38,7 @@
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;
}
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -40,7 +40,7 @@
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 @@
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=''></body></html>"));
WKPageLoadAlternateHTMLString(webView.page(), alternateHTMLString.get(), baseURL, unreachableURL);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -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 @@
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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -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 @@
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 @@
}
WKRetainPtr<WKContextRef> context;
- WKPageLoaderClientV0 loaderClient;
+ WKPageNavigationClientV0 loaderClient;
PlatformWebView webView;
WKRetainPtr<WKURLRef> url;
@@ -75,7 +75,7 @@
// 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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -35,7 +35,7 @@
static bool didFinishLoad;
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
didFinishLoad = true;
}
@@ -42,13 +42,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -35,7 +35,7 @@
static bool didFinishLoad;
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
didFinishLoad = true;
}
@@ -42,13 +42,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -45,7 +45,7 @@
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);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -182,15 +182,15 @@
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;
@@ -197,7 +197,7 @@
}
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"));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -41,11 +41,13 @@
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 = [](WKPageRef, WKNavigationRef, WKTypeRef, const void*) {
+ done = true;
+ };
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
WKRetainPtr<WKURLRef> activeURL = adoptWK(WKPageCopyActiveURL(webView.page()));
EXPECT_NULL(activeURL.get());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -47,7 +47,7 @@
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 @@
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 = ""
// Load a blank page and next kills WebProcess.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -38,7 +38,7 @@
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 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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -37,7 +37,7 @@
static bool didFinishLoad;
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
didFinishLoad = true;
}
@@ -44,13 +44,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -41,7 +41,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -38,7 +38,7 @@
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 @@
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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -53,7 +53,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -34,7 +34,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -49,7 +49,7 @@
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 @@
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*)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -59,7 +59,7 @@
((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 @@
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()
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -48,7 +48,7 @@
static bool didFinishLoad;
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
didFinishLoad = true;
}
@@ -55,13 +55,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -37,7 +37,7 @@
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;
}
@@ -44,13 +44,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -35,7 +35,7 @@
static bool didFinishLoad;
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
didFinishLoad = true;
}
@@ -42,13 +42,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -66,7 +66,7 @@
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 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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -78,7 +78,7 @@
#if WK_HAVE_C_SPI
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
didFinishLoad = true;
}
@@ -85,13 +85,13 @@
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)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -100,7 +100,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -40,7 +40,7 @@
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 @@
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);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -41,7 +41,7 @@
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 @@
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 @@
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));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -67,7 +67,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -35,7 +35,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -35,7 +35,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp 2018-08-21 16:16:54 UTC (rev 235117)
@@ -58,7 +58,7 @@
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 @@
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());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -44,7 +44,7 @@
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 @@
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"));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -78,7 +78,7 @@
}
}
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
{
receivedLoadedMessage = true;
}
@@ -165,11 +165,11 @@
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];
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -36,7 +36,7 @@
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 @@
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 @@
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()];
Modified: trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm (235116 => 235117)
--- trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm 2018-08-21 16:16:54 UTC (rev 235117)
@@ -59,7 +59,7 @@
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;
}
@@ -66,14 +66,14 @@
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()
