Title: [235305] releases/WebKitGTK/webkit-2.22
- Revision
- 235305
- Author
- carlo...@webkit.org
- Date
- 2018-08-24 01:10:13 -0700 (Fri, 24 Aug 2018)
Log Message
Merge r235148 - Transition ResizeReversePaginatedWebView API test from WKPageLoaderClient to WKPageNavigationClient
https://bugs.webkit.org/show_bug.cgi?id=188821
Reviewed by Simon Fraser.
Source/WebKit:
Add some more values to WKPageRenderingProgressEvents which were already supported by _WKRenderingProgressEvents and WKLayoutMilestones.
* UIProcess/API/C/WKPageRenderingProgressEvents.h:
* UIProcess/API/C/WKPageRenderingProgressEventsInternal.h:
(pageRenderingProgressEvents):
Tools:
* TestWebKitAPI/Tests/WebKit/ResizeReversePaginatedWebView.cpp:
(TestWebKitAPI::didLayout):
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (235304 => 235305)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-24 08:10:07 UTC (rev 235304)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-24 08:10:13 UTC (rev 235305)
@@ -1,5 +1,18 @@
2018-08-21 Alex Christensen <achristen...@webkit.org>
+ Transition ResizeReversePaginatedWebView API test from WKPageLoaderClient to WKPageNavigationClient
+ https://bugs.webkit.org/show_bug.cgi?id=188821
+
+ Reviewed by Simon Fraser.
+
+ Add some more values to WKPageRenderingProgressEvents which were already supported by _WKRenderingProgressEvents and WKLayoutMilestones.
+
+ * UIProcess/API/C/WKPageRenderingProgressEvents.h:
+ * UIProcess/API/C/WKPageRenderingProgressEventsInternal.h:
+ (pageRenderingProgressEvents):
+
+2018-08-21 Alex Christensen <achristen...@webkit.org>
+
Increment NetworkCache::Storage::lastStableVersion after r233742
https://bugs.webkit.org/show_bug.cgi?id=188798
<rdar://43561761>
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPageRenderingProgressEvents.h (235304 => 235305)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPageRenderingProgressEvents.h 2018-08-24 08:10:07 UTC (rev 235304)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPageRenderingProgressEvents.h 2018-08-24 08:10:13 UTC (rev 235305)
@@ -36,7 +36,9 @@
WKPageRenderingProgressEventFirstLayout = 1 << 0,
WKPageRenderingProgressEventFirstVisuallyNonEmptyLayout = 1 << 1,
WKPageRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
- WKPageRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold = 1 << 3
+ WKPageRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold = 1 << 3,
+ WKPageRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering = 1 << 4,
+ WKPageRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering = 1 << 5,
};
typedef uint32_t WKPageRenderingProgressEvents;
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPageRenderingProgressEventsInternal.h (235304 => 235305)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPageRenderingProgressEventsInternal.h 2018-08-24 08:10:07 UTC (rev 235304)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/C/WKPageRenderingProgressEventsInternal.h 2018-08-24 08:10:13 UTC (rev 235305)
@@ -43,5 +43,11 @@
if (milestones & WebCore::ReachedSessionRestorationRenderTreeSizeThreshold)
events |= WKPageRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold;
+ if (milestones & WebCore::DidFirstLayoutAfterSuppressedIncrementalRendering)
+ events |= WKPageRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering;
+
+ if (milestones & WebCore::DidFirstPaintAfterSuppressedIncrementalRendering)
+ events |= WKPageRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering;
+
return events;
}
Modified: releases/WebKitGTK/webkit-2.22/Tools/ChangeLog (235304 => 235305)
--- releases/WebKitGTK/webkit-2.22/Tools/ChangeLog 2018-08-24 08:10:07 UTC (rev 235304)
+++ releases/WebKitGTK/webkit-2.22/Tools/ChangeLog 2018-08-24 08:10:13 UTC (rev 235305)
@@ -1,5 +1,16 @@
2018-08-21 Alex Christensen <achristen...@webkit.org>
+ Transition ResizeReversePaginatedWebView API test from WKPageLoaderClient to WKPageNavigationClient
+ https://bugs.webkit.org/show_bug.cgi?id=188821
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Tests/WebKit/ResizeReversePaginatedWebView.cpp:
+ (TestWebKitAPI::didLayout):
+ (TestWebKitAPI::TEST):
+
+2018-08-21 Alex Christensen <achristen...@webkit.org>
+
Transition more API tests from WKPageLoaderClient to WKPageNavigationClient
https://bugs.webkit.org/show_bug.cgi?id=188813
Modified: releases/WebKitGTK/webkit-2.22/Tools/TestWebKitAPI/Tests/WebKit/ResizeReversePaginatedWebView.cpp (235304 => 235305)
--- releases/WebKitGTK/webkit-2.22/Tools/TestWebKitAPI/Tests/WebKit/ResizeReversePaginatedWebView.cpp 2018-08-24 08:10:07 UTC (rev 235304)
+++ releases/WebKitGTK/webkit-2.22/Tools/TestWebKitAPI/Tests/WebKit/ResizeReversePaginatedWebView.cpp 2018-08-24 08:10:13 UTC (rev 235305)
@@ -44,7 +44,7 @@
static const unsigned pageGap = 100;
static const unsigned expectedPageCount = 20;
-static void didLayout(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef, const void* clientInfo)
+static void didLayout(WKPageRef page, WKPageRenderingProgressEvents milestones, WKTypeRef, const void* clientInfo)
{
if (milestones & kWKDidFirstLayoutAfterSuppressedIncrementalRendering) {
PlatformWebView* webView = (PlatformWebView*)clientInfo;
@@ -64,14 +64,14 @@
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 = didLayout;
- WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+ WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
WKPageListenForLayoutMilestones(webView.page(), kWKDidFirstLayoutAfterSuppressedIncrementalRendering);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
