Skip to content

Commit

Permalink
Merge r235123 - Transition more API tests from WKPageLoaderClient to …
Browse files Browse the repository at this point in the history 
…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.
  • Loading branch information
@achristensen07 @carlosgcampos
achristensen07 authored and carlosgcampos committed Aug 24, 2018
1 parent 465e376 commit 87ff37e
Show file tree
Hide file tree
Showing 15 changed files with 192 additions and 136 deletions.
79 changes: 79 additions & 0 deletions Tools/ChangeLog
View file
@@ -1,3 +1,82 @@
2018-08-21 Alex Christensen <achristensen@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 <achristensen@webkit.org>

Replace WKPageLoaderClient with WKPageNavigationClient in many API tests
Expand Down
10 changes: 5 additions & 5 deletions Tools/TestWebKitAPI/Tests/WebKit/AboutBlankLoad.cpp
View file
Expand Up @@ -34,9 +34,9 @@ namespace TestWebKitAPI {

static bool done;

static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
{
WKRetainPtr<WKStringRef> mimeType = adoptWK(WKFrameCopyMIMEType(frame));
WKRetainPtr<WKStringRef> mimeType = adoptWK(WKFrameCopyMIMEType(WKPageGetMainFrame(page)));
EXPECT_WK_STREQ("text/html", mimeType);
done = true;
}
Expand All @@ -46,13 +46,13 @@ TEST(WebKit, AboutBlankLoad)
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());

Expand Down
8 changes: 4 additions & 4 deletions Tools/TestWebKitAPI/Tests/WebKit/EphemeralSessionPushStateNoHistoryCallback.cpp
View file
Expand Up @@ -44,7 +44,7 @@ static void didNavigateWithNavigationData(WKContextRef context, WKPageRef page,
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;
}
Expand All @@ -69,13 +69,13 @@ TEST(WebKit, EphemeralSessionPushStateNoHistoryCallback)

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);
Expand Down
9 changes: 5 additions & 4 deletions Tools/TestWebKitAPI/Tests/WebKit/FailedLoad.cpp
View file
Expand Up @@ -38,8 +38,9 @@ namespace TestWebKitAPI {

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 = WKFrameCopyProvisionalURL(frame);
Expand All @@ -53,13 +54,13 @@ TEST(WebKit, FailedLoad)
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());
Expand Down
22 changes: 11 additions & 11 deletions Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp
View file
Expand Up @@ -36,21 +36,21 @@ namespace TestWebKitAPI {

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;
Expand All @@ -61,15 +61,15 @@ TEST(WebKit, FrameMIMETypeHTML)
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());
Expand Down
22 changes: 11 additions & 11 deletions Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp
View file
Expand Up @@ -35,21 +35,21 @@ namespace TestWebKitAPI {

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;
Expand All @@ -60,15 +60,15 @@ TEST(WebKit, FrameMIMETypePNG)
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());
Expand Down
12 changes: 6 additions & 6 deletions Tools/TestWebKitAPI/Tests/WebKit/LayoutMilestonesWithAllContentInFrame.cpp
View file
Expand Up @@ -37,11 +37,11 @@ namespace TestWebKitAPI {

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;
}

Expand All @@ -50,16 +50,16 @@ TEST(WebKit, LayoutMilestonesWithAllContentInFrame)
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);
Expand Down
14 changes: 7 additions & 7 deletions Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp
View file
Expand Up @@ -46,15 +46,15 @@ static void didForceRepaint(WKErrorRef error, void*)
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;
Expand All @@ -64,14 +64,14 @@ static void didLayout(WKPageRef, WKLayoutMilestones type, WKTypeRef, const void

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)
Expand Down

0 comments on commit 87ff37e

Please sign in to comment.