Title: [271214] trunk/Source
Revision
271214
Author
[email protected]
Date
2021-01-06 14:36:06 -0800 (Wed, 06 Jan 2021)

Log Message

[Mac] Replace most uses of HAVE(MT_PLUGIN_FORMAT_READER) with ENABLE(WEBM_FORMAT_READER)
https://bugs.webkit.org/show_bug.cgi?id=220374
<rdar://problem/72600426>

Reviewed by Eric Carlson.

Source/WebCore:

* page/RuntimeEnabledFeatures.h:
* platform/audio/PlatformMediaSessionManager.cpp:
(WebCore::PlatformMediaSessionManager::webMFormatReaderEnabled):
(WebCore::PlatformMediaSessionManager::setWebMFormatReaderEnabled):
* platform/audio/PlatformMediaSessionManager.h:
* platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:
(WebCore::AVAssetMIMETypeCache::canDecodeExtendedType):
(WebCore::AVAssetMIMETypeCache::initializeCache):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::registerFormatReaderIfNecessary):
(WebCore::willUseWebMFormatReaderForType):
* platform/graphics/cocoa/SourceBufferParserWebM.cpp:
(WebCore::canLoadFormatReader):

Source/WebKit:

* Shared/API/c/mac/WKFormatReader.cpp:
(WKFormatReaderCreate):
(WKFormatReaderStartOnMainThread):
* Shared/WebPreferencesDefaultValues.cpp:
* Shared/WebPreferencesDefaultValues.h:
* Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp:
* Shared/mac/MediaFormatReader/CoreMediaWrapped.h:
* Shared/mac/MediaFormatReader/FormatReader.cpp:
* Shared/mac/MediaFormatReader/FormatReader.h:
* Shared/mac/MediaFormatReader/SampleCursor.cpp:
* Shared/mac/MediaFormatReader/SampleCursor.h:
* Shared/mac/MediaFormatReader/TrackReader.cpp:
* Shared/mac/MediaFormatReader/TrackReader.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):

Source/WTF:

* Scripts/Preferences/WebPreferencesExperimental.yaml:
* wtf/PlatformEnableCocoa.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (271213 => 271214)


--- trunk/Source/WTF/ChangeLog	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WTF/ChangeLog	2021-01-06 22:36:06 UTC (rev 271214)
@@ -1,3 +1,14 @@
+2021-01-06  Andy Estes  <[email protected]>
+
+        [Mac] Replace most uses of HAVE(MT_PLUGIN_FORMAT_READER) with ENABLE(WEBM_FORMAT_READER)
+        https://bugs.webkit.org/show_bug.cgi?id=220374
+        <rdar://problem/72600426>
+
+        Reviewed by Eric Carlson.
+
+        * Scripts/Preferences/WebPreferencesExperimental.yaml:
+        * wtf/PlatformEnableCocoa.h:
+
 2021-01-05  Kate Cheney  <[email protected]>
 
         NSCrossWebsiteTrackingUsageDescription is not working on Mac, ITP is always enabled

Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (271213 => 271214)


--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2021-01-06 22:36:06 UTC (rev 271214)
@@ -1002,7 +1002,7 @@
   webcoreBinding: RuntimeEnabledFeatures
   humanReadableName: "WebM format reader"
   humanReadableDescription: "Enable MediaToolbox format reader plug-in for WebM"
-  condition: ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+  condition: ENABLE(WEBM_FORMAT_READER)
   defaultValue:
     WebKit:
       default: WebKit::defaultWebMFormatReaderEnabled()

Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (271213 => 271214)


--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -637,3 +637,7 @@
 #if !defined(ENABLE_SET_WEBCONTENT_PROCESS_INFORMATION_IN_NETWORK_PROCESS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 120000
 #define ENABLE_SET_WEBCONTENT_PROCESS_INFORMATION_IN_NETWORK_PROCESS 1
 #endif
+
+#if !defined(ENABLE_WEBM_FORMAT_READER) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110300
+#define ENABLE_WEBM_FORMAT_READER 1
+#endif

Modified: trunk/Source/WebCore/ChangeLog (271213 => 271214)


--- trunk/Source/WebCore/ChangeLog	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebCore/ChangeLog	2021-01-06 22:36:06 UTC (rev 271214)
@@ -1,3 +1,25 @@
+2021-01-06  Andy Estes  <[email protected]>
+
+        [Mac] Replace most uses of HAVE(MT_PLUGIN_FORMAT_READER) with ENABLE(WEBM_FORMAT_READER)
+        https://bugs.webkit.org/show_bug.cgi?id=220374
+        <rdar://problem/72600426>
+
+        Reviewed by Eric Carlson.
+
+        * page/RuntimeEnabledFeatures.h:
+        * platform/audio/PlatformMediaSessionManager.cpp:
+        (WebCore::PlatformMediaSessionManager::webMFormatReaderEnabled):
+        (WebCore::PlatformMediaSessionManager::setWebMFormatReaderEnabled):
+        * platform/audio/PlatformMediaSessionManager.h:
+        * platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:
+        (WebCore::AVAssetMIMETypeCache::canDecodeExtendedType):
+        (WebCore::AVAssetMIMETypeCache::initializeCache):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::registerFormatReaderIfNecessary):
+        (WebCore::willUseWebMFormatReaderForType):
+        * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+        (WebCore::canLoadFormatReader):
+
 2021-01-06  Zalan Bujtas  <[email protected]>
 
         [LFC][IFC] "display: -webkit-inline-box" generates an inline level box

Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (271213 => 271214)


--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -245,7 +245,7 @@
     bool incrementalPDFLoadingEnabled() const { return m_incrementalPDFLoadingEnabled; }
 #endif
     
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     void setWebMFormatReaderEnabled(bool isEnabled) { m_webMFormatReaderEnabled = isEnabled; }
     bool webMFormatReaderEnabled() const { return m_webMFormatReaderEnabled; }
 #endif
@@ -392,7 +392,7 @@
     bool m_incrementalPDFLoadingEnabled { false };
 #endif
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     bool m_webMFormatReaderEnabled { false };
 #endif
 

Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (271213 => 271214)


--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -35,7 +35,7 @@
 
 #if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 bool PlatformMediaSessionManager::m_webMFormatReaderEnabled;
 #endif
 
@@ -620,7 +620,7 @@
 
 bool PlatformMediaSessionManager::webMFormatReaderEnabled()
 {
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     return m_webMFormatReaderEnabled;
 #else
     return false;
@@ -629,7 +629,7 @@
 
 void PlatformMediaSessionManager::setWebMFormatReaderEnabled(bool enabled)
 {
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     m_webMFormatReaderEnabled = enabled;
 #else
     UNUSED_PARAM(enabled);

Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (271213 => 271214)


--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -206,7 +206,7 @@
     WeakHashSet<PlatformMediaSession::AudioCaptureSource> m_audioCaptureSources;
     GenericTaskQueue<Timer> updateSessionStateQueue;
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     static bool m_webMFormatReaderEnabled;
 #endif
 #if ENABLE(VORBIS) && PLATFORM(MAC)

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm (271213 => 271214)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm	2021-01-06 22:36:06 UTC (rev 271214)
@@ -67,7 +67,7 @@
     if ([PAL::getAVURLAssetClass() isPlayableExtendedMIMEType:type.raw()])
         return true;
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     if (SourceBufferParserWebM::isContentTypeSupported(type) == MediaPlayerEnums::SupportsType::IsSupported)
         return true;
 #endif
@@ -156,7 +156,7 @@
     for (NSString* type in [PAL::getAVURLAssetClass() audiovisualMIMETypes])
         cache.add(type);
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     if (SourceBufferParserWebM::isWebMFormatReaderAvailable()) {
         auto webmTypes = SourceBufferParserWebM::webmMIMETypes();
         cache.add(webmTypes.begin(), webmTypes.end());

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (271213 => 271214)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2021-01-06 22:36:06 UTC (rev 271214)
@@ -270,7 +270,7 @@
 
 static void registerFormatReaderIfNecessary()
 {
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         // Like we do for other media formats, allow the format reader to run in the WebContent or GPU process
@@ -806,7 +806,7 @@
 
 static bool willUseWebMFormatReaderForType(const String& type)
 {
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     if (!SourceBufferParserWebM::isWebMFormatReaderAvailable())
         return false;
 

Modified: trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp (271213 => 271214)


--- trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -466,7 +466,7 @@
 
 static bool canLoadFormatReader()
 {
-#if !HAVE(MT_PLUGIN_FORMAT_READER)
+#if !ENABLE(WEBM_FORMAT_READER)
     return false;
 #elif USE(APPLE_INTERNAL_SDK)
     return true;

Modified: trunk/Source/WebKit/ChangeLog (271213 => 271214)


--- trunk/Source/WebKit/ChangeLog	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/ChangeLog	2021-01-06 22:36:06 UTC (rev 271214)
@@ -1,3 +1,29 @@
+2021-01-06  Andy Estes  <[email protected]>
+
+        [Mac] Replace most uses of HAVE(MT_PLUGIN_FORMAT_READER) with ENABLE(WEBM_FORMAT_READER)
+        https://bugs.webkit.org/show_bug.cgi?id=220374
+        <rdar://problem/72600426>
+
+        Reviewed by Eric Carlson.
+
+        * Shared/API/c/mac/WKFormatReader.cpp:
+        (WKFormatReaderCreate):
+        (WKFormatReaderStartOnMainThread):
+        * Shared/WebPreferencesDefaultValues.cpp:
+        * Shared/WebPreferencesDefaultValues.h:
+        * Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp:
+        * Shared/mac/MediaFormatReader/CoreMediaWrapped.h:
+        * Shared/mac/MediaFormatReader/FormatReader.cpp:
+        * Shared/mac/MediaFormatReader/FormatReader.h:
+        * Shared/mac/MediaFormatReader/SampleCursor.cpp:
+        * Shared/mac/MediaFormatReader/SampleCursor.h:
+        * Shared/mac/MediaFormatReader/TrackReader.cpp:
+        * Shared/mac/MediaFormatReader/TrackReader.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2021-01-06  Chris Dumez  <[email protected]>
 
         [GPUProcess] RemoteAudioSourceProviderManager should be a WorkQueueMessageReceiver

Modified: trunk/Source/WebKit/Shared/API/c/mac/WKFormatReader.cpp (271213 => 271214)


--- trunk/Source/WebKit/Shared/API/c/mac/WKFormatReader.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/API/c/mac/WKFormatReader.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -32,7 +32,7 @@
 
 OSStatus WKFormatReaderCreate(CFAllocatorRef allocator, MTPluginFormatReaderRef* formatReaderRef)
 {
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     auto formatReader = WebKit::FormatReader::create(allocator);
     if (!formatReader)
         return kMTPluginFormatReaderError_AllocationFailure;
@@ -47,7 +47,7 @@
 
 OSStatus WKFormatReaderStartOnMainThread(MTPluginFormatReaderRef formatReaderRef, MTPluginByteSourceRef byteSource)
 {
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     auto formatReader = WebKit::FormatReader::unwrap(formatReaderRef);
     if (!formatReader)
         return paramErr;

Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (271213 => 271214)


--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -273,7 +273,7 @@
 
 #endif // ENABLE(WEBXR)
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 bool defaultWebMFormatReaderEnabled()
 {
@@ -284,7 +284,7 @@
     return false;
 }
 
-#endif
+#endif // ENABLE(WEBM_FORMAT_READER)
 
 #if ENABLE(VP9)
 

Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h (271213 => 271214)


--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -102,7 +102,7 @@
 bool defaultWebXREnabled();
 #endif
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 bool defaultWebMFormatReaderEnabled();
 #endif
 

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CoreMediaWrapped.h"
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include <pal/cf/CoreMediaSoftLink.h>
 
@@ -49,4 +49,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/CoreMediaWrapped.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include <pal/spi/cocoa/MediaToolboxSPI.h>
 #include <wtf/ForbidHeapAllocation.h>
@@ -155,4 +155,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/FormatReader.cpp (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/FormatReader.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/FormatReader.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "FormatReader.h"
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include "TrackReader.h"
 #include <WebCore/AudioTrackPrivate.h>
@@ -236,4 +236,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/FormatReader.h (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/FormatReader.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/FormatReader.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include "CoreMediaWrapped.h"
 #include <WebCore/SourceBufferPrivateClient.h>
@@ -92,4 +92,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.cpp (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "SampleCursor.h"
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include "TrackReader.h"
 #include <WebCore/MediaSample.h>
@@ -365,4 +365,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.h (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/SampleCursor.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include "CoreMediaWrapped.h"
 #include <WebCore/SampleMap.h>
@@ -148,4 +148,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.cpp (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "TrackReader.h"
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include "FormatReader.h"
 #include "SampleCursor.h"
@@ -288,4 +288,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.h (271213 => 271214)


--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.h	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/TrackReader.h	2021-01-06 22:36:06 UTC (rev 271214)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
 
 #include "CoreMediaWrapped.h"
 #include <WebCore/SampleMap.h>
@@ -122,4 +122,4 @@
 
 } // namespace WebKit
 
-#endif // HAVE(MT_PLUGIN_FORMAT_READER)
+#endif // ENABLE(WEBM_FORMAT_READER)

Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (271213 => 271214)


--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2021-01-06 22:36:06 UTC (rev 271214)
@@ -3839,7 +3839,7 @@
     }
 #endif
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     PlatformMediaSessionManager::setWebMFormatReaderEnabled(RuntimeEnabledFeatures::sharedFeatures().webMFormatReaderEnabled());
 #endif
 

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (271213 => 271214)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-01-06 21:08:16 UTC (rev 271213)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-01-06 22:36:06 UTC (rev 271214)
@@ -330,7 +330,7 @@
     pthread_set_fixedpriority_self();
 #endif
 
-#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER)
+#if ENABLE(WEBM_FORMAT_READER)
     PlatformMediaSessionManager::setWebMFormatReaderEnabled(RuntimeEnabledFeatures::sharedFeatures().webMFormatReaderEnabled());
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to