Diff
Modified: trunk/Source/WebCore/ChangeLog (240873 => 240874)
--- trunk/Source/WebCore/ChangeLog 2019-02-01 21:46:06 UTC (rev 240873)
+++ trunk/Source/WebCore/ChangeLog 2019-02-01 21:48:53 UTC (rev 240874)
@@ -1,3 +1,12 @@
+2019-02-01 Jer Noble <jer.no...@apple.com>
+
+ Make the WebKit default for media source based on the WebCore default.
+ https://bugs.webkit.org/show_bug.cgi?id=194172
+
+ Reviewed by Eric Carlson.
+
+ * page/SettingsBase.h:
+
2019-02-01 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Memory timeline starts from zero when both CPU and Memory timeline are enabled
Modified: trunk/Source/WebCore/page/SettingsBase.h (240873 => 240874)
--- trunk/Source/WebCore/page/SettingsBase.h 2019-02-01 21:46:06 UTC (rev 240873)
+++ trunk/Source/WebCore/page/SettingsBase.h 2019-02-01 21:48:53 UTC (rev 240874)
@@ -117,7 +117,7 @@
WEBCORE_EXPORT static bool defaultDownloadableBinaryFontsEnabled();
#if ENABLE(MEDIA_SOURCE)
- static bool platformDefaultMediaSourceEnabled();
+ WEBCORE_EXPORT static bool platformDefaultMediaSourceEnabled();
#endif
static const unsigned defaultMaximumHTMLParserDOMTreeDepth = 512;
Modified: trunk/Source/WebKit/ChangeLog (240873 => 240874)
--- trunk/Source/WebKit/ChangeLog 2019-02-01 21:46:06 UTC (rev 240873)
+++ trunk/Source/WebKit/ChangeLog 2019-02-01 21:48:53 UTC (rev 240874)
@@ -1,3 +1,16 @@
+2019-02-01 Jer Noble <jer.no...@apple.com>
+
+ Make the WebKit default for media source based on the WebCore default.
+ https://bugs.webkit.org/show_bug.cgi?id=194172
+
+ Reviewed by Eric Carlson.
+
+ * Shared/WebPreferences.yaml:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _setMediaSourceEnabled:]):
+ (-[WKPreferences _mediaSourceEnabled]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
2019-02-01 Simon Fraser <simon.fra...@apple.com>
Force settings.acceleratedCompositingEnabled() to true for WebKit
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (240873 => 240874)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-02-01 21:46:06 UTC (rev 240873)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-02-01 21:48:53 UTC (rev 240874)
@@ -574,7 +574,7 @@
MediaSourceEnabled:
type: bool
- defaultValue: true
+ defaultValue: WebCore::Settings::platformDefaultMediaSourceEnabled()
condition: ENABLE(MEDIA_SOURCE)
ViewGestureDebuggingEnabled:
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (240873 => 240874)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2019-02-01 21:46:06 UTC (rev 240873)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2019-02-01 21:48:53 UTC (rev 240874)
@@ -849,6 +849,16 @@
return _preferences->itpDebugModeEnabled();
}
+- (void)_setMediaSourceEnabled:(BOOL)enabled
+{
+ _preferences->setMediaSourceEnabled(enabled);
+}
+
+- (BOOL)_mediaSourceEnabled
+{
+ return _preferences->mediaSourceEnabled();
+}
+
#if PLATFORM(MAC)
- (void)_setJavaEnabledForLocalFiles:(BOOL)enabled
{
@@ -1053,16 +1063,6 @@
return _preferences->subpixelCSSOMElementMetricsEnabled();
}
-- (void)_setMediaSourceEnabled:(BOOL)enabled
-{
- _preferences->setMediaSourceEnabled(enabled);
-}
-
-- (BOOL)_mediaSourceEnabled
-{
- return _preferences->mediaSourceEnabled();
-}
-
- (void)_setViewGestureDebuggingEnabled:(BOOL)enabled
{
_preferences->setViewGestureDebuggingEnabled(enabled);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (240873 => 240874)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2019-02-01 21:46:06 UTC (rev 240873)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2019-02-01 21:48:53 UTC (rev 240874)
@@ -153,6 +153,7 @@
@property (nonatomic, setter=_setDeviceOrientationEventEnabled:) BOOL _deviceOrientationEventEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setNeedsSiteSpecificQuirks:) BOOL _needsSiteSpecificQuirks WK_API_AVAILABLE(macosx(10.13.4), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setItpDebugModeEnabled:) BOOL _itpDebugModeEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setMediaSourceEnabled:) BOOL _mediaSourceEnabled WK_API_AVAILABLE(macosx(10.13.4), ios(WK_IOS_TBA));
#if !TARGET_OS_IPHONE
@property (nonatomic, setter=_setWebGLEnabled:) BOOL _webGLEnabled WK_API_AVAILABLE(macosx(10.13.4));
@@ -176,7 +177,6 @@
@property (nonatomic, setter=_setCookieEnabled:) BOOL _cookieEnabled WK_API_AVAILABLE(macosx(10.13.4));
@property (nonatomic, setter=_setPlugInSnapshottingEnabled:) BOOL _plugInSnapshottingEnabled WK_API_AVAILABLE(macosx(10.13.4));
@property (nonatomic, setter=_setSubpixelCSSOMElementMetricsEnabled:) BOOL _subpixelCSSOMElementMetricsEnabled WK_API_AVAILABLE(macosx(10.13.4));
-@property (nonatomic, setter=_setMediaSourceEnabled:) BOOL _mediaSourceEnabled WK_API_AVAILABLE(macosx(10.13.4));
@property (nonatomic, setter=_setViewGestureDebuggingEnabled:) BOOL _viewGestureDebuggingEnabled WK_API_AVAILABLE(macosx(10.13.4));
@property (nonatomic, setter=_setStandardFontFamily:) NSString *_standardFontFamily WK_API_AVAILABLE(macosx(10.13.4));
@property (nonatomic, setter=_setNotificationsEnabled:) BOOL _notificationsEnabled WK_API_AVAILABLE(macosx(10.13.4));