Unreviewed, rolling out r227437.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Jan 2018 21:42:51 +0000 (21:42 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Jan 2018 21:42:51 +0000 (21:42 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227442 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
Source/WebCore/ChangeLog
Source/WebCore/page/DeprecatedGlobalSettings.cpp
Source/WebCore/page/DeprecatedGlobalSettings.h
Source/WebKit/ChangeLog
Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp
Source/WebKit/Shared/WebPreferences.yaml
Source/WebKit/UIProcess/API/C/WKPreferences.cpp
Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKitLegacy/mac/WebView/WebPreferences.mm
Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
Source/WebKitLegacy/mac/WebView/WebView.mm

index fe721ac..66f3faf 100644 (file)
@@ -1,3 +1,16 @@
+2018-01-23  Commit Queue  <commit-queue@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  <graouts@apple.com>
 
         [Web Animations] Expose getKeyframes() and parsing of remaining keyframe properties
index fa92e2e..269d93b 100644 (file)
@@ -46,6 +46,10 @@ bool DeprecatedGlobalSettings::gAVFoundationEnabled = true;
 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 @@ void DeprecatedGlobalSettings::setAVFoundationNSURLSessionEnabled(bool enabled)
 }
 #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)
 {
index 0d9ef9d..93ed97e 100644 (file)
@@ -55,6 +55,13 @@ public:
     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 @@ private:
     WEBCORE_EXPORT static bool gAVFoundationNSURLSessionEnabled;
 #endif
 
+#if PLATFORM(COCOA)
+    WEBCORE_EXPORT static bool gQTKitEnabled;
+#endif
+
 #if USE(GSTREAMER)
     WEBCORE_EXPORT static bool gGStreamerEnabled;
 #endif
index 87bd699..dbb0632 100644 (file)
@@ -1,3 +1,16 @@
+2018-01-23  Commit Queue  <commit-queue@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  <achristensen@webkit.org>
 
         Remove compile guard around beacon API
index 8c70dca..c073c06 100644 (file)
@@ -51,12 +51,3 @@ void WKContextSetUsesNetworkProcess(WKContextRef, bool)
 void WKContextSetProcessModel(WKContextRef, WKProcessModel)
 {
 }
-
-void WKPreferencesSetQTKitEnabled(WKPreferencesRef, bool)
-{
-}
-
-bool WKPreferencesGetQTKitEnabled(WKPreferencesRef)
-{
-    return false;
-}
index d3187af..7ac2d46 100644 (file)
@@ -415,6 +415,13 @@ TemporaryTileCohortRetentionEnabled:
   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
index 03b8e43..d02bb30 100644 (file)
@@ -1203,6 +1203,16 @@ bool WKPreferencesGetAggressiveTileRetentionEnabled(WKPreferencesRef preferences
     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);
index 745568e..6573c14 100644 (file)
@@ -932,6 +932,16 @@ static WebCore::EditableLinkBehavior toEditableLinkBehavior(_WKEditableLinkBehav
     return _preferences->plugInSnapshottingEnabled();
 }
 
+- (void)_setQTKitEnabled:(BOOL)enabled
+{
+    _preferences->setQTKitEnabled(enabled);
+}
+
+- (BOOL)_qtKitEnabled
+{
+    return _preferences->isQTKitEnabled();
+}
+
 - (void)_setSubpixelCSSOMElementMetricsEnabled:(BOOL)enabled
 {
     _preferences->setSubpixelCSSOMElementMetricsEnabled(enabled);
index 72303b3..98ed6b2 100644 (file)
@@ -154,6 +154,7 @@ typedef NS_ENUM(NSInteger, _WKEditableLinkBehavior) {
 @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));
index 30c2554..6185bbd 100644 (file)
@@ -1,3 +1,16 @@
+2018-01-23  Commit Queue  <commit-queue@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  <achristensen@webkit.org>
 
         Remove unused QTKit preference
index 75e71b5..6b050b9 100644 (file)
 #define WebKitDiagnosticLoggingEnabledKey @"WebKitDiagnosticLoggingEnabled"
 #define WebKitStorageBlockingPolicyKey @"WebKitStorageBlockingPolicy"
 #define WebKitPlugInSnapshottingEnabledPreferenceKey @"WebKitPlugInSnapshottingEnabled"
+#define WebKitQTKitEnabledPreferenceKey @"WebKitQTKitEnabled"
 #define WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey @"WebKitHiddenPageDOMTimerThrottlingEnabled"
 #define WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey @"WebKitHiddenPageCSSAnimationSuspensionEnabled"
 #define WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey @"WebKitLowPowerVideoAudioBufferSizeEnabled"
index f9ba2c4..fc86b6e 100644 (file)
@@ -597,6 +597,7 @@ public:
 #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 @@ static NSString *classIBCreatorID = nil;
     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.
index 2958b40..eee06b5 100644 (file)
@@ -423,6 +423,9 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification;
 - (void)setAVFoundationNSURLSessionEnabled:(BOOL)flag;
 - (BOOL)isAVFoundationNSURLSessionEnabled;
 
+- (void)setQTKitEnabled:(BOOL)flag;
+- (BOOL)isQTKitEnabled;
+
 // Deprecated, has no effect.
 - (void)setVideoPluginProxyEnabled:(BOOL)flag;
 - (BOOL)isVideoPluginProxyEnabled;
index c7043d2..6fd0822 100644 (file)
@@ -2935,6 +2935,7 @@ static bool needsSelfRetainWhileLoadingQuirk()
     settings.setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
     settings.setShowsURLsInToolTips([preferences showsURLsInToolTips]);
     settings.setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
+    DeprecatedGlobalSettings::setQTKitEnabled([preferences isQTKitEnabled]);
 #endif // PLATFORM(MAC)
 
     DatabaseManager::singleton().setIsAvailable([preferences databasesEnabled]);