Attachment 347688 Details for Bug 188813 – Patch

[patch] Patch

bug-188813-20180821140224.patch (text/plain), 5.44 KB, created by Alex Christensen on 2018-08-21 14:02:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-21 14:02:25 PDT

Size: 5.44 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235134)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-08-21  Alex Christensen  <achristensen@webkit.org>
>+
>+        Transition more API tests from WKPageLoaderClient to WKPageNavigationClient
>+        https://bugs.webkit.org/show_bug.cgi?id=188813
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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  Andy VanWagoner  <andy@vanwagoner.family>
> 
>         Unreviewed, add myself to committers list.
>Index: Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp	(revision 235132)
>+++ Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp	(working copy)
>@@ -38,7 +38,7 @@ static bool didFirstVisuallyNonEmptyLayo
> 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 didLayout(WKPageRef, WKLayou
> 
> 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
>Index: Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp	(revision 235132)
>+++ Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp	(working copy)
>@@ -45,13 +45,13 @@ static void didForceRepaint(WKErrorRef e
>     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 didLayout(WKPageRef, WKLayou
> 
> 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)
>Index: Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp	(revision 235132)
>+++ Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp	(working copy)
>@@ -38,7 +38,7 @@ static bool didFirstVisuallyNonEmptyLayo
> 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 didLayout(WKPageRef, WKLayou
> 
> 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

Flags:

aestes: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188813: 347688