Changeset 235618 in webkit

Timestamp:

Sep 4, 2018 10:28:28 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Bug 189190 - REGRESSION(r235398) ASSERTION failure !m_client.didFinishDocumentLoadForFrame
​https://bugs.webkit.org/show_bug.cgi?id=189190

Patch by Frederic Wang <​fwang@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.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-04  Frederic Wang  <fwang@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  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

@@ -1044 +1044 @@
             initialize(client);
             
+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101400
             // WKPageSetPageLoaderClient is deprecated. Use WKPageSetPageNavigationClient instead.
             RELEASE_ASSERT(!m_client.didFinishDocumentLoadForFrame);
@@ -1076 +1077 @@
             RELEASE_ASSERT(!m_client.navigationGestureWillEnd);
             RELEASE_ASSERT(!m_client.navigationGestureDidEnd);
+#endif
         }