Changeset 212163 in webkit

Timestamp:

Feb 10, 2017 3:55:14 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Add mediaStreamEnabled property to WKPreferences for Cocoa.
​https://bugs.webkit.org/show_bug.cgi?id=168080

Patch by Andrew Gold <​agold@apple.com> on 2017-02-10
Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]): Sets the pageConfiguration's mediaStreamEnabled preference value.

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration copyWithZone:]): Copies the mediaStreamEnabled property.
(-[WKWebViewConfiguration _mediaStreamEnabled]): Gets the mediaStreamEnabled property.
(-[WKWebViewConfiguration _setMediaStreamEnabled:]): Sets the mediaStreamEnabled property.

• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (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-02-10  Andrew Gold  <agold@apple.com>
+
+        Add mediaStreamEnabled property to WKPreferences for Cocoa.
+        https://bugs.webkit.org/show_bug.cgi?id=168080
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]): Sets the pageConfiguration's mediaStreamEnabled preference value.
+
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration copyWithZone:]): Copies the mediaStreamEnabled property.
+        (-[WKWebViewConfiguration _mediaStreamEnabled]): Gets the mediaStreamEnabled property.
+        (-[WKWebViewConfiguration _setMediaStreamEnabled:]): Sets the mediaStreamEnabled property.
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+
 2017-02-10  Olivier Blin  <olivier.blin@softathome.com>
 

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

@@ -434 +434 @@
     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

@@ -126 +126 @@
     BOOL _waitsForPaintAfterViewDidMoveToWindow;
     BOOL _controlledByAutomation;
+#if ENABLE(MEDIA_STREAM)
+    BOOL _mediaStreamEnabled;
+#endif
 
 #if ENABLE(APPLE_PAY)
@@ -294 +297 @@
     configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
     configuration->_controlledByAutomation = self->_controlledByAutomation;
+#if ENABLE(MEDIA_STREAM)
+    configuration->_mediaStreamEnabled = self->_mediaStreamEnabled;
+#endif
 
 #if PLATFORM(IOS)
@@ -687 +693 @@
 }
 
+- (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