Diff
Modified: trunk/Source/WebCore/ChangeLog (227441 => 227442)
--- trunk/Source/WebCore/ChangeLog 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebCore/ChangeLog 2018-01-23 21:42:51 UTC (rev 227442)
@@ -1,3 +1,16 @@
+2018-01-23 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r227437.
+ https://bugs.webkit.org/show_bug.cgi?id=182011
+
+ broke build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Remove unused QTKit preference"
+ https://bugs.webkit.org/show_bug.cgi?id=181968
+ https://trac.webkit.org/changeset/227437
+
2018-01-23 Antoine Quint <grao...@apple.com>
[Web Animations] Expose getKeyframes() and parsing of remaining keyframe properties
Modified: trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp (227441 => 227442)
--- trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebCore/page/DeprecatedGlobalSettings.cpp 2018-01-23 21:42:51 UTC (rev 227442)
@@ -46,6 +46,10 @@
bool DeprecatedGlobalSettings::gAVFoundationNSURLSessionEnabled = true;
#endif
+#if PLATFORM(COCOA)
+bool DeprecatedGlobalSettings::gQTKitEnabled = false;
+#endif
+
#if USE(GSTREAMER)
bool DeprecatedGlobalSettings::gGStreamerEnabled = true;
#endif
@@ -101,6 +105,17 @@
}
#endif
+#if PLATFORM(COCOA)
+void DeprecatedGlobalSettings::setQTKitEnabled(bool enabled)
+{
+ if (gQTKitEnabled == enabled)
+ return;
+
+ gQTKitEnabled = enabled;
+ HTMLMediaElement::resetMediaEngines();
+}
+#endif
+
#if USE(GSTREAMER)
void DeprecatedGlobalSettings::setGStreamerEnabled(bool enabled)
{
Modified: trunk/Source/WebCore/page/DeprecatedGlobalSettings.h (227441 => 227442)
--- trunk/Source/WebCore/page/DeprecatedGlobalSettings.h 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebCore/page/DeprecatedGlobalSettings.h 2018-01-23 21:42:51 UTC (rev 227442)
@@ -55,6 +55,13 @@
static bool isAVFoundationNSURLSessionEnabled() { return gAVFoundationNSURLSessionEnabled; }
#endif
+#if PLATFORM(COCOA)
+ WEBCORE_EXPORT static void setQTKitEnabled(bool flag);
+ static bool isQTKitEnabled() { return gQTKitEnabled; }
+#else
+ static bool isQTKitEnabled() { return false; }
+#endif
+
#if USE(GSTREAMER)
WEBCORE_EXPORT static void setGStreamerEnabled(bool flag);
static bool isGStreamerEnabled() { return gGStreamerEnabled; }
@@ -119,6 +126,10 @@
WEBCORE_EXPORT static bool gAVFoundationNSURLSessionEnabled;
#endif
+#if PLATFORM(COCOA)
+ WEBCORE_EXPORT static bool gQTKitEnabled;
+#endif
+
#if USE(GSTREAMER)
WEBCORE_EXPORT static bool gGStreamerEnabled;
#endif
Modified: trunk/Source/WebKit/ChangeLog (227441 => 227442)
--- trunk/Source/WebKit/ChangeLog 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKit/ChangeLog 2018-01-23 21:42:51 UTC (rev 227442)
@@ -1,3 +1,16 @@
+2018-01-23 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r227437.
+ https://bugs.webkit.org/show_bug.cgi?id=182011
+
+ broke build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Remove unused QTKit preference"
+ https://bugs.webkit.org/show_bug.cgi?id=181968
+ https://trac.webkit.org/changeset/227437
+
2018-01-23 Alex Christensen <achristen...@webkit.org>
Remove compile guard around beacon API
Modified: trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp (227441 => 227442)
--- trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp 2018-01-23 21:42:51 UTC (rev 227442)
@@ -51,12 +51,3 @@
void WKContextSetProcessModel(WKContextRef, WKProcessModel)
{
}
-
-void WKPreferencesSetQTKitEnabled(WKPreferencesRef, bool)
-{
-}
-
-bool WKPreferencesGetQTKitEnabled(WKPreferencesRef)
-{
- return false;
-}
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (227441 => 227442)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2018-01-23 21:42:51 UTC (rev 227442)
@@ -415,6 +415,13 @@
type: bool
defaultValue: DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED
+QTKitEnabled:
+ type: bool
+ defaultValue: WebCore::DeprecatedGlobalSettings::isQTKitEnabled()
+ getter: isQTKitEnabled
+ webcoreBinding: DeprecatedGlobalSettings
+ condition: PLATFORM(COCOA)
+
PageVisibilityBasedProcessSuppressionEnabled:
type: bool
defaultValue: true
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (227441 => 227442)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2018-01-23 21:42:51 UTC (rev 227442)
@@ -1203,6 +1203,16 @@
return toImpl(preferencesRef)->aggressiveTileRetentionEnabled();
}
+void WKPreferencesSetQTKitEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setQTKitEnabled(enabled);
+}
+
+bool WKPreferencesGetQTKitEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->isQTKitEnabled();
+}
+
void WKPreferencesSetLogsPageMessagesToSystemConsoleEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
toImpl(preferencesRef)->setLogsPageMessagesToSystemConsoleEnabled(enabled);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (227441 => 227442)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2018-01-23 21:42:51 UTC (rev 227442)
@@ -932,6 +932,16 @@
return _preferences->plugInSnapshottingEnabled();
}
+- (void)_setQTKitEnabled:(BOOL)enabled
+{
+ _preferences->setQTKitEnabled(enabled);
+}
+
+- (BOOL)_qtKitEnabled
+{
+ return _preferences->isQTKitEnabled();
+}
+
- (void)_setSubpixelCSSOMElementMetricsEnabled:(BOOL)enabled
{
_preferences->setSubpixelCSSOMElementMetricsEnabled(enabled);
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (227441 => 227442)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2018-01-23 21:42:51 UTC (rev 227442)
@@ -154,6 +154,7 @@
@property (nonatomic, setter=_setArtificialPluginInitializationDelayEnabled:) BOOL _artificialPluginInitializationDelayEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
@property (nonatomic, setter=_setCookieEnabled:) BOOL _cookieEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
@property (nonatomic, setter=_setPlugInSnapshottingEnabled:) BOOL _plugInSnapshottingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+@property (nonatomic, setter=_setQTKitEnabled:) BOOL _qtKitEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
@property (nonatomic, setter=_setSubpixelCSSOMElementMetricsEnabled:) BOOL _subpixelCSSOMElementMetricsEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
@property (nonatomic, setter=_setMediaSourceEnabled:) BOOL _mediaSourceEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
@property (nonatomic, setter=_setViewGestureDebuggingEnabled:) BOOL _viewGestureDebuggingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA));
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (227441 => 227442)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-01-23 21:42:51 UTC (rev 227442)
@@ -1,3 +1,16 @@
+2018-01-23 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r227437.
+ https://bugs.webkit.org/show_bug.cgi?id=182011
+
+ broke build (Requested by alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "Remove unused QTKit preference"
+ https://bugs.webkit.org/show_bug.cgi?id=181968
+ https://trac.webkit.org/changeset/227437
+
2018-01-23 Alex Christensen <achristen...@webkit.org>
Remove unused QTKit preference
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (227441 => 227442)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2018-01-23 21:42:51 UTC (rev 227442)
@@ -157,6 +157,7 @@
#define WebKitDiagnosticLoggingEnabledKey @"WebKitDiagnosticLoggingEnabled"
#define WebKitStorageBlockingPolicyKey @"WebKitStorageBlockingPolicy"
#define WebKitPlugInSnapshottingEnabledPreferenceKey @"WebKitPlugInSnapshottingEnabled"
+#define WebKitQTKitEnabledPreferenceKey @"WebKitQTKitEnabled"
#define WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey @"WebKitHiddenPageDOMTimerThrottlingEnabled"
#define WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey @"WebKitHiddenPageCSSAnimationSuspensionEnabled"
#define WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey @"WebKitLowPowerVideoAudioBufferSizeEnabled"
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (227441 => 227442)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2018-01-23 21:42:51 UTC (rev 227442)
@@ -597,6 +597,7 @@
#endif
[NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
[NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheDefaultOriginQuota,
+ [NSNumber numberWithBool:DeprecatedGlobalSettings::isQTKitEnabled()], WebKitQTKitEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey,
@@ -2264,6 +2265,16 @@
return [self _boolValueForKey:WebKitAVFoundationNSURLSessionEnabledKey];
}
+- (void)setQTKitEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitQTKitEnabledPreferenceKey];
+}
+
+- (BOOL)isQTKitEnabled
+{
+ return [self _boolValueForKey:WebKitQTKitEnabledPreferenceKey];
+}
+
- (void)setVideoPluginProxyEnabled:(BOOL)flag
{
// No-op, left for SPI compatibility.
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (227441 => 227442)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2018-01-23 21:42:51 UTC (rev 227442)
@@ -423,6 +423,9 @@
- (void)setAVFoundationNSURLSessionEnabled:(BOOL)flag;
- (BOOL)isAVFoundationNSURLSessionEnabled;
+- (void)setQTKitEnabled:(BOOL)flag;
+- (BOOL)isQTKitEnabled;
+
// Deprecated, has no effect.
- (void)setVideoPluginProxyEnabled:(BOOL)flag;
- (BOOL)isVideoPluginProxyEnabled;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (227441 => 227442)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-01-23 21:40:44 UTC (rev 227441)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-01-23 21:42:51 UTC (rev 227442)
@@ -2935,6 +2935,7 @@
settings.setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
settings.setShowsURLsInToolTips([preferences showsURLsInToolTips]);
settings.setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
+ DeprecatedGlobalSettings::setQTKitEnabled([preferences isQTKitEnabled]);
#endif // PLATFORM(MAC)
DatabaseManager::singleton().setIsAvailable([preferences databasesEnabled]);
