Title: [236833] trunk/Tools
- Revision
- 236833
- Author
- [email protected]
- Date
- 2018-10-04 09:55:47 -0700 (Thu, 04 Oct 2018)
Log Message
Convert tests to use navigation client
https://bugs.webkit.org/show_bug.cgi?id=190153
Reviewed by Alex Christensen.
Convert these tests from PagePolicyClient and PageLoaderClient to PageNavigationClient.
* TestWebKitAPI/Tests/WebKit/DownloadDecideDestinationCrash.cpp:
(TestWebKitAPI::decidePolicyForNavigationAction):
(TestWebKitAPI::setPagePolicyClient):
* TestWebKitAPI/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp:
(TestWebKitAPI::didCommitNavigationCallback):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didCommitLoadForFrame): Deleted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (236832 => 236833)
--- trunk/Tools/ChangeLog 2018-10-04 16:46:49 UTC (rev 236832)
+++ trunk/Tools/ChangeLog 2018-10-04 16:55:47 UTC (rev 236833)
@@ -1,3 +1,20 @@
+2018-10-04 Michael Catanzaro <[email protected]>
+
+ Convert tests to use navigation client
+ https://bugs.webkit.org/show_bug.cgi?id=190153
+
+ Reviewed by Alex Christensen.
+
+ Convert these tests from PagePolicyClient and PageLoaderClient to PageNavigationClient.
+
+ * TestWebKitAPI/Tests/WebKit/DownloadDecideDestinationCrash.cpp:
+ (TestWebKitAPI::decidePolicyForNavigationAction):
+ (TestWebKitAPI::setPagePolicyClient):
+ * TestWebKitAPI/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp:
+ (TestWebKitAPI::didCommitNavigationCallback):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::didCommitLoadForFrame): Deleted.
+
2018-10-03 Dan Bernstein <[email protected]>
[Cocoa] Let clients specify an NSFileWrapper subclassed to be used for _WKAttachment
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DownloadDecideDestinationCrash.cpp (236832 => 236833)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DownloadDecideDestinationCrash.cpp 2018-10-04 16:46:49 UTC (rev 236832)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DownloadDecideDestinationCrash.cpp 2018-10-04 16:55:47 UTC (rev 236833)
@@ -35,7 +35,7 @@
static bool didDecideDestination;
-static void decidePolicyForNavigationAction(WKPageRef, WKFrameRef, WKFrameNavigationType, WKEventModifiers, WKEventMouseButton, WKFrameRef, WKURLRequestRef, WKFramePolicyListenerRef listener, WKTypeRef, const void*)
+static void decidePolicyForNavigationAction(WKPageRef, WKNavigationActionRef, WKFramePolicyListenerRef listener, WKTypeRef, const void*)
{
WKFramePolicyListenerDownload(listener);
}
@@ -60,13 +60,13 @@
static void setPagePolicyClient(WKPageRef page)
{
- WKPagePolicyClientV1 policyClient;
- memset(&policyClient, 0, sizeof(policyClient));
+ WKPageNavigationClientV0 navigationClient;
+ memset(&navigationClient, 0, sizeof(navigationClient));
- policyClient.base.version = 1;
- policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
+ navigationClient.base.version = 0;
+ navigationClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
- WKPageSetPagePolicyClient(page, &policyClient.base);
+ WKPageSetPageNavigationClient(page, &navigationClient.base);
}
TEST(WebKit, DownloadDecideDestinationCrash)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp (236832 => 236833)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp 2018-10-04 16:46:49 UTC (rev 236832)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp 2018-10-04 16:55:47 UTC (rev 236833)
@@ -38,10 +38,9 @@
static bool committedLoad;
-static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void*)
+static void didCommitNavigationCallback(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void*)
{
- if (!WKFrameIsMainFrame(frame))
- return;
+ WKFrameRef frame = WKPageGetMainFrame(page);
// The provisional URL should be null.
EXPECT_NULL(WKFrameCopyProvisionalURL(frame));
@@ -72,12 +71,12 @@
PlatformWebView webView(context.get());
- WKPageLoaderClientV0 loaderClient;
- memset(&loaderClient, 0, sizeof(loaderClient));
+ WKPageNavigationClientV0 navigationClient;
+ memset(&navigationClient, 0, sizeof(navigationClient));
- loaderClient.base.version = 0;
- loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ navigationClient.base.version = 0;
+ navigationClient.didCommitNavigation = didCommitNavigationCallback;
+ WKPageSetPageNavigationClient(webView.page(), &navigationClient.base);
WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
WKPageLoadURL(webView.page(), url.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
