Attachment 348637 Details for Bug 189188 – Patch

[patch] Patch

bug-189188-20180831160038.patch (text/plain), 5.34 KB, created by Frédéric Wang (:fredw) on 2018-08-31 07:00:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang (:fredw)

Created: 2018-08-31 07:00:39 PDT

Size: 5.34 KB

patch

obsolete

>Subversion Revision: 235540
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f82d9f4ee2f863a2c363f6ea5b9317b85a465f73..d0f2ac3b0db71c3b7bfd23d64b2514a68fa5916e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-31  Frederic Wang  <fwang@igalia.com>
>+
>+        REGRESSION(r235484) _WKPreferencesGetWebRTCLegacyAPIEnabled symbol not found when running Safari with external SDK build
>+        https://bugs.webkit.org/show_bug.cgi?id=189188
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WebRTCLegacyAPI preference has been removed in r235484. However, the API is still used by
>+        Safari when running external SDK builds. Hence we restore some dummy getter/setter for now.
>+
>+        * UIProcess/API/C/WKPreferences.cpp:
>+        (WKPreferencesSetWebRTCLegacyAPIEnabled): no-op.
>+        (WKPreferencesGetWebRTCLegacyAPIEnabled): Always return false.
>+        * UIProcess/API/C/WKPreferencesRef.h:
>+        * UIProcess/API/Cocoa/WKPreferences.mm:
>+        (-[WKPreferences _webRTCLegacyAPIEnabled]): Always return false.
>+        (-[WKPreferences _setWebRTCLegacyAPIEnabled:]): no-op.
>+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
>+
> 2018-08-31  Frederic Wang  <fwang@igalia.com>
> 
>         Bug 182053 - [CSSOM View] Implement standard behavior for scrollingElement
>diff --git a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>index 2e1ce2206bb50aa58b698be768f3d624d0ef18ad..dd271b59df760890445fed1d63338f1d9f608871 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKPreferences.cpp
>@@ -1428,6 +1428,15 @@ bool WKPreferencesGetPeerConnectionEnabled(WKPreferencesRef preferencesRef)
>     return toImpl(preferencesRef)->peerConnectionEnabled();
> }
> 
>+void WKPreferencesSetWebRTCLegacyAPIEnabled(WKPreferencesRef, bool)
>+{
>+}
>+
>+bool WKPreferencesGetWebRTCLegacyAPIEnabled(WKPreferencesRef)
>+{
>+    return false;
>+}
>+
> void WKPreferencesSetWebRTCMDNSICECandidatesEnabled(WKPreferencesRef preferencesRef, bool enabled)
> {
>     toImpl(preferencesRef)->setMDNSICECandidatesEnabled(enabled);
>diff --git a/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h b/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h
>index 1c2fbb4aea2f69d5bf16f445d382f300570baf63..5a088db3c9101b728e847078b23fe77eb89d06c4 100644
>--- a/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h
>+++ b/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h
>@@ -268,6 +268,11 @@ WK_EXPORT bool WKPreferencesGetMediaDevicesEnabled(WKPreferencesRef preferencesR
> WK_EXPORT void WKPreferencesSetPeerConnectionEnabled(WKPreferencesRef preferencesRef, bool enabled);
> WK_EXPORT bool WKPreferencesGetPeerConnectionEnabled(WKPreferencesRef preferencesRef);
> 
>+// This is for backward compatibility with external SDK builds (https://webkit.org/b/189188).
>+// FIXME: Remove these API functions.
>+WK_EXPORT void WKPreferencesSetWebRTCLegacyAPIEnabled(WKPreferencesRef preferencesRef, bool enabled);
>+WK_EXPORT bool WKPreferencesGetWebRTCLegacyAPIEnabled(WKPreferencesRef preferencesRef);
>+
> // Defaults to false
> WK_EXPORT void WKPreferencesSetWebRTCMDNSICECandidatesEnabled(WKPreferencesRef preferencesRef, bool enabled);
> WK_EXPORT bool WKPreferencesGetWebRTCMDNSICECandidatesEnabled(WKPreferencesRef preferencesRef);
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
>index 139a89f4e98f9427f8ac45d60b2bcc5ec89009e2..3e827ec44b21e71a5b465f3e8a6509a270664550 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
>@@ -669,6 +669,15 @@ static _WKStorageBlockingPolicy toAPI(WebCore::SecurityOrigin::StorageBlockingPo
>     _preferences->setICECandidateFilteringEnabled(enabled);
> }
> 
>+- (BOOL)_webRTCLegacyAPIEnabled
>+{
>+    return NO;
>+}
>+
>+- (void)_setWebRTCLegacyAPIEnabled:(BOOL)enabled
>+{
>+}
>+
> - (void)_setJavaScriptCanAccessClipboard:(BOOL)javaScriptCanAccessClipboard
> {
>     _preferences->setJavaScriptCanAccessClipboard(javaScriptCanAccessClipboard);
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
>index f86fba215522f2fd4c8e5dd47ceca3570198ca58..3879e35ed325e857b0c5ab73cd7bdac419e6533c 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
>@@ -118,6 +118,7 @@ typedef NS_ENUM(NSInteger, _WKEditableLinkBehavior) {
> @property (nonatomic, setter=_setMediaCaptureRequiresSecureConnection:) BOOL _mediaCaptureRequiresSecureConnection WK_API_AVAILABLE(macosx(10.13), ios(11.0));
> @property (nonatomic, setter=_setEnumeratingAllNetworkInterfacesEnabled:) BOOL _enumeratingAllNetworkInterfacesEnabled WK_API_AVAILABLE(macosx(10.13), ios(11.0));
> @property (nonatomic, setter=_setICECandidateFilteringEnabled:) BOOL _iceCandidateFilteringEnabled WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
>+@property (nonatomic, setter=_setWebRTCLegacyAPIEnabled:) BOOL _webRTCLegacyAPIEnabled WK_API_AVAILABLE(macosx(10.13), ios(11.0));
> @property (nonatomic, setter=_setInactiveMediaCaptureSteamRepromptIntervalInMinutes:) double _inactiveMediaCaptureSteamRepromptIntervalInMinutes WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
> 
> @property (nonatomic, setter=_setJavaScriptCanAccessClipboard:) BOOL _javaScriptCanAccessClipboard WK_API_AVAILABLE(macosx(10.13), ios(11.0));

Actions: View | Formatted Diff | Diff

Attachments on bug 189188: 348624 | 348637