Diff
Modified: trunk/Tools/ChangeLog (235122 => 235123)
--- trunk/Tools/ChangeLog 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/ChangeLog 2018-08-21 17:31:44 UTC (rev 235123)
@@ -1,3 +1,82 @@
+2018-08-21 Alex Christensen <achristen...@webkit.org>
+
+ Transition more API tests from WKPageLoaderClient to WKPageNavigationClient
+ https://bugs.webkit.org/show_bug.cgi?id=188797
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKit/AboutBlankLoad.cpp:
+ (TestWebKitAPI::didFinishNavigation):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/EphemeralSessionPushStateNoHistoryCallback.cpp:
+ (TestWebKitAPI::didSameDocumentNavigation):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didSameDocumentNavigationForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/FailedLoad.cpp:
+ (TestWebKitAPI::didFailProvisionalNavigation):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp:
+ (TestWebKitAPI::didStartProvisionalNavigation):
+ (TestWebKitAPI::didCommitNavigation):
+ (TestWebKitAPI::didFinishNavigation):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didStartProvisionalLoadForFrame): Deleted.
+ (TestWebKitAPI::didCommitLoadForFrame): Deleted.
+ (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp:
+ (TestWebKitAPI::didStartProvisionalNavigation):
+ (TestWebKitAPI::didCommitNavigation):
+ (TestWebKitAPI::didFinishNavigation):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didStartProvisionalLoadForFrame): Deleted.
+ (TestWebKitAPI::didCommitLoadForFrame): Deleted.
+ (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/LayoutMilestonesWithAllContentInFrame.cpp:
+ (TestWebKitAPI::renderingProgressDidChange):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didLayout): Deleted.
+ * TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
+ (TestWebKitAPI::didFinishNavigation):
+ (TestWebKitAPI::renderingProgressDidChange):
+ (TestWebKitAPI::setPageLoaderClient):
+ (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+ (TestWebKitAPI::didLayout): Deleted.
+ * TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp:
+ (TestWebKitAPI::State::State):
+ (TestWebKitAPI::didStartProvisionalNavigation):
+ (TestWebKitAPI::didCommitNavigation):
+ (TestWebKitAPI::didFinishNavigation):
+ (TestWebKitAPI::decidePolicyForNavigationAction):
+ (TestWebKitAPI::decidePolicyForResponse):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didStartProvisionalLoadForFrame): Deleted.
+ (TestWebKitAPI::didCommitLoadForFrame): Deleted.
+ (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+ (TestWebKitAPI::decidePolicyForNewWindowAction): Deleted.
+ * TestWebKitAPI/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp:
+ (TestWebKitAPI::didSameDocumentNavigation):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+ (TestWebKitAPI::didSameDocumentNavigationForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp:
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didSameDocumentNavigationForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp:
+ (TestWebKitAPI::didFinishLoad):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp:
+ (TestWebKitAPI::didFinishNavigation):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+ * TestWebKitAPI/Tests/WebKit/mac/RestoreStateAfterTermination.mm:
+ (TestWebKitAPI::didFinishLoad):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/CommandBackForward.mm:
+ (WebKit2_CommandBackForwardTestWKView::SetUp):
+ (WebKit2_CommandBackForwardTestWKView::didFinishLoadForFrame): Deleted.
+
2018-08-20 Alex Christensen <achristen...@webkit.org>
Replace WKPageLoaderClient with WKPageNavigationClient in many API tests
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/AboutBlankLoad.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/AboutBlankLoad.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/AboutBlankLoad.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -34,9 +34,9 @@
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)
{
- WKRetainPtr<WKStringRef> mimeType = adoptWK(WKFrameCopyMIMEType(frame));
+ WKRetainPtr<WKStringRef> mimeType = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_WK_STREQ("text/html", mimeType);
done = true;
}
@@ -46,13 +46,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);
WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/EphemeralSessionPushStateNoHistoryCallback.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/EphemeralSessionPushStateNoHistoryCallback.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/EphemeralSessionPushStateNoHistoryCallback.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -44,7 +44,7 @@
FAIL();
}
-static void didSameDocumentNavigationForFrame(WKPageRef page, WKFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef userData, const void *clientInfo)
+static void didSameDocumentNavigation(WKPageRef page, WKNavigationRef, WKSameDocumentNavigationType type, WKTypeRef userData, const void *clientInfo)
{
testDone = true;
}
@@ -69,13 +69,13 @@
PlatformWebView webView(configuration.get());
- WKPageLoaderClientV0 pageLoaderClient;
+ WKPageNavigationClientV0 pageLoaderClient;
memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
pageLoaderClient.base.version = 0;
- pageLoaderClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
+ pageLoaderClient.didSameDocumentNavigation = didSameDocumentNavigation;
- WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &pageLoaderClient.base);
WKRetainPtr<WKPreferencesRef> preferences(AdoptWK, WKPreferencesCreate());
WKPreferencesSetUniversalAccessFromFileURLsAllowed(preferences.get(), true);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/FailedLoad.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/FailedLoad.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/FailedLoad.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -38,8 +38,9 @@
static bool testDone;
-static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
+static void didFailProvisionalNavigation(WKPageRef page, WKNavigationRef, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
{
+ auto frame = WKPageGetMainFrame(page);
EXPECT_EQ(static_cast<uint32_t>(kWKFrameLoadStateFinished), WKFrameGetFrameLoadState(frame));
WKURLRef url = ""
@@ -53,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.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
+ loaderClient.didFailProvisionalNavigation = didFailProvisionalNavigation;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
WKRetainPtr<WKURLRef> url(AdoptWK, Util::URLForNonExistentResource());
WKPageLoadURL(webView.page(), url.get());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -36,21 +36,21 @@
static bool testDone;
-static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didStartProvisionalNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
- WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(frame));
+ WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_TRUE(WKStringIsEmpty(wkMIME.get()));
}
-static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didCommitNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
- WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(frame));
+ WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_WK_STREQ("text/html", wkMIME);
}
-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
- WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(frame));
+ WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_WK_STREQ("text/html", wkMIME);
testDone = true;
@@ -61,15 +61,15 @@
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
PlatformWebView webView(context.get());
- WKPageLoaderClientV0 loaderClient;
+ WKPageNavigationClientV0 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 0;
- loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
- loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
- loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
+ loaderClient.didStartProvisionalNavigation = didStartProvisionalNavigation;
+ loaderClient.didCommitNavigation = didCommitNavigation;
+ 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/FrameMIMETypePNG.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -35,21 +35,21 @@
static bool testDone;
-static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didStartProvisionalNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
- WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(frame));
+ WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_TRUE(WKStringIsEmpty(wkMIME.get()));
}
-static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didCommitNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
- WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(frame));
+ WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_WK_STREQ("image/png", wkMIME);
}
-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
- WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(frame));
+ WKRetainPtr<WKStringRef> wkMIME = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_WK_STREQ("image/png", wkMIME);
testDone = true;
@@ -60,15 +60,15 @@
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
PlatformWebView webView(context.get());
- WKPageLoaderClientV0 loaderClient;
+ WKPageNavigationClientV0 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 0;
- loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
- loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
- loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
+ loaderClient.didStartProvisionalNavigation = didStartProvisionalNavigation;
+ loaderClient.didCommitNavigation = didCommitNavigation;
+ loaderClient.didFinishNavigation = didFinishNavigation;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("icon", "png"));
WKPageLoadURL(webView.page(), url.get());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LayoutMilestonesWithAllContentInFrame.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LayoutMilestonesWithAllContentInFrame.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LayoutMilestonesWithAllContentInFrame.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -37,11 +37,11 @@
static bool testDone;
-static void didLayout(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef, const void* clientInfo)
+static void renderingProgressDidChange(WKPageRef page, WKPageRenderingProgressEvents milestones, WKTypeRef, const void* clientInfo)
{
// This test ensures that the DidFirstVisuallyNonEmptyLayout will be reached for the main frame
// even when all of the content is in a subframe.
- if (milestones & kWKDidFirstVisuallyNonEmptyLayout)
+ if (milestones & WKPageRenderingProgressEventFirstVisuallyNonEmptyLayout)
testDone = true;
}
@@ -50,16 +50,16 @@
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
PlatformWebView webView(context.get());
- WKPageLoaderClientV3 loaderClient;
+ WKPageNavigationClientV3 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 3;
loaderClient.base.clientInfo = &webView;
- loaderClient.didLayout = didLayout;
+ loaderClient.renderingProgressDidChange = renderingProgressDidChange;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
- WKPageListenForLayoutMilestones(webView.page(), kWKDidFirstVisuallyNonEmptyLayout);
+ WKPageListenForLayoutMilestones(webView.page(), WKPageRenderingProgressEventFirstVisuallyNonEmptyLayout);
WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("all-content-in-one-iframe", "html")).get());
Util::run(&testDone);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -46,15 +46,15 @@
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);
}
-static void didLayout(WKPageRef, WKLayoutMilestones type, WKTypeRef, const void *)
+static void renderingProgressDidChange(WKPageRef, WKPageRenderingProgressEvents type, WKTypeRef, const void *)
{
- if (type != kWKDidHitRelevantRepaintedObjectsAreaThreshold)
+ if (type != WKPageRenderingProgressEventFirstPaintWithSignificantArea)
return;
++didHitRelevantRepaintedObjectsAreaThresholdCounter;
@@ -64,14 +64,14 @@
static void setPageLoaderClient(WKPageRef page)
{
- WKPageLoaderClientV3 loaderClient;
+ WKPageNavigationClientV3 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 3;
- loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
- loaderClient.didLayout = didLayout;
+ loaderClient.didFinishNavigation = didFinishNavigation;
+ loaderClient.renderingProgressDidChange = renderingProgressDidChange;
- WKPageSetPageLoaderClient(page, &loaderClient.base);
+ WKPageSetPageNavigationClient(page, &loaderClient.base);
}
TEST(WebKit, NewFirstVisuallyNonEmptyLayoutFrames)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -39,61 +39,60 @@
struct State {
State()
: didDecidePolicyForNavigationAction(false)
- , didStartProvisionalLoadForFrame(false)
- , didCommitLoadForFrame(false)
+ , didStartProvisionalNavigation(false)
+ , didCommitNavigation(false)
{
}
bool didDecidePolicyForNavigationAction;
- bool didStartProvisionalLoadForFrame;
- bool didCommitLoadForFrame;
+ bool didStartProvisionalNavigation;
+ bool didCommitNavigation;
};
-static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didStartProvisionalNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
State* state = reinterpret_cast<State*>(const_cast<void*>(clientInfo));
EXPECT_TRUE(state->didDecidePolicyForNavigationAction);
- EXPECT_FALSE(state->didCommitLoadForFrame);
+ EXPECT_FALSE(state->didCommitNavigation);
// The commited URL should be null.
- EXPECT_NULL(WKFrameCopyURL(frame));
+ EXPECT_NULL(WKFrameCopyURL(WKPageGetMainFrame(page)));
- EXPECT_FALSE(state->didStartProvisionalLoadForFrame);
+ EXPECT_FALSE(state->didStartProvisionalNavigation);
- state->didStartProvisionalLoadForFrame = true;
+ state->didStartProvisionalNavigation = true;
}
-static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didCommitNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
State* state = reinterpret_cast<State*>(const_cast<void*>(clientInfo));
EXPECT_TRUE(state->didDecidePolicyForNavigationAction);
- EXPECT_TRUE(state->didStartProvisionalLoadForFrame);
+ EXPECT_TRUE(state->didStartProvisionalNavigation);
// The provisional URL should be null.
- EXPECT_NULL(WKFrameCopyProvisionalURL(frame));
+ EXPECT_NULL(WKFrameCopyProvisionalURL(WKPageGetMainFrame(page)));
- state->didCommitLoadForFrame = true;
+ state->didCommitNavigation = true;
}
-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
State* state = reinterpret_cast<State*>(const_cast<void*>(clientInfo));
EXPECT_TRUE(state->didDecidePolicyForNavigationAction);
- EXPECT_TRUE(state->didStartProvisionalLoadForFrame);
- EXPECT_TRUE(state->didCommitLoadForFrame);
+ EXPECT_TRUE(state->didStartProvisionalNavigation);
+ EXPECT_TRUE(state->didCommitNavigation);
// The provisional URL should be null.
- EXPECT_NULL(WKFrameCopyProvisionalURL(frame));
+ EXPECT_NULL(WKFrameCopyProvisionalURL(WKPageGetMainFrame(page)));
test1Done = true;
}
-static void decidePolicyForNavigationAction(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
+static void decidePolicyForNavigationAction(WKPageRef page, WKNavigationActionRef navigationAction, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
State* state = reinterpret_cast<State*>(const_cast<void*>(clientInfo));
- EXPECT_FALSE(state->didStartProvisionalLoadForFrame);
- EXPECT_FALSE(state->didCommitLoadForFrame);
- EXPECT_TRUE(mouseButton == kWKEventMouseButtonNoButton);
+ EXPECT_FALSE(state->didStartProvisionalNavigation);
+ EXPECT_FALSE(state->didCommitNavigation);
state->didDecidePolicyForNavigationAction = true;
@@ -100,17 +99,11 @@
WKFramePolicyListenerUse(listener);
}
-static void decidePolicyForNewWindowAction(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
+static void decidePolicyForResponse(WKPageRef page, WKNavigationResponseRef navigationResponse, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
- EXPECT_TRUE(mouseButton == kWKEventMouseButtonNoButton);
WKFramePolicyListenerUse(listener);
}
-static void decidePolicyForResponse(WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, bool canShowMIMEType, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
-{
- WKFramePolicyListenerUse(listener);
-}
-
TEST(WebKit, PageLoadBasic)
{
State state;
@@ -118,28 +111,19 @@
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
PlatformWebView webView(context.get());
- WKPageLoaderClientV0 loaderClient;
+ WKPageNavigationClientV0 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 0;
loaderClient.base.clientInfo = &state;
- loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
- loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
- loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
+ loaderClient.didStartProvisionalNavigation = didStartProvisionalNavigation;
+ loaderClient.didCommitNavigation = didCommitNavigation;
+ loaderClient.didFinishNavigation = didFinishNavigation;
+ loaderClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
+ loaderClient.decidePolicyForNavigationResponse = decidePolicyForResponse;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
- WKPagePolicyClientV1 policyClient;
- memset(&policyClient, 0, sizeof(policyClient));
-
- policyClient.base.version = 1;
- policyClient.base.clientInfo = &state;
- policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
- policyClient.decidePolicyForNewWindowAction = decidePolicyForNewWindowAction;
- policyClient.decidePolicyForResponse = decidePolicyForResponse;
-
- WKPageSetPagePolicyClient(webView.page(), &policyClient.base);
-
// Before loading anything, the active url should be null
EXPECT_NULL(WKPageCopyActiveURL(webView.page()));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -38,14 +38,10 @@
}
static bool didFinishLoad;
-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
-{
- didFinishLoad = true;
-}
-
static bool didPopStateWithinPage;
static bool didChangeLocationWithinPage;
-static void didSameDocumentNavigationForFrame(WKPageRef, WKFrameRef, WKSameDocumentNavigationType type, WKTypeRef, const void*)
+
+static void didSameDocumentNavigation(WKPageRef, WKNavigationRef, WKSameDocumentNavigationType type, WKTypeRef, const void*)
{
if (!didPopStateWithinPage) {
EXPECT_EQ(static_cast<uint32_t>(kWKSameDocumentNavigationSessionStatePop), type);
@@ -58,19 +54,21 @@
didChangeLocationWithinPage = true;
}
-TEST(WebKit, PageLoadDidChangeLocationWithinPageForFrame)
+TEST(WebKit, PageLoadDidChangeLocationWithinPage)
{
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.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
+ loaderClient.didFinishNavigation = [] (WKPageRef, WKNavigationRef, WKTypeRef, const void*) {
+ didFinishLoad = true;
+ };
+ loaderClient.didSameDocumentNavigation = didSameDocumentNavigation;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("file-with-anchor", "html"));
WKPageLoadURL(webView.page(), url.get());
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -49,11 +49,6 @@
didNavigate = true;
}
-static void didSameDocumentNavigationForFrame(WKPageRef page, WKFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef userData, const void *clientInfo)
-{
- didSameDocumentNavigation = true;
-}
-
TEST(WebKit, PrivateBrowsingPushStateNoHistoryCallback)
{
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
@@ -68,13 +63,15 @@
PlatformWebView webView(context.get());
- WKPageLoaderClientV0 pageLoaderClient;
+ WKPageNavigationClientV0 pageLoaderClient;
memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
pageLoaderClient.base.version = 0;
- pageLoaderClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
+ pageLoaderClient.didSameDocumentNavigation = [] (WKPageRef, WKNavigationRef, WKSameDocumentNavigationType, WKTypeRef, const void *) {
+ didSameDocumentNavigation = true;
+ };
- WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &pageLoaderClient.base);
WKRetainPtr<WKPreferencesRef> preferences(AdoptWK, WKPreferencesCreate());
WKPreferencesSetPrivateBrowsingEnabled(preferences.get(), true);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -37,7 +37,7 @@
static bool loadBeforeCrash = false;
static bool loadAfterCrash = false;
-static void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
// First load before WebProcess was terminated.
if (!loadBeforeCrash) {
@@ -47,7 +47,7 @@
// Next load after WebProcess was terminated (hopefully
// it will be correctly re-spawned).
- EXPECT_EQ(static_cast<uint32_t>(kWKFrameLoadStateFinished), WKFrameGetFrameLoadState(frame));
+ EXPECT_EQ(static_cast<uint32_t>(kWKFrameLoadStateFinished), WKFrameGetFrameLoadState(WKPageGetMainFrame(page)));
EXPECT_FALSE(loadAfterCrash);
// Set it, otherwise the loop will not end.
@@ -68,14 +68,14 @@
WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
PlatformWebView webView(context.get());
- WKPageLoaderClientV0 loaderClient;
+ WKPageNavigationClientV0 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 0;
- loaderClient.didFinishLoadForFrame = didFinishLoad;
- loaderClient.processDidCrash = didCrash;
+ loaderClient.didFinishNavigation = didFinishLoad;
+ loaderClient.webProcessDidCrash = didCrash;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
WKRetainPtr<WKURLRef> url = ""
// Load a blank page and next kills WebProcess.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp 2018-08-21 17:31:44 UTC (rev 235123)
@@ -46,7 +46,7 @@
done = true;
}
-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void*)
+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void*)
{
loadDone = true;
}
@@ -63,11 +63,11 @@
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(Util::createURLForResource("bundle-file", "html")).get());
Util::run(&loadDone);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/RestoreStateAfterTermination.mm (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/RestoreStateAfterTermination.mm 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/RestoreStateAfterTermination.mm 2018-08-21 17:31:44 UTC (rev 235123)
@@ -46,7 +46,7 @@
didGetPageSignalToContinue = true;
}
-static void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
+static void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
// First load before WebProcess was terminated.
if (!loadBeforeCrash) {
@@ -56,7 +56,7 @@
// Next load after WebProcess was terminated (hopefully
// it will be correctly re-spawned).
- EXPECT_EQ(static_cast<uint32_t>(kWKFrameLoadStateFinished), WKFrameGetFrameLoadState(frame));
+ EXPECT_EQ(static_cast<uint32_t>(kWKFrameLoadStateFinished), WKFrameGetFrameLoadState(WKPageGetMainFrame(page)));
EXPECT_FALSE(loadAfterCrash);
// Set it, otherwise the loop will not end.
@@ -78,12 +78,12 @@
RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:webView.platformView().frame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
[window.get().contentView addSubview:webView.platformView()];
- WKPageLoaderClientV0 loaderClient;
+ WKPageNavigationClientV0 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 0;
- loaderClient.didFinishLoadForFrame = didFinishLoad;
- loaderClient.processDidCrash = didCrash;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ loaderClient.didFinishNavigation = didFinishLoad;
+ loaderClient.webProcessDidCrash = didCrash;
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
WKPageUIClientV0 uiClient;
memset(&uiClient, 0, sizeof(uiClient));
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CommandBackForward.mm (235122 => 235123)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CommandBackForward.mm 2018-08-21 17:20:25 UTC (rev 235122)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CommandBackForward.mm 2018-08-21 17:31:44 UTC (rev 235123)
@@ -112,11 +112,6 @@
WKRetainPtr<WKURLRef> file1;
WKRetainPtr<WKURLRef> file2;
- static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)
- {
- didFinishNavigation = true;
- }
-
virtual void SetUp()
{
WebKit2_CommandBackForwardTest::SetUp();
@@ -127,13 +122,15 @@
webView = [[WKView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configurationRef:configuration.get()];
- WKPageLoaderClientV6 loaderClient;
+ WKPageNavigationClientV0 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
- loaderClient.base.version = 6;
- loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
+ loaderClient.base.version = 0;
+ loaderClient.didFinishNavigation = [] (WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo) {
+ didFinishNavigation = true;
+ };
- WKPageSetPageLoaderClient([webView pageRef], &loaderClient.base);
+ WKPageSetPageNavigationClient([webView pageRef], &loaderClient.base);
file1 = adoptWK(TestWebKitAPI::Util::createURLForResource("simple", "html"));
file2 = adoptWK(TestWebKitAPI::Util::createURLForResource("simple2", "html"));
