Title: [212163] trunk/Source/WebKit2
- Revision
- 212163
- Author
- commit-qu...@webkit.org
- Date
- 2017-02-10 15:55:14 -0800 (Fri, 10 Feb 2017)
Log Message
Add mediaStreamEnabled property to WKPreferences for Cocoa.
https://bugs.webkit.org/show_bug.cgi?id=168080
Patch by Andrew Gold <ag...@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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (212162 => 212163)
--- trunk/Source/WebKit2/ChangeLog 2017-02-10 23:53:31 UTC (rev 212162)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-10 23:55:14 UTC (rev 212163)
@@ -1,3 +1,19 @@
+2017-02-10 Andrew Gold <ag...@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.b...@softathome.com>
WebProcess: remove unused m_inDidClose
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (212162 => 212163)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-10 23:53:31 UTC (rev 212162)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-10 23:55:14 UTC (rev 212163)
@@ -433,6 +433,9 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldConvertPositionStyleOnCopyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _convertsPositionStyleOnCopy]));
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]);
pageConfiguration->setControlledByAutomation([_configuration _isControlledByAutomation]);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (212162 => 212163)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-02-10 23:53:31 UTC (rev 212162)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-02-10 23:55:14 UTC (rev 212163)
@@ -125,6 +125,9 @@
BOOL _initialCapitalizationEnabled;
BOOL _waitsForPaintAfterViewDidMoveToWindow;
BOOL _controlledByAutomation;
+#if ENABLE(MEDIA_STREAM)
+ BOOL _mediaStreamEnabled;
+#endif
#if ENABLE(APPLE_PAY)
BOOL _applePayEnabled;
@@ -293,6 +296,9 @@
configuration->_initialCapitalizationEnabled = self->_initialCapitalizationEnabled;
configuration->_waitsForPaintAfterViewDidMoveToWindow = self->_waitsForPaintAfterViewDidMoveToWindow;
configuration->_controlledByAutomation = self->_controlledByAutomation;
+#if ENABLE(MEDIA_STREAM)
+ configuration->_mediaStreamEnabled = self->_mediaStreamEnabled;
+#endif
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
@@ -686,6 +692,22 @@
_controlledByAutomation = controlledByAutomation;
}
+- (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
{
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (212162 => 212163)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2017-02-10 23:53:31 UTC (rev 212162)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2017-02-10 23:55:14 UTC (rev 212163)
@@ -58,6 +58,7 @@
@property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@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
@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
