Diff
Modified: trunk/Source/WebKit/ChangeLog (265174 => 265175)
--- trunk/Source/WebKit/ChangeLog 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/ChangeLog 2020-08-01 13:40:58 UTC (rev 265175)
@@ -1,3 +1,16 @@
+2020-08-01 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r265171.
+ https://bugs.webkit.org/show_bug.cgi?id=215060
+
+ broke 2 mac api tests
+
+ Reverted changeset:
+
+ "[Mac] Add Experimental Feature preference for SW VP9"
+ https://bugs.webkit.org/show_bug.cgi?id=215043
+ https://trac.webkit.org/changeset/265171
+
2020-08-01 Megan Gardner <[email protected]>
Unable to select multiple lines of vertical text correctly
Modified: trunk/Source/WebKit/FeatureFlags/WebKit.plist (265174 => 265175)
--- trunk/Source/WebKit/FeatureFlags/WebKit.plist 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/FeatureFlags/WebKit.plist 2020-08-01 13:40:58 UTC (rev 265175)
@@ -52,11 +52,6 @@
<key>Enabled</key>
<true/>
</dict>
- <key>sw_vp9_decoder_on_battery</key>
- <dict>
- <key>Enabled</key>
- <false/>
- </dict>
<key>webm_parser</key>
<dict>
<key>Enabled</key>
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp (265174 => 265175)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2020-08-01 13:40:58 UTC (rev 265175)
@@ -154,7 +154,6 @@
encoder << shouldCaptureDisplayInUIProcess;
encoder << shouldRenderCanvasInGPUProcess;
encoder << shouldEnableVP9Decoder;
- encoder << shouldEnableVP9SWDecoder;
encoder << needsInAppBrowserPrivacyQuirks;
encoder << limitsNavigationsToAppBoundDomains;
encoder << shouldRelaxThirdPartyCookieBlocking;
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.h (265174 => 265175)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2020-08-01 13:40:58 UTC (rev 265175)
@@ -227,7 +227,6 @@
bool shouldCaptureDisplayInUIProcess { false };
bool shouldRenderCanvasInGPUProcess { false };
bool shouldEnableVP9Decoder { false };
- bool shouldEnableVP9SWDecoder { false };
bool needsInAppBrowserPrivacyQuirks { false };
bool limitsNavigationsToAppBoundDomains { false };
WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No };
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (265174 => 265175)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2020-08-01 13:40:58 UTC (rev 265175)
@@ -669,15 +669,6 @@
category: experimental
condition: ENABLE(VP9)
-VP9SWDecoderEnabledOnBattery:
- type: bool
- defaultValue: defaultVP9SWDecoderEnabledOnBattery()
- webcoreBinding: none
- humanReadableName: "VP9 SW decoder on battery"
- humanReadableDescription: "Enable VP9 SW decoder on battery"
- category: experimental
- condition: ENABLE(VP9)
-
WebMParserEnabled:
type: bool
defaultValue: defaultWebMParserEnabled()
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (265174 => 265175)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2020-08-01 13:40:58 UTC (rev 265175)
@@ -254,17 +254,6 @@
}
#endif
-#if ENABLE(VP9)
-bool defaultVP9SWDecoderEnabledOnBattery()
-{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
- return isFeatureFlagEnabled("SW_vp9_decoder_on_battery");
-#endif
-
- return false;
-}
-#endif
-
#if ENABLE(MEDIA_SOURCE) && ENABLE(VP9)
bool defaultWebMParserEnabled()
{
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h (265174 => 265175)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2020-08-01 13:40:58 UTC (rev 265175)
@@ -364,7 +364,6 @@
#if ENABLE(VP9)
bool defaultVP9DecoderEnabled();
-bool defaultVP9SWDecoderEnabledOnBattery();
#endif
#if ENABLE(MEDIA_SOURCE) && ENABLE(VP9)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (265174 => 265175)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-08-01 13:40:58 UTC (rev 265175)
@@ -211,7 +211,6 @@
#include "VideoFullscreenManagerProxyMessages.h"
#include <WebCore/AttributedString.h>
#include <WebCore/RunLoopObserver.h>
-#include <WebCore/SystemBattery.h>
#include <WebCore/TextIndicatorWindow.h>
#include <wtf/MachSendRight.h>
#include <wtf/cocoa/Entitlements.h>
@@ -7866,9 +7865,6 @@
parameters.shouldCaptureVideoInGPUProcess = preferences().captureVideoInGPUProcessEnabled();
parameters.shouldRenderCanvasInGPUProcess = preferences().renderCanvasInGPUProcessEnabled();
parameters.shouldEnableVP9Decoder = preferences().vp9DecoderEnabled();
-#if PLATFORM(COCOA)
- parameters.shouldEnableVP9SWDecoder = preferences().vp9DecoderEnabled() && (!WebCore::systemHasBattery() || preferences().vp9SWDecoderEnabledOnBattery());
-#endif
parameters.shouldCaptureDisplayInUIProcess = m_process->processPool().configuration().shouldCaptureDisplayInUIProcess();
parameters.limitsNavigationsToAppBoundDomains = m_limitsNavigationsToAppBoundDomains;
parameters.shouldRelaxThirdPartyCookieBlocking = m_configuration->shouldRelaxThirdPartyCookieBlocking();
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (265174 => 265175)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-08-01 13:40:58 UTC (rev 265175)
@@ -780,9 +780,6 @@
if (parameters.shouldEnableVP9Decoder)
WebProcess::singleton().enableVP9Decoder();
- if (parameters.shouldEnableVP9SWDecoder)
- WebProcess::singleton().enableVP9SWDecoder();
-
updateThrottleState();
}
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (265174 => 265175)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-08-01 13:40:58 UTC (rev 265175)
@@ -1967,15 +1967,6 @@
#endif
}
-void WebProcess::enableVP9SWDecoder()
-{
- if (m_vp9SWDecoderEnabled)
- return;
-
- m_vp9SWDecoderEnabled = true;
- LibWebRTCProvider::registerWebKitVP9Decoder();
-}
-
} // namespace WebKit
#undef RELEASE_LOG_SESSION_ID
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (265174 => 265175)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2020-08-01 08:02:05 UTC (rev 265174)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2020-08-01 13:40:58 UTC (rev 265175)
@@ -333,7 +333,6 @@
#endif
void enableVP9Decoder();
- void enableVP9SWDecoder();
private:
WebProcess();
@@ -651,7 +650,6 @@
bool m_useGPUProcessForMedia { false };
bool m_vp9DecoderEnabled { false };
- bool m_vp9SWDecoderEnabled { false };
};
} // namespace WebKit