Title: [273426] branches/safari-612.1.5-branch/Source/WebKit
- Revision
- 273426
- Author
- repst...@apple.com
- Date
- 2021-02-24 12:32:33 -0800 (Wed, 24 Feb 2021)
Log Message
Cherry-pick r273423. rdar://problem/74708164
Revert r272810. rdar://problem/74674837
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273423 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.5-branch/Source/WebKit/ChangeLog (273425 => 273426)
--- branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-02-24 20:27:22 UTC (rev 273425)
+++ branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-02-24 20:32:33 UTC (rev 273426)
@@ -1,3 +1,15 @@
+2021-02-24 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r273423. rdar://problem/74708164
+
+ Revert r272810. rdar://problem/74674837
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273423 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-02-24 Russell Epstein <repst...@apple.com>
+
+ Revert r272810. rdar://problem/74674837
+
2021-02-23 Russell Epstein <repst...@apple.com>
Cherry-pick r273297. rdar://problem/74650857
Modified: branches/safari-612.1.5-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (273425 => 273426)
--- branches/safari-612.1.5-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2021-02-24 20:27:22 UTC (rev 273425)
+++ branches/safari-612.1.5-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2021-02-24 20:32:33 UTC (rev 273426)
@@ -203,13 +203,11 @@
bool defaultCaptureVideoInGPUProcessEnabled()
{
-#if PLATFORM(MAC)
- return true;
-#elif HAVE(SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS)
return isFeatureFlagEnabled("gpu_process_webrtc");
-#else
+#endif
+
return false;
-#endif
}
#endif // ENABLE(MEDIA_STREAM)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
