Title: [235618] trunk/Source/WebKit
- Revision
- 235618
- Author
- commit-qu...@webkit.org
- Date
- 2018-09-04 10:28:28 -0700 (Tue, 04 Sep 2018)
Log Message
Bug 189190 - REGRESSION(r235398) ASSERTION failure !m_client.didFinishDocumentLoadForFrame
https://bugs.webkit.org/show_bug.cgi?id=189190
Patch by Frederic Wang <fw...@igalia.com> on 2018-09-04
Reviewed by Alex Christensen.
Assertions to prevent use of the deprecated WKPageSetPageLoaderClient class are hit when
running system Safari with the current macOS/iOS releases, making impossible to launch it.
This patch conditionally skips these assertions so that they are only verified for
macOS > 10.14 or other platforms.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient): Only assert on future OS releases.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (235617 => 235618)
--- trunk/Source/WebKit/ChangeLog 2018-09-04 17:11:03 UTC (rev 235617)
+++ trunk/Source/WebKit/ChangeLog 2018-09-04 17:28:28 UTC (rev 235618)
@@ -1,3 +1,18 @@
+2018-09-04 Frederic Wang <fw...@igalia.com>
+
+ Bug 189190 - REGRESSION(r235398) ASSERTION failure !m_client.didFinishDocumentLoadForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=189190
+
+ Reviewed by Alex Christensen.
+
+ Assertions to prevent use of the deprecated WKPageSetPageLoaderClient class are hit when
+ running system Safari with the current macOS/iOS releases, making impossible to launch it.
+ This patch conditionally skips these assertions so that they are only verified for
+ macOS > 10.14 or other platforms.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient): Only assert on future OS releases.
+
2018-09-04 Alex Christensen <achristen...@webkit.org>
Clean up WebGL policy getting code path
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp (235617 => 235618)
--- trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-09-04 17:11:03 UTC (rev 235617)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2018-09-04 17:28:28 UTC (rev 235618)
@@ -1043,6 +1043,7 @@
{
initialize(client);
+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101400
// WKPageSetPageLoaderClient is deprecated. Use WKPageSetPageNavigationClient instead.
RELEASE_ASSERT(!m_client.didFinishDocumentLoadForFrame);
RELEASE_ASSERT(!m_client.didSameDocumentNavigationForFrame);
@@ -1075,6 +1076,7 @@
RELEASE_ASSERT(!m_client.navigationGestureDidBegin);
RELEASE_ASSERT(!m_client.navigationGestureWillEnd);
RELEASE_ASSERT(!m_client.navigationGestureDidEnd);
+#endif
}
private:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
