[webkit-changes] [235138] trunk/Tools

Tue, 21 Aug 2018 14:13:04 -0700

Title: [235138] trunk/Tools
Revision
235138
Author
[email protected]
Date
2018-08-21 14:11:50 -0700 (Tue, 21 Aug 2018)

Log Message

Transition more API tests from WKPageLoaderClient to WKPageNavigationClient
https://bugs.webkit.org/show_bug.cgi?id=188813

Reviewed by Andy Estes.

* TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp:
(TestWebKitAPI::didLayout):
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::didLayout):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
(TestWebKitAPI::didLayout):
(TestWebKitAPI::setPageLoaderClient):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (235137 => 235138)


--- trunk/Tools/ChangeLog	2018-08-21 21:10:34 UTC (rev 235137)
+++ trunk/Tools/ChangeLog	2018-08-21 21:11:50 UTC (rev 235138)
@@ -1,3 +1,22 @@
+2018-08-21  Alex Christensen  <[email protected]>
+
+        Transition more API tests from WKPageLoaderClient to WKPageNavigationClient
+        https://bugs.webkit.org/show_bug.cgi?id=188813
+
+        Reviewed by Andy Estes.
+
+        * TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp:
+        (TestWebKitAPI::didLayout):
+        (TestWebKitAPI::setPageLoaderClient):
+        * TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::didLayout):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
+        (TestWebKitAPI::didLayout):
+        (TestWebKitAPI::setPageLoaderClient):
+
 2018-08-21  Wenson Hsieh  <[email protected]>
 
         [Attachment Support] Augment _WKAttachment SPI to handle NSFileWrappers in addition to NSData

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp (235137 => 235138)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp	2018-08-21 21:10:34 UTC (rev 235137)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp	2018-08-21 21:11:50 UTC (rev 235138)
@@ -38,7 +38,7 @@
 static bool didHitRelevantRepaintedObjectsAreaThresholdAchieved;
 static bool didUnlockAllLayoutMilestones;
 
-static void didLayout(WKPageRef, WKLayoutMilestones type, WKTypeRef, const void *)
+static void didLayout(WKPageRef, WKPageRenderingProgressEvents type, WKTypeRef, const void *)
 {
     switch (type) {
     case kWKDidFirstLayout:
@@ -60,13 +60,13 @@
 
 static void setPageLoaderClient(WKPageRef page)
 {
-    WKPageLoaderClientV3 loaderClient;
+    WKPageNavigationClientV3 loaderClient;
     memset(&loaderClient, 0, sizeof(loaderClient));
 
     loaderClient.base.version = 3;
-    loaderClient.didLayout = didLayout;
+    loaderClient.renderingProgressDidChange = didLayout;
 
-    WKPageSetPageLoaderClient(page, &loaderClient.base);
+    WKPageSetPageNavigationClient(page, &loaderClient.base);
 }
 
 // FIXME: This test has been broken since http://trac.webkit.org/changeset/115752 It's failing because

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp (235137 => 235138)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp	2018-08-21 21:10:34 UTC (rev 235137)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp	2018-08-21 21:11:50 UTC (rev 235138)
@@ -45,13 +45,13 @@
     test2Done = true;
 }
 
-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, 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 didLayout(WKPageRef, WKPageRenderingProgressEvents type, WKTypeRef, const void *)
 {
     if (type == kWKDidHitRelevantRepaintedObjectsAreaThreshold)
         didHitRelevantRepaintedObjectsAreaThresholdAchieved = true;
@@ -59,14 +59,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 = didLayout;
 
-    WKPageSetPageLoaderClient(page, &loaderClient.base);
+    WKPageSetPageNavigationClient(page, &loaderClient.base);
 }
 
 TEST(WebKit, NewFirstVisuallyNonEmptyLayoutFails)

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp (235137 => 235138)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp	2018-08-21 21:10:34 UTC (rev 235137)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp	2018-08-21 21:11:50 UTC (rev 235138)
@@ -38,7 +38,7 @@
 static bool didHitRelevantRepaintedObjectsAreaThresholdAchieved;
 static bool didUnlockAllLayoutMilestones;
 
-static void didLayout(WKPageRef, WKLayoutMilestones type, WKTypeRef, const void *)
+static void didLayout(WKPageRef, WKPageRenderingProgressEvents type, WKTypeRef, const void *)
 {
     switch (type) {
     case kWKDidFirstLayout:
@@ -60,13 +60,13 @@
 
 static void setPageLoaderClient(WKPageRef page)
 {
-    WKPageLoaderClientV3 loaderClient;
+    WKPageNavigationClientV3 loaderClient;
     memset(&loaderClient, 0, sizeof(loaderClient));
 
     loaderClient.base.version = 3;
-    loaderClient.didLayout = didLayout;
+    loaderClient.renderingProgressDidChange = didLayout;
 
-    WKPageSetPageLoaderClient(page, &loaderClient.base);
+    WKPageSetPageNavigationClient(page, &loaderClient.base);
 }
 
 // FIXME: This test has been broken since http://trac.webkit.org/changeset/115752 It's failing because

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to