Changeset 235553 in webkit

Timestamp:

Aug 31, 2018 8:52:45 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r235484) _WKPreferencesGetWebRTCLegacyAPIEnabled symbol not found when running Safari with external SDK build
​https://bugs.webkit.org/show_bug.cgi?id=189188

Patch by Frederic Wang <​fwang@igalia.com> on 2018-08-31
Reviewed by Youenn Fablet.

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• UIProcess/API/C/WKPreferencesRef.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreferences.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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 Youenn Fablet.
+
+        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>
 

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

@@ -1429 +1429 @@
 }
 
+void WKPreferencesSetWebRTCLegacyAPIEnabled(WKPreferencesRef, bool)
+{
+}
+
+bool WKPreferencesGetWebRTCLegacyAPIEnabled(WKPreferencesRef)
+{
+    return false;
+}
+
 void WKPreferencesSetWebRTCMDNSICECandidatesEnabled(WKPreferencesRef preferencesRef, bool enabled)
 {

trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h

@@ -269 +269 @@
 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);

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm

@@ -670 +670 @@
 }
 
+- (BOOL)_webRTCLegacyAPIEnabled
+{
+    return NO;
+}
+
+- (void)_setWebRTCLegacyAPIEnabled:(BOOL)enabled
+{
+}
+
 - (void)_setJavaScriptCanAccessClipboard:(BOOL)javaScriptCanAccessClipboard
 {

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

@@ -119 +119 @@
 @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));