Changeset 215801 in webkit

Timestamp:

Apr 26, 2017 8:55:34 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Move mediaCaptureEnabled from WKWebViewConfiguration to WKPreferences
​https://bugs.webkit.org/show_bug.cgi?id=171294

Patch by Andrew Gold <​agold@apple.com> on 2017-04-26
Reviewed by Eric Carlson.

Since we now want the ability to toggle this setting dynamically, I have
moved it from WKWebViewConfiguration to WKPreferences.

• UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences _mediaStreamEnabled]):
(-[WKPreferences _setMediaStreamEnabled:]):

• UIProcess/API/Cocoa/WKPreferencesPrivate.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]): No longer set mediaStream enabled from
the configuration.

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _mediaStreamEnabled]): Deleted.
(-[WKWebViewConfiguration _setMediaStreamEnabled:]): Deleted.

• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreferences.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-04-26  Andrew Gold  <agold@apple.com>
+
+        Move mediaCaptureEnabled from WKWebViewConfiguration to WKPreferences
+        https://bugs.webkit.org/show_bug.cgi?id=171294
+
+        Reviewed by Eric Carlson.
+
+        Since we now want the ability to toggle this setting dynamically, I have
+        moved it from WKWebViewConfiguration to WKPreferences.
+
+        * UIProcess/API/Cocoa/WKPreferences.mm:
+        (-[WKPreferences _mediaStreamEnabled]):
+        (-[WKPreferences _setMediaStreamEnabled:]):
+
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]): No longer set mediaStream enabled from
+        the configuration.
+
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration copyWithZone:]):
+        (-[WKWebViewConfiguration _mediaStreamEnabled]): Deleted.
+        (-[WKWebViewConfiguration _setMediaStreamEnabled:]): Deleted.
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+
 2017-04-25  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -548 +548 @@
 }
 
+- (BOOL)_mediaStreamEnabled
+{
+    return _preferences->mediaStreamEnabled();
+}
+
+- (void)_setMediaStreamEnabled:(BOOL)enabled
+{
+    _preferences->setMediaStreamEnabled(enabled);
+}
+
 - (BOOL)_mockCaptureDevicesEnabled
 {

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

@@ -99 +99 @@
 @property (nonatomic, setter=_setLoadsImagesAutomatically:) BOOL _loadsImagesAutomatically WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
+@property (nonatomic, setter=_setMediaStreamEnabled:) BOOL _mediaStreamEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 @property (nonatomic, setter=_setMockCaptureDevicesEnabled:) BOOL _mockCaptureDevicesEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 @property (nonatomic, setter=_setMediaCaptureRequiresSecureConnection:) BOOL _mediaCaptureRequiresSecureConnection WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -448 +448 @@
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::httpEquivEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsMetaRefresh]));
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
-#if ENABLE(MEDIA_STREAM)
-    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mediaStreamEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mediaStreamEnabled]));
-#endif
     pageConfiguration->setInitialCapitalizationEnabled([_configuration _initialCapitalizationEnabled]);
     pageConfiguration->setWaitsForPaintAfterViewDidMoveToWindow([_configuration _waitsForPaintAfterViewDidMoveToWindow]);

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -130 +130 @@
     BOOL _waitsForPaintAfterViewDidMoveToWindow;
     BOOL _controlledByAutomation;
-#if ENABLE(MEDIA_STREAM)
-    BOOL _mediaStreamEnabled;
-#endif
 
 #if ENABLE(APPLE_PAY)
@@ -302 +299 @@
     configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
     configuration->_controlledByAutomation = self->_controlledByAutomation;
-#if ENABLE(MEDIA_STREAM)
-    configuration->_mediaStreamEnabled = self->_mediaStreamEnabled;
-#endif
 
 #if PLATFORM(IOS)
@@ -732 +726 @@
 }
 
-- (BOOL)_mediaStreamEnabled
-{
-#if ENABLE(MEDIA_STREAM)
-    return _mediaStreamEnabled;
-#else
-    return NO;
-#endif
-}
-
-- (void)_setMediaStreamEnabled:(BOOL)enabled
-{
-#if ENABLE(MEDIA_STREAM)
-    _mediaStreamEnabled = enabled;
-#endif
-}
-
 #if PLATFORM(MAC)
 - (BOOL)_showsURLsInToolTips

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

@@ -59 +59 @@
 @property (nonatomic, setter=_setWaitsForPaintAfterViewDidMoveToWindow:) BOOL _waitsForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 @property (nonatomic, setter=_setControlledByAutomation:, getter=_isControlledByAutomation) BOOL _controlledByAutomation WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setMediaStreamEnabled:) BOOL _mediaStreamEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 #if TARGET_OS_IPHONE