Attachment 348822 Details for Bug 189190 – patch

[patch] patch

patch (text/plain), 2.13 KB, created by Alex Christensen on 2018-09-04 09:50:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-09-04 09:50:23 PDT

Size: 2.13 KB

patch

obsolete

>Subversion Revision: 235590
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a4397d2fd644ffd11e207a299e4392c493217a05..adc3e00c7a4358cae2d4190926886435d0813963 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-09-03  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-01  Darin Adler  <darin@apple.com>
> 
>         [CFNetwork] Update CFNetwork SPI use to use CFNetworkSPI.h more consistently
>diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
>index 515cacb4224fc355f2c8abf2d53ff31f9bb9f970..94c131a124950af169a7ef214a63af242f5efc6a 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
>@@ -1043,6 +1043,7 @@ void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClientBase*
>         {
>             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 @@ void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClientBase*
>             RELEASE_ASSERT(!m_client.navigationGestureDidBegin);
>             RELEASE_ASSERT(!m_client.navigationGestureWillEnd);
>             RELEASE_ASSERT(!m_client.navigationGestureDidEnd);
>+#endif
>         }
> 
>     private:

Actions: View | Formatted Diff | Diff

Attachments on bug 189190: 348636 | 348762 | 348822