Remove ENABLE_VIDEO_TRACK ifdef guards
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Jun 2020 09:55:32 +0000 (09:55 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Jun 2020 09:55:32 +0000 (09:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=212568

Reviewed by Youenn Fablet.

.:

VIDEO_TRACK has been enabled by default on all ports for a long time. As the spec is stable,
the feature can unconditionally be enabled and is now guarded under ENABLE(VIDEO).

* Source/cmake/OptionsFTW.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWin.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmake/tools/vsprops/FeatureDefines.props:
* Source/cmake/tools/vsprops/FeatureDefinesCairo.props:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig: Remove ENABLE_VIDEO_TRACK, which is now enabled by
default under the ENABLE_VIDEO guard.

Source/WebCore:

* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* Modules/mediacontrols/MediaControlsHost.cpp:
* Modules/mediasource/AudioTrackMediaSource.h:
* Modules/mediasource/AudioTrackMediaSource.idl:
* Modules/mediasource/SourceBuffer.h:
* Modules/mediasource/SourceBuffer.idl:
* Modules/mediasource/TextTrackMediaSource.h:
* Modules/mediasource/TextTrackMediaSource.idl:
* Modules/mediasource/VideoTrackMediaSource.h:
* Modules/mediasource/VideoTrackMediaSource.idl:
* Modules/pictureinpicture/HTMLVideoElementPictureInPicture.cpp:
(WebCore::HTMLVideoElementPictureInPicture::requestPictureInPicture):
* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSAudioTrackCustom.cpp:
* bindings/js/JSAudioTrackListCustom.cpp:
* bindings/js/JSTextTrackCueCustom.cpp:
* bindings/js/JSTextTrackCustom.cpp:
* bindings/js/JSTextTrackListCustom.cpp:
* bindings/js/JSTrackCustom.cpp:
* bindings/js/JSTrackCustom.h:
* bindings/js/JSVideoTrackCustom.cpp:
* bindings/js/JSVideoTrackListCustom.cpp:
* css/CSSSelector.cpp:
(WebCore::CSSSelector::pseudoId):
(WebCore::CSSSelector::selectorText const):
* css/CSSSelector.h:
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOne const):
* css/SelectorCheckerTestFunctions.h:
(WebCore::matchesLangPseudoClass):
* css/SelectorPseudoClassAndCompatibilityElementMap.in:
* css/SelectorPseudoElementTypeMap.in:
* css/parser/CSSParserSelector.h:
(WebCore::CSSParserSelector::needsImplicitShadowCombinatorForMatching const):
(WebCore::CSSParserSelector::isPseudoElementCueFunction const):
* css/parser/CSSSelectorParser.cpp:
(WebCore::CSSSelectorParser::consumePseudo):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoClassType):
* dom/Document.cpp:
* dom/Document.h:
* dom/EventNames.in:
* dom/EventTargetFactory.in:
* dom/Node.h:
* history/BackForwardCache.cpp:
* history/BackForwardCache.h:
* history/CachedPage.cpp:
(WebCore::CachedPage::restore):
(WebCore::CachedPage::clear):
* history/CachedPage.h:
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::as const):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::~HTMLMediaElement):
(WebCore::HTMLMediaElement::registerWithDocument):
(WebCore::HTMLMediaElement::unregisterWithDocument):
(WebCore::HTMLMediaElement::finishParsingChildren):
(WebCore::HTMLMediaElement::prepareForLoad):
(WebCore::HTMLMediaElement::selectMediaResource):
(WebCore::HTMLMediaElement::canTransitionFromAutoplayToPlay const):
(WebCore::HTMLMediaElement::setReadyState):
(WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
(WebCore::HTMLMediaElement::playInternal):
(WebCore::HTMLMediaElement::setVolume):
(WebCore::HTMLMediaElement::playbackProgressTimerFired):
(WebCore::HTMLMediaElement::configureTextTracks):
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
(WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
(WebCore::HTMLMediaElement::userCancelledLoad):
(WebCore::HTMLMediaElement::clearMediaPlayer):
(WebCore::HTMLMediaElement::syncTextTrackBounds):
(WebCore::HTMLMediaElement::setVideoFullscreenStandby):
(WebCore::HTMLMediaElement::setVideoFullscreenLayer):
(WebCore::HTMLMediaElement::hasClosedCaptions const):
(WebCore::HTMLMediaElement::setClosedCaptionsVisible):
(WebCore::HTMLMediaElement::createMediaPlayer):
(WebCore::HTMLMediaElement::bufferingPolicy const):
* html/HTMLMediaElement.h:
* html/HTMLMediaElement.idl:
* html/HTMLTagNames.in:
* html/HTMLTrackElement.cpp:
* html/HTMLTrackElement.h:
* html/HTMLTrackElement.idl:
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::texImageSourceHelper):
(WebCore::WebGLRenderingContextBase::validateTexFuncParameters):
* html/shadow/MediaControlTextTrackContainerElement.cpp:
* html/shadow/MediaControlTextTrackContainerElement.h:
* html/track/AudioTrack.cpp:
* html/track/AudioTrack.h:
* html/track/AudioTrack.idl:
* html/track/AudioTrackList.cpp:
* html/track/AudioTrackList.h:
* html/track/AudioTrackList.idl:
* html/track/DataCue.cpp:
* html/track/DataCue.h:
* html/track/DataCue.idl:
* html/track/InbandDataTextTrack.cpp:
* html/track/InbandDataTextTrack.h:
* html/track/InbandGenericTextTrack.cpp:
* html/track/InbandGenericTextTrack.h:
* html/track/InbandTextTrack.cpp:
* html/track/InbandTextTrack.h:
* html/track/InbandWebVTTTextTrack.cpp:
* html/track/InbandWebVTTTextTrack.h:
* html/track/LoadableTextTrack.cpp:
* html/track/LoadableTextTrack.h:
* html/track/TextTrack.cpp:
* html/track/TextTrack.h:
* html/track/TextTrack.idl:
* html/track/TextTrackCue.cpp:
* html/track/TextTrackCue.h:
* html/track/TextTrackCue.idl:
* html/track/TextTrackCueGeneric.cpp:
* html/track/TextTrackCueGeneric.h:
* html/track/TextTrackCueGeneric.idl:
* html/track/TextTrackCueList.cpp:
* html/track/TextTrackCueList.h:
* html/track/TextTrackCueList.idl:
* html/track/TextTrackList.cpp:
* html/track/TextTrackList.h:
* html/track/TextTrackList.idl:
* html/track/TrackBase.cpp:
* html/track/TrackBase.h:
* html/track/TrackEvent.cpp:
* html/track/TrackEvent.h:
* html/track/TrackEvent.idl:
* html/track/TrackListBase.cpp:
* html/track/TrackListBase.h:
* html/track/VTTCue.cpp:
* html/track/VTTCue.h:
* html/track/VTTCue.idl:
* html/track/VTTRegion.cpp:
* html/track/VTTRegion.h:
* html/track/VTTRegion.idl:
* html/track/VTTRegionList.cpp:
* html/track/VTTRegionList.h:
* html/track/VTTRegionList.idl:
* html/track/VideoTrack.cpp:
* html/track/VideoTrack.h:
* html/track/VideoTrack.idl:
* html/track/VideoTrackList.cpp:
* html/track/VideoTrackList.h:
* html/track/VideoTrackList.idl:
* html/track/WebVTTElement.cpp:
* html/track/WebVTTElement.h:
* html/track/WebVTTParser.cpp:
* html/track/WebVTTParser.h:
* html/track/WebVTTToken.h:
* html/track/WebVTTTokenizer.cpp:
* html/track/WebVTTTokenizer.h:
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::resourceTypeFromAsAttribute):
(WebCore::createLinkPreloadResourceClient):
(WebCore::LinkLoader::isSupportedType):
* loader/ResourceLoadInfo.cpp:
(WebCore::ContentExtensions::toResourceType):
* loader/SubresourceLoader.cpp:
(WebCore::logResourceLoaded):
* loader/TextTrackLoader.cpp:
* loader/TextTrackLoader.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::defaultPriorityForResourceType):
* loader/cache/CachedResource.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::createResource):
(WebCore::contentTypeFromResourceType):
(WebCore::CachedResourceLoader::checkInsecureContent const):
(WebCore::CachedResourceLoader::allowedByContentSecurityPolicy const):
(WebCore::destinationForType):
* loader/cache/CachedResourceLoader.h:
* loader/cache/CachedTextTrack.cpp:
* loader/cache/CachedTextTrack.h:
* page/CaptionUserPreferences.cpp:
* page/CaptionUserPreferences.h:
* page/CaptionUserPreferencesMediaAF.cpp:
* page/CaptionUserPreferencesMediaAF.h:
* page/Page.cpp:
(WebCore::Page::setPageScaleFactor):
(WebCore::Page::setUserInterfaceLayoutDirection):
(WebCore::Page::doAfterUpdateRendering):
(WebCore::Page::forEachMediaElement):
* page/Page.h:
* page/PageGroup.cpp:
* page/PageGroup.h:
* page/Settings.yaml:
* platform/LocalizedStrings.cpp:
* platform/LocalizedStrings.h:
* platform/MIMETypeRegistry.cpp:
(WebCore::MIMETypeRegistry::isSupportedImageVideoOrSVGMIMEType):
* platform/SerializedPlatformDataCue.cpp:
* platform/graphics/AudioTrackPrivate.h:
* platform/graphics/ImageDecoder.cpp:
(WebCore::ImageDecoder::create):
(WebCore::ImageDecoder::supportsMediaType):
* platform/graphics/InbandGenericCue.cpp:
* platform/graphics/InbandGenericCue.h:
* platform/graphics/InbandTextTrackPrivate.h:
* platform/graphics/InbandTextTrackPrivateClient.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::textTrackRepresentationBoundsChanged):
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::tracksChanged):
* platform/graphics/TextTrackRepresentation.cpp:
* platform/graphics/TextTrackRepresentation.h:
* platform/graphics/TrackPrivateBase.cpp:
* platform/graphics/TrackPrivateBase.h:
* platform/graphics/VideoTrackPrivate.h:
* platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h:
* platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm:
* platform/graphics/avfoundation/AudioTrackPrivateAVF.h:
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
* platform/graphics/avfoundation/VideoTrackPrivateAVF.h:
* platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h:
* platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm:
* platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp:
* platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp:
* platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h:
* platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm:
* platform/graphics/cocoa/TextTrackRepresentationCocoa.h:
* platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
* platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp:
* platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h:
* platform/graphics/gstreamer/GStreamerCommon.cpp:
(WebCore::initializeGStreamer):
* platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
* platform/graphics/gstreamer/ImageDecoderGStreamer.h:
* platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h:
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio):
(WebCore::MediaPlayerPrivateGStreamer::newTextSample):
(WebCore::MediaPlayerPrivateGStreamer::updateTracks):
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
(WebCore::MediaPlayerPrivateGStreamer::purgeInvalidTextTracks):
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
* platform/graphics/gstreamer/TextCombinerGStreamer.h:
* platform/graphics/gstreamer/TextSinkGStreamer.cpp:
* platform/graphics/gstreamer/TextSinkGStreamer.h:
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h:
* platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp:
* platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h:
* platform/mac/SerializedPlatformDataCueMac.h:
* platform/mac/SerializedPlatformDataCueMac.mm:
* platform/mediastream/AudioMediaStreamTrackRenderer.cpp:
* platform/mediastream/AudioMediaStreamTrackRenderer.h:
* platform/mediastream/AudioTrackPrivateMediaStream.cpp:
* platform/mediastream/AudioTrackPrivateMediaStream.h:
* platform/mediastream/VideoTrackPrivateMediaStream.h:
* platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp:
* platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.h:
* rendering/RenderVTTCue.cpp:
* rendering/RenderVTTCue.h:
* style/ElementRuleCollector.cpp:
(WebCore::Style::ElementRuleCollector::collectMatchingShadowPseudoElementRules):
* style/PropertyCascade.cpp:
(WebCore::Style::PropertyCascade::addMatch):
* style/RuleData.cpp:
(WebCore::Style::determinePropertyWhitelistType):
* style/RuleData.h:
* style/RuleSet.cpp:
(WebCore::Style::RuleSet::addRule):
(WebCore::Style::RuleSet::traverseRuleDatas):
(WebCore::Style::RuleSet::hasShadowPseudoElementRules const):
(WebCore::Style::RuleSet::shrinkToFit):
* style/RuleSet.h:
* style/StyleAdjuster.cpp:
(WebCore::Style::Adjuster::adjustForSiteSpecificQuirks const):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setShouldDisplayTrackKind):
(WebCore::InternalSettings::shouldDisplayTrackKind):
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::Internals):
(WebCore::Internals::userPreferredAudioCharacteristics const):
(WebCore::Internals::setUserPreferredAudioCharacteristic):
(WebCore::Internals::captionsStyleSheetOverride):
(WebCore::Internals::setCaptionsStyleSheetOverride):
(WebCore::Internals::setPrimaryAudioTrackLanguageOverride):
(WebCore::Internals::setCaptionDisplayMode):
(WebCore::Internals::textTrackBCP47Language):
(WebCore::Internals::getCurrentMediaControlsStatusForElement):
* testing/Internals.h:
* testing/Internals.idl:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit:

* Configurations/FeatureDefines.xcconfig:
* GPUProcess/GPUConnectionToWebProcess.cpp:
(WebKit::GPUConnectionToWebProcess::dispatchMessage):
* GPUProcess/GPUConnectionToWebProcess.h:
* GPUProcess/media/RemoteMediaPlayerProxy.cpp:
(WebKit::RemoteMediaPlayerProxy::textTrackSetMode):
(WebKit::RemoteMediaPlayerProxy::notifyTrackModeChanged):
* GPUProcess/media/RemoteMediaPlayerProxy.h:
* GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp:
* GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h:
* GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in:
* GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.cpp:
* GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.h:
* GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.messages.in:
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp:
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.h:
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.messages.in:
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.cpp:
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.h:
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in:
* Shared/WebPreferences.yaml:
* WebProcess/GPU/GPUProcessConnection.cpp:
(WebKit::GPUProcessConnection::dispatchMessage):
* WebProcess/GPU/GPUProcessConnection.h:
* WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::tracksChanged):
* WebProcess/GPU/media/MediaPlayerPrivateRemote.h:
* WebProcess/GPU/media/RemoteMediaPlayerManager.cpp:
(WebKit::RemoteMediaPlayerManager::updatePreferences):
* WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp:
* WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.h:
* WebProcess/GPU/webrtc/SampleBufferDisplayLayer.cpp:
* WebProcess/GPU/webrtc/SampleBufferDisplayLayer.h:
* WebProcess/GPU/webrtc/SampleBufferDisplayLayer.messages.in:
* WebProcess/GPU/webrtc/SampleBufferDisplayLayerManager.cpp:
* WebProcess/GPU/webrtc/SampleBufferDisplayLayerManager.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::maximumBufferingTime):

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Source/WebKitLegacy/win:

* WebPreferences.cpp:
(WebPreferences::shouldDisplaySubtitles):
(WebPreferences::setShouldDisplaySubtitles):
(WebPreferences::shouldDisplayCaptions):
(WebPreferences::setShouldDisplayCaptions):
(WebPreferences::shouldDisplayTextDescriptions):
(WebPreferences::setShouldDisplayTextDescriptions):
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Source/WTF:

* wtf/PlatformEnable.h: Remove ENABLE_VIDEO_TRACK, which is now enabled by
default under the ENABLE_VIDEO guard.
* wtf/PlatformEnableCocoa.h: Ditto.

Tools:

* Scripts/webkitperl/FeatureList.pm:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

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

271 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformEnable.h
Source/WTF/wtf/PlatformEnableCocoa.h
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp
Source/WebCore/Modules/mediasource/AudioTrackMediaSource.h
Source/WebCore/Modules/mediasource/AudioTrackMediaSource.idl
Source/WebCore/Modules/mediasource/SourceBuffer.h
Source/WebCore/Modules/mediasource/SourceBuffer.idl
Source/WebCore/Modules/mediasource/TextTrackMediaSource.h
Source/WebCore/Modules/mediasource/TextTrackMediaSource.idl
Source/WebCore/Modules/mediasource/VideoTrackMediaSource.h
Source/WebCore/Modules/mediasource/VideoTrackMediaSource.idl
Source/WebCore/Modules/pictureinpicture/HTMLVideoElementPictureInPicture.cpp
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/Sources.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSAudioTrackCustom.cpp
Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp
Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp
Source/WebCore/bindings/js/JSTextTrackCustom.cpp
Source/WebCore/bindings/js/JSTextTrackListCustom.cpp
Source/WebCore/bindings/js/JSTrackCustom.cpp
Source/WebCore/bindings/js/JSTrackCustom.h
Source/WebCore/bindings/js/JSVideoTrackCustom.cpp
Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp
Source/WebCore/css/CSSSelector.cpp
Source/WebCore/css/CSSSelector.h
Source/WebCore/css/SelectorChecker.cpp
Source/WebCore/css/SelectorCheckerTestFunctions.h
Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in
Source/WebCore/css/SelectorPseudoElementTypeMap.in
Source/WebCore/css/parser/CSSParserSelector.h
Source/WebCore/css/parser/CSSSelectorParser.cpp
Source/WebCore/cssjit/SelectorCompiler.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/dom/EventNames.in
Source/WebCore/dom/EventTargetFactory.in
Source/WebCore/dom/Node.h
Source/WebCore/history/BackForwardCache.cpp
Source/WebCore/history/BackForwardCache.h
Source/WebCore/history/CachedPage.cpp
Source/WebCore/history/CachedPage.h
Source/WebCore/html/HTMLLinkElement.cpp
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/HTMLMediaElement.h
Source/WebCore/html/HTMLMediaElement.idl
Source/WebCore/html/HTMLTagNames.in
Source/WebCore/html/HTMLTrackElement.cpp
Source/WebCore/html/HTMLTrackElement.h
Source/WebCore/html/HTMLTrackElement.idl
Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
Source/WebCore/html/shadow/MediaControlTextTrackContainerElement.cpp
Source/WebCore/html/shadow/MediaControlTextTrackContainerElement.h
Source/WebCore/html/track/AudioTrack.cpp
Source/WebCore/html/track/AudioTrack.h
Source/WebCore/html/track/AudioTrack.idl
Source/WebCore/html/track/AudioTrackList.cpp
Source/WebCore/html/track/AudioTrackList.h
Source/WebCore/html/track/AudioTrackList.idl
Source/WebCore/html/track/DataCue.cpp
Source/WebCore/html/track/DataCue.h
Source/WebCore/html/track/DataCue.idl
Source/WebCore/html/track/InbandDataTextTrack.cpp
Source/WebCore/html/track/InbandDataTextTrack.h
Source/WebCore/html/track/InbandGenericTextTrack.cpp
Source/WebCore/html/track/InbandGenericTextTrack.h
Source/WebCore/html/track/InbandTextTrack.cpp
Source/WebCore/html/track/InbandTextTrack.h
Source/WebCore/html/track/InbandWebVTTTextTrack.cpp
Source/WebCore/html/track/InbandWebVTTTextTrack.h
Source/WebCore/html/track/LoadableTextTrack.cpp
Source/WebCore/html/track/LoadableTextTrack.h
Source/WebCore/html/track/TextTrack.cpp
Source/WebCore/html/track/TextTrack.h
Source/WebCore/html/track/TextTrack.idl
Source/WebCore/html/track/TextTrackCue.cpp
Source/WebCore/html/track/TextTrackCue.h
Source/WebCore/html/track/TextTrackCue.idl
Source/WebCore/html/track/TextTrackCueGeneric.cpp
Source/WebCore/html/track/TextTrackCueGeneric.h
Source/WebCore/html/track/TextTrackCueGeneric.idl
Source/WebCore/html/track/TextTrackCueList.cpp
Source/WebCore/html/track/TextTrackCueList.h
Source/WebCore/html/track/TextTrackCueList.idl
Source/WebCore/html/track/TextTrackList.cpp
Source/WebCore/html/track/TextTrackList.h
Source/WebCore/html/track/TextTrackList.idl
Source/WebCore/html/track/TrackBase.cpp
Source/WebCore/html/track/TrackBase.h
Source/WebCore/html/track/TrackEvent.cpp
Source/WebCore/html/track/TrackEvent.h
Source/WebCore/html/track/TrackEvent.idl
Source/WebCore/html/track/TrackListBase.cpp
Source/WebCore/html/track/TrackListBase.h
Source/WebCore/html/track/VTTCue.cpp
Source/WebCore/html/track/VTTCue.h
Source/WebCore/html/track/VTTCue.idl
Source/WebCore/html/track/VTTRegion.cpp
Source/WebCore/html/track/VTTRegion.h
Source/WebCore/html/track/VTTRegion.idl
Source/WebCore/html/track/VTTRegionList.cpp
Source/WebCore/html/track/VTTRegionList.h
Source/WebCore/html/track/VTTRegionList.idl
Source/WebCore/html/track/VideoTrack.cpp
Source/WebCore/html/track/VideoTrack.h
Source/WebCore/html/track/VideoTrack.idl
Source/WebCore/html/track/VideoTrackList.cpp
Source/WebCore/html/track/VideoTrackList.h
Source/WebCore/html/track/VideoTrackList.idl
Source/WebCore/html/track/WebVTTElement.cpp
Source/WebCore/html/track/WebVTTElement.h
Source/WebCore/html/track/WebVTTParser.cpp
Source/WebCore/html/track/WebVTTParser.h
Source/WebCore/html/track/WebVTTToken.h
Source/WebCore/html/track/WebVTTTokenizer.cpp
Source/WebCore/html/track/WebVTTTokenizer.h
Source/WebCore/loader/LinkLoader.cpp
Source/WebCore/loader/ResourceLoadInfo.cpp
Source/WebCore/loader/SubresourceLoader.cpp
Source/WebCore/loader/TextTrackLoader.cpp
Source/WebCore/loader/TextTrackLoader.h
Source/WebCore/loader/cache/CachedResource.cpp
Source/WebCore/loader/cache/CachedResource.h
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/loader/cache/CachedResourceLoader.h
Source/WebCore/loader/cache/CachedTextTrack.cpp
Source/WebCore/loader/cache/CachedTextTrack.h
Source/WebCore/page/CaptionUserPreferences.cpp
Source/WebCore/page/CaptionUserPreferences.h
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
Source/WebCore/page/CaptionUserPreferencesMediaAF.h
Source/WebCore/page/Page.cpp
Source/WebCore/page/Page.h
Source/WebCore/page/PageGroup.cpp
Source/WebCore/page/PageGroup.h
Source/WebCore/page/Settings.yaml
Source/WebCore/platform/LocalizedStrings.cpp
Source/WebCore/platform/LocalizedStrings.h
Source/WebCore/platform/MIMETypeRegistry.cpp
Source/WebCore/platform/SerializedPlatformDataCue.cpp
Source/WebCore/platform/graphics/AudioTrackPrivate.h
Source/WebCore/platform/graphics/ImageDecoder.cpp
Source/WebCore/platform/graphics/InbandGenericCue.cpp
Source/WebCore/platform/graphics/InbandGenericCue.h
Source/WebCore/platform/graphics/InbandTextTrackPrivate.h
Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/MediaPlayer.h
Source/WebCore/platform/graphics/MediaPlayerPrivate.h
Source/WebCore/platform/graphics/TextTrackRepresentation.cpp
Source/WebCore/platform/graphics/TextTrackRepresentation.h
Source/WebCore/platform/graphics/TrackPrivateBase.cpp
Source/WebCore/platform/graphics/TrackPrivateBase.h
Source/WebCore/platform/graphics/VideoTrackPrivate.h
Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
Source/WebCore/platform/graphics/avfoundation/AudioTrackPrivateAVF.h
Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
Source/WebCore/platform/graphics/avfoundation/VideoTrackPrivateAVF.h
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm
Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.h
Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm
Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h
Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h
Source/WebCore/platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h
Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.h
Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/TextSinkGStreamer.h
Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h
Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h
Source/WebCore/platform/mac/SerializedPlatformDataCueMac.h
Source/WebCore/platform/mac/SerializedPlatformDataCueMac.mm
Source/WebCore/platform/mediastream/AudioMediaStreamTrackRenderer.cpp
Source/WebCore/platform/mediastream/AudioMediaStreamTrackRenderer.h
Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.cpp
Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h
Source/WebCore/platform/mediastream/VideoTrackPrivateMediaStream.h
Source/WebCore/platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp
Source/WebCore/platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.h
Source/WebCore/rendering/RenderVTTCue.cpp
Source/WebCore/rendering/RenderVTTCue.h
Source/WebCore/style/ElementRuleCollector.cpp
Source/WebCore/style/PropertyCascade.cpp
Source/WebCore/style/RuleData.cpp
Source/WebCore/style/RuleData.h
Source/WebCore/style/RuleSet.cpp
Source/WebCore/style/RuleSet.h
Source/WebCore/style/StyleAdjuster.cpp
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h
Source/WebCore/testing/InternalSettings.idl
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit/ChangeLog
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp
Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h
Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp
Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h
Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.cpp
Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.h
Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in
Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.cpp
Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.h
Source/WebKit/GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.messages.in
Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.cpp
Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.h
Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.messages.in
Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.cpp
Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.h
Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
Source/WebKit/Shared/WebPreferences.yaml
Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp
Source/WebKit/WebProcess/GPU/GPUProcessConnection.h
Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp
Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h
Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.cpp
Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp
Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.h
Source/WebKit/WebProcess/GPU/webrtc/SampleBufferDisplayLayer.cpp
Source/WebKit/WebProcess/GPU/webrtc/SampleBufferDisplayLayer.h
Source/WebKit/WebProcess/GPU/webrtc/SampleBufferDisplayLayer.messages.in
Source/WebKit/WebProcess/GPU/webrtc/SampleBufferDisplayLayerManager.cpp
Source/WebKit/WebProcess/GPU/webrtc/SampleBufferDisplayLayerManager.h
Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/WebView/WebPreferences.mm
Source/WebKitLegacy/mac/WebView/WebView.mm
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/WebPreferences.cpp
Source/WebKitLegacy/win/WebView.cpp
Source/cmake/OptionsFTW.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/OptionsWin.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmake/tools/vsprops/FeatureDefines.props
Source/cmake/tools/vsprops/FeatureDefinesCairo.props
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

index cfc6e8d..7b3e282 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2020-06-07  Philippe Normand  <pnormand@igalia.com>
+
+        Remove ENABLE_VIDEO_TRACK ifdef guards
+        https://bugs.webkit.org/show_bug.cgi?id=212568
+
+        Reviewed by Youenn Fablet.
+
+        VIDEO_TRACK has been enabled by default on all ports for a long time. As the spec is stable,
+        the feature can unconditionally be enabled and is now guarded under ENABLE(VIDEO).
+
+        * Source/cmake/OptionsFTW.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/OptionsWin.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmake/tools/vsprops/FeatureDefines.props:
+        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
 2020-06-05  Andy Estes  <aestes@apple.com>
 
         [Apple Pay] Remove conditionals for ENABLE_APPLE_PAY_SESSION_V(3|4)
index c5114c5..89b9e49 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-07  Philippe Normand  <pnormand@igalia.com>
+
+        Remove ENABLE_VIDEO_TRACK ifdef guards
+        https://bugs.webkit.org/show_bug.cgi?id=212568
+
+        Reviewed by Youenn Fablet.
+
+        * Configurations/FeatureDefines.xcconfig: Remove ENABLE_VIDEO_TRACK, which is now enabled by
+        default under the ENABLE_VIDEO guard.
+
 2020-06-07  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Checksum for generated files should be emitted at the end of the files
index 2b13528..e8beb1e 100644 (file)
@@ -358,8 +358,6 @@ ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
 
-ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
-
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
@@ -407,4 +405,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 75db047..ca5aadb 100644 (file)
@@ -1,3 +1,14 @@
+2020-06-07  Philippe Normand  <pnormand@igalia.com>
+
+        Remove ENABLE_VIDEO_TRACK ifdef guards
+        https://bugs.webkit.org/show_bug.cgi?id=212568
+
+        Reviewed by Youenn Fablet.
+
+        * wtf/PlatformEnable.h: Remove ENABLE_VIDEO_TRACK, which is now enabled by
+        default under the ENABLE_VIDEO guard.
+        * wtf/PlatformEnableCocoa.h: Ditto.
+
 2020-06-06  David Kilzer  <ddkilzer@apple.com>
 
         Use OptionSet<DragOperation> for mask values
index 8362741..f70cfc0 100644 (file)
 #define ENABLE_VIDEO 0
 #endif
 
-#if !defined(ENABLE_VIDEO_TRACK)
-#define ENABLE_VIDEO_TRACK 0
-#endif
-
 #if !defined(ENABLE_DATACUE_VALUE)
 #define ENABLE_DATACUE_VALUE 0
 #endif
 
 /* Asserts, invariants for macro definitions */
 
-#if ENABLE(VIDEO_TRACK) && !ENABLE(VIDEO)
-#error "ENABLE(VIDEO_TRACK) requires ENABLE(VIDEO)"
-#endif
-
 #if ENABLE(MEDIA_CONTROLS_SCRIPT) && !ENABLE(VIDEO)
 #error "ENABLE(MEDIA_CONTROLS_SCRIPT) requires ENABLE(VIDEO)"
 #endif
index 783f103..d50fb46 100644 (file)
 #define ENABLE_VIDEO 1
 #endif
 
-#if !defined(ENABLE_VIDEO_TRACK)
-#define ENABLE_VIDEO_TRACK 1
-#endif
-
 #if !defined(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) && PLATFORM(MAC)
 #define ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN 1
 #endif
index 9a4f113..f8eaffe 100644 (file)
@@ -316,11 +316,14 @@ set(WebCore_NON_SVG_IDL_FILES
     Modules/mediasession/MediaRemoteControls.idl
     Modules/mediasession/MediaSession.idl
 
+    Modules/mediasource/AudioTrackMediaSource.idl
     Modules/mediasource/DOMURLMediaSource.idl
     Modules/mediasource/MediaSource.idl
     Modules/mediasource/SourceBuffer.idl
     Modules/mediasource/SourceBufferList.idl
+    Modules/mediasource/TextTrackMediaSource.idl
     Modules/mediasource/VideoPlaybackQuality.idl
+    Modules/mediasource/VideoTrackMediaSource.idl
 
     Modules/mediastream/CanvasCaptureMediaStreamTrack.idl
     Modules/mediastream/DoubleRange.idl
@@ -900,6 +903,21 @@ set(WebCore_NON_SVG_IDL_FILES
     html/canvas/PaintRenderingContext2D.idl
     html/canvas/Path2D.idl
 
+    html/track/AudioTrack.idl
+    html/track/AudioTrackList.idl
+    html/track/DataCue.idl
+    html/track/TextTrack.idl
+    html/track/TextTrackCue.idl
+    html/track/TextTrackCueGeneric.idl
+    html/track/TextTrackCueList.idl
+    html/track/TextTrackList.idl
+    html/track/TrackEvent.idl
+    html/track/VTTCue.idl
+    html/track/VTTRegion.idl
+    html/track/VTTRegionList.idl
+    html/track/VideoTrack.idl
+    html/track/VideoTrackList.idl
+
     inspector/CommandLineAPIHost.idl
     inspector/InspectorAuditAccessibilityObject.idl
     inspector/InspectorAuditDOMObject.idl
@@ -1429,67 +1447,6 @@ if (ENABLE_WEBGL)
     )
 endif ()
 
-if (ENABLE_VIDEO_TRACK)
-    list(APPEND WebCore_IDL_FILES
-        html/track/AudioTrack.idl
-        html/track/AudioTrackList.idl
-        html/track/DataCue.idl
-        html/track/TextTrack.idl
-        html/track/TextTrackCue.idl
-        html/track/TextTrackCueGeneric.idl
-        html/track/TextTrackCueList.idl
-        html/track/TextTrackList.idl
-        html/track/TrackEvent.idl
-        html/track/VTTCue.idl
-        html/track/VTTRegion.idl
-        html/track/VTTRegionList.idl
-        html/track/VideoTrack.idl
-        html/track/VideoTrackList.idl
-    )
-
-    if (ENABLE_MEDIA_SOURCE)
-        list(APPEND WebCore_IDL_FILES
-            Modules/mediasource/AudioTrackMediaSource.idl
-            Modules/mediasource/TextTrackMediaSource.idl
-            Modules/mediasource/VideoTrackMediaSource.idl
-        )
-    endif ()
-
-    list(APPEND WebCore_SOURCES
-        html/track/AudioTrack.cpp
-        html/track/AudioTrackList.cpp
-        html/track/BufferedLineReader.cpp
-        html/track/DataCue.cpp
-        html/track/InbandDataTextTrack.cpp
-        html/track/InbandGenericTextTrack.cpp
-        html/track/InbandTextTrack.cpp
-        html/track/InbandWebVTTTextTrack.cpp
-        html/track/LoadableTextTrack.cpp
-        html/track/TextTrack.cpp
-        html/track/TextTrackCue.cpp
-        html/track/TextTrackCueGeneric.cpp
-        html/track/TextTrackCueList.cpp
-        html/track/TextTrackList.cpp
-        html/track/TrackBase.cpp
-        html/track/TrackEvent.cpp
-        html/track/TrackListBase.cpp
-        html/track/VTTCue.cpp
-        html/track/VTTRegion.cpp
-        html/track/VTTRegionList.cpp
-        html/track/VTTScanner.cpp
-        html/track/VideoTrack.cpp
-        html/track/VideoTrackList.cpp
-        html/track/WebVTTElement.cpp
-        html/track/WebVTTParser.cpp
-        html/track/WebVTTTokenizer.cpp
-
-        loader/cache/CachedTextTrack.cpp
-
-        platform/graphics/TextTrackRepresentation.cpp
-        platform/graphics/TrackPrivateBase.cpp
-    )
-endif ()
-
 if (ENABLE_QUOTA)
     list(APPEND WebCore_SOURCES
         Modules/quota/DOMWindowQuota.cpp
index 6412732..a35418e 100644 (file)
@@ -1,3 +1,315 @@
+2020-06-07  Philippe Normand  <pnormand@igalia.com>
+
+        Remove ENABLE_VIDEO_TRACK ifdef guards
+        https://bugs.webkit.org/show_bug.cgi?id=212568
+
+        Reviewed by Youenn Fablet.
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * Modules/mediacontrols/MediaControlsHost.cpp:
+        * Modules/mediasource/AudioTrackMediaSource.h:
+        * Modules/mediasource/AudioTrackMediaSource.idl:
+        * Modules/mediasource/SourceBuffer.h:
+        * Modules/mediasource/SourceBuffer.idl:
+        * Modules/mediasource/TextTrackMediaSource.h:
+        * Modules/mediasource/TextTrackMediaSource.idl:
+        * Modules/mediasource/VideoTrackMediaSource.h:
+        * Modules/mediasource/VideoTrackMediaSource.idl:
+        * Modules/pictureinpicture/HTMLVideoElementPictureInPicture.cpp:
+        (WebCore::HTMLVideoElementPictureInPicture::requestPictureInPicture):
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSAudioTrackCustom.cpp:
+        * bindings/js/JSAudioTrackListCustom.cpp:
+        * bindings/js/JSTextTrackCueCustom.cpp:
+        * bindings/js/JSTextTrackCustom.cpp:
+        * bindings/js/JSTextTrackListCustom.cpp:
+        * bindings/js/JSTrackCustom.cpp:
+        * bindings/js/JSTrackCustom.h:
+        * bindings/js/JSVideoTrackCustom.cpp:
+        * bindings/js/JSVideoTrackListCustom.cpp:
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::pseudoId):
+        (WebCore::CSSSelector::selectorText const):
+        * css/CSSSelector.h:
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne const):
+        * css/SelectorCheckerTestFunctions.h:
+        (WebCore::matchesLangPseudoClass):
+        * css/SelectorPseudoClassAndCompatibilityElementMap.in:
+        * css/SelectorPseudoElementTypeMap.in:
+        * css/parser/CSSParserSelector.h:
+        (WebCore::CSSParserSelector::needsImplicitShadowCombinatorForMatching const):
+        (WebCore::CSSParserSelector::isPseudoElementCueFunction const):
+        * css/parser/CSSSelectorParser.cpp:
+        (WebCore::CSSSelectorParser::consumePseudo):
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::addPseudoClassType):
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * dom/EventNames.in:
+        * dom/EventTargetFactory.in:
+        * dom/Node.h:
+        * history/BackForwardCache.cpp:
+        * history/BackForwardCache.h:
+        * history/CachedPage.cpp:
+        (WebCore::CachedPage::restore):
+        (WebCore::CachedPage::clear):
+        * history/CachedPage.h:
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::as const):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement):
+        (WebCore::HTMLMediaElement::~HTMLMediaElement):
+        (WebCore::HTMLMediaElement::registerWithDocument):
+        (WebCore::HTMLMediaElement::unregisterWithDocument):
+        (WebCore::HTMLMediaElement::finishParsingChildren):
+        (WebCore::HTMLMediaElement::prepareForLoad):
+        (WebCore::HTMLMediaElement::selectMediaResource):
+        (WebCore::HTMLMediaElement::canTransitionFromAutoplayToPlay const):
+        (WebCore::HTMLMediaElement::setReadyState):
+        (WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
+        (WebCore::HTMLMediaElement::playInternal):
+        (WebCore::HTMLMediaElement::setVolume):
+        (WebCore::HTMLMediaElement::playbackProgressTimerFired):
+        (WebCore::HTMLMediaElement::configureTextTracks):
+        (WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
+        (WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
+        (WebCore::HTMLMediaElement::userCancelledLoad):
+        (WebCore::HTMLMediaElement::clearMediaPlayer):
+        (WebCore::HTMLMediaElement::syncTextTrackBounds):
+        (WebCore::HTMLMediaElement::setVideoFullscreenStandby):
+        (WebCore::HTMLMediaElement::setVideoFullscreenLayer):
+        (WebCore::HTMLMediaElement::hasClosedCaptions const):
+        (WebCore::HTMLMediaElement::setClosedCaptionsVisible):
+        (WebCore::HTMLMediaElement::createMediaPlayer):
+        (WebCore::HTMLMediaElement::bufferingPolicy const):
+        * html/HTMLMediaElement.h:
+        * html/HTMLMediaElement.idl:
+        * html/HTMLTagNames.in:
+        * html/HTMLTrackElement.cpp:
+        * html/HTMLTrackElement.h:
+        * html/HTMLTrackElement.idl:
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::texImageSourceHelper):
+        (WebCore::WebGLRenderingContextBase::validateTexFuncParameters):
+        * html/shadow/MediaControlTextTrackContainerElement.cpp:
+        * html/shadow/MediaControlTextTrackContainerElement.h:
+        * html/track/AudioTrack.cpp:
+        * html/track/AudioTrack.h:
+        * html/track/AudioTrack.idl:
+        * html/track/AudioTrackList.cpp:
+        * html/track/AudioTrackList.h:
+        * html/track/AudioTrackList.idl:
+        * html/track/DataCue.cpp:
+        * html/track/DataCue.h:
+        * html/track/DataCue.idl:
+        * html/track/InbandDataTextTrack.cpp:
+        * html/track/InbandDataTextTrack.h:
+        * html/track/InbandGenericTextTrack.cpp:
+        * html/track/InbandGenericTextTrack.h:
+        * html/track/InbandTextTrack.cpp:
+        * html/track/InbandTextTrack.h:
+        * html/track/InbandWebVTTTextTrack.cpp:
+        * html/track/InbandWebVTTTextTrack.h:
+        * html/track/LoadableTextTrack.cpp:
+        * html/track/LoadableTextTrack.h:
+        * html/track/TextTrack.cpp:
+        * html/track/TextTrack.h:
+        * html/track/TextTrack.idl:
+        * html/track/TextTrackCue.cpp:
+        * html/track/TextTrackCue.h:
+        * html/track/TextTrackCue.idl:
+        * html/track/TextTrackCueGeneric.cpp:
+        * html/track/TextTrackCueGeneric.h:
+        * html/track/TextTrackCueGeneric.idl:
+        * html/track/TextTrackCueList.cpp:
+        * html/track/TextTrackCueList.h:
+        * html/track/TextTrackCueList.idl:
+        * html/track/TextTrackList.cpp:
+        * html/track/TextTrackList.h:
+        * html/track/TextTrackList.idl:
+        * html/track/TrackBase.cpp:
+        * html/track/TrackBase.h:
+        * html/track/TrackEvent.cpp:
+        * html/track/TrackEvent.h:
+        * html/track/TrackEvent.idl:
+        * html/track/TrackListBase.cpp:
+        * html/track/TrackListBase.h:
+        * html/track/VTTCue.cpp:
+        * html/track/VTTCue.h:
+        * html/track/VTTCue.idl:
+        * html/track/VTTRegion.cpp:
+        * html/track/VTTRegion.h:
+        * html/track/VTTRegion.idl:
+        * html/track/VTTRegionList.cpp:
+        * html/track/VTTRegionList.h:
+        * html/track/VTTRegionList.idl:
+        * html/track/VideoTrack.cpp:
+        * html/track/VideoTrack.h:
+        * html/track/VideoTrack.idl:
+        * html/track/VideoTrackList.cpp:
+        * html/track/VideoTrackList.h:
+        * html/track/VideoTrackList.idl:
+        * html/track/WebVTTElement.cpp:
+        * html/track/WebVTTElement.h:
+        * html/track/WebVTTParser.cpp:
+        * html/track/WebVTTParser.h:
+        * html/track/WebVTTToken.h:
+        * html/track/WebVTTTokenizer.cpp:
+        * html/track/WebVTTTokenizer.h:
+        * loader/LinkLoader.cpp:
+        (WebCore::LinkLoader::resourceTypeFromAsAttribute):
+        (WebCore::createLinkPreloadResourceClient):
+        (WebCore::LinkLoader::isSupportedType):
+        * loader/ResourceLoadInfo.cpp:
+        (WebCore::ContentExtensions::toResourceType):
+        * loader/SubresourceLoader.cpp:
+        (WebCore::logResourceLoaded):
+        * loader/TextTrackLoader.cpp:
+        * loader/TextTrackLoader.h:
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::defaultPriorityForResourceType):
+        * loader/cache/CachedResource.h:
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::createResource):
+        (WebCore::contentTypeFromResourceType):
+        (WebCore::CachedResourceLoader::checkInsecureContent const):
+        (WebCore::CachedResourceLoader::allowedByContentSecurityPolicy const):
+        (WebCore::destinationForType):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/cache/CachedTextTrack.cpp:
+        * loader/cache/CachedTextTrack.h:
+        * page/CaptionUserPreferences.cpp:
+        * page/CaptionUserPreferences.h:
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        * page/CaptionUserPreferencesMediaAF.h:
+        * page/Page.cpp:
+        (WebCore::Page::setPageScaleFactor):
+        (WebCore::Page::setUserInterfaceLayoutDirection):
+        (WebCore::Page::doAfterUpdateRendering):
+        (WebCore::Page::forEachMediaElement):
+        * page/Page.h:
+        * page/PageGroup.cpp:
+        * page/PageGroup.h:
+        * page/Settings.yaml:
+        * platform/LocalizedStrings.cpp:
+        * platform/LocalizedStrings.h:
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::MIMETypeRegistry::isSupportedImageVideoOrSVGMIMEType):
+        * platform/SerializedPlatformDataCue.cpp:
+        * platform/graphics/AudioTrackPrivate.h:
+        * platform/graphics/ImageDecoder.cpp:
+        (WebCore::ImageDecoder::create):
+        (WebCore::ImageDecoder::supportsMediaType):
+        * platform/graphics/InbandGenericCue.cpp:
+        * platform/graphics/InbandGenericCue.h:
+        * platform/graphics/InbandTextTrackPrivate.h:
+        * platform/graphics/InbandTextTrackPrivateClient.h:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::buildMediaEnginesVector):
+        * platform/graphics/MediaPlayer.h:
+        (WebCore::MediaPlayerClient::textTrackRepresentationBoundsChanged):
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::tracksChanged):
+        * platform/graphics/TextTrackRepresentation.cpp:
+        * platform/graphics/TextTrackRepresentation.h:
+        * platform/graphics/TrackPrivateBase.cpp:
+        * platform/graphics/TrackPrivateBase.h:
+        * platform/graphics/VideoTrackPrivate.h:
+        * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h:
+        * platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm:
+        * platform/graphics/avfoundation/AudioTrackPrivateAVF.h:
+        * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
+        * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
+        * platform/graphics/avfoundation/VideoTrackPrivateAVF.h:
+        * platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h:
+        * platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm:
+        * platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp:
+        * platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp:
+        * platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h:
+        * platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.h:
+        * platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm:
+        * platform/graphics/cocoa/TextTrackRepresentationCocoa.h:
+        * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
+        * platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp:
+        * platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h:
+        * platform/graphics/gstreamer/GStreamerCommon.cpp:
+        (WebCore::initializeGStreamer):
+        * platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
+        * platform/graphics/gstreamer/ImageDecoderGStreamer.h:
+        * platform/graphics/gstreamer/InbandMetadataTextTrackPrivateGStreamer.h:
+        * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
+        * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
+        (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo):
+        (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio):
+        (WebCore::MediaPlayerPrivateGStreamer::newTextSample):
+        (WebCore::MediaPlayerPrivateGStreamer::updateTracks):
+        (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+        (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidTextTracks):
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+        * platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+        * platform/graphics/gstreamer/TextCombinerGStreamer.h:
+        * platform/graphics/gstreamer/TextSinkGStreamer.cpp:
+        * platform/graphics/gstreamer/TextSinkGStreamer.h:
+        * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+        * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h:
+        * platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp:
+        * platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h:
+        * platform/mac/SerializedPlatformDataCueMac.h:
+        * platform/mac/SerializedPlatformDataCueMac.mm:
+        * platform/mediastream/AudioMediaStreamTrackRenderer.cpp:
+        * platform/mediastream/AudioMediaStreamTrackRenderer.h:
+        * platform/mediastream/AudioTrackPrivateMediaStream.cpp:
+        * platform/mediastream/AudioTrackPrivateMediaStream.h:
+        * platform/mediastream/VideoTrackPrivateMediaStream.h:
+        * platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp:
+        * platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.h:
+        * rendering/RenderVTTCue.cpp:
+        * rendering/RenderVTTCue.h:
+        * style/ElementRuleCollector.cpp:
+        (WebCore::Style::ElementRuleCollector::collectMatchingShadowPseudoElementRules):
+        * style/PropertyCascade.cpp:
+        (WebCore::Style::PropertyCascade::addMatch):
+        * style/RuleData.cpp:
+        (WebCore::Style::determinePropertyWhitelistType):
+        * style/RuleData.h:
+        * style/RuleSet.cpp:
+        (WebCore::Style::RuleSet::addRule):
+        (WebCore::Style::RuleSet::traverseRuleDatas):
+        (WebCore::Style::RuleSet::hasShadowPseudoElementRules const):
+        (WebCore::Style::RuleSet::shrinkToFit):
+        * style/RuleSet.h:
+        * style/StyleAdjuster.cpp:
+        (WebCore::Style::Adjuster::adjustForSiteSpecificQuirks const):
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        (WebCore::InternalSettings::setShouldDisplayTrackKind):
+        (WebCore::InternalSettings::shouldDisplayTrackKind):
+        * testing/InternalSettings.h:
+        * testing/InternalSettings.idl:
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState):
+        (WebCore::Internals::Internals):
+        (WebCore::Internals::userPreferredAudioCharacteristics const):
+        (WebCore::Internals::setUserPreferredAudioCharacteristic):
+        (WebCore::Internals::captionsStyleSheetOverride):
+        (WebCore::Internals::setCaptionsStyleSheetOverride):
+        (WebCore::Internals::setPrimaryAudioTrackLanguageOverride):
+        (WebCore::Internals::setCaptionDisplayMode):
+        (WebCore::Internals::textTrackBCP47Language):
+        (WebCore::Internals::getCurrentMediaControlsStatusForElement):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-06-06  Yusuke Suzuki  <ysuzuki@apple.com>
 
         Crash when running web-apis data collection
index 2b13528..e8beb1e 100644 (file)
@@ -358,8 +358,6 @@ ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
 
-ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
-
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
@@ -407,4 +405,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index f981ecc..48b0813 100644 (file)
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#if ENABLE(VIDEO)
+
 #include "MediaControlsHost.h"
 
 #include "CaptionUserPreferences.h"
@@ -318,3 +320,5 @@ bool MediaControlsHost::compactMode() const
 }
 
 }
+
+#endif // ENABLE(VIDEO)
index 786c717..4e7adff 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 
 #include "AudioTrack.h"
 
@@ -38,4 +38,4 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(MEDIA_SOURCE)
index 7829249..cf33f75 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=MEDIA_SOURCE&VIDEO_TRACK,
+    Conditional=MEDIA_SOURCE,
 ]
 partial interface AudioTrack {
     readonly attribute SourceBuffer? sourceBuffer;
index c0de776..95d5ce2 100644 (file)
@@ -77,14 +77,12 @@ public:
     double timestampOffset() const;
     ExceptionOr<void> setTimestampOffset(double);
 
-#if ENABLE(VIDEO_TRACK)
     VideoTrackList& videoTracks();
     VideoTrackList* videoTracksIfExists() const { return m_videoTracks.get(); }
     AudioTrackList& audioTracks();
     AudioTrackList* audioTracksIfExists() const { return m_audioTracks.get(); }
     TextTrackList& textTracks();
     TextTrackList* textTracksIfExists() const { return m_textTracks.get(); }
-#endif
 
     double appendWindowStart() const;
     ExceptionOr<void> setAppendWindowStart(double);
index 031cf84..c6161b8 100644 (file)
@@ -49,9 +49,9 @@
     attribute double timestampOffset;
 
     // Track support
-    [Conditional=VIDEO_TRACK] readonly attribute AudioTrackList audioTracks;
-    [Conditional=VIDEO_TRACK] readonly attribute VideoTrackList videoTracks;
-    [Conditional=VIDEO_TRACK] readonly attribute TextTrackList textTracks;
+    readonly attribute AudioTrackList audioTracks;
+    readonly attribute VideoTrackList videoTracks;
+    readonly attribute TextTrackList textTracks;
 
     attribute double appendWindowStart;
     attribute unrestricted double appendWindowEnd;
index ad21acf..d92d3b7 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 
 #include "TextTrack.h"
 
@@ -40,4 +40,4 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(MEDIA_SOURCE)
index 53e52ce..0a0813a 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=MEDIA_SOURCE&VIDEO_TRACK,
+    Conditional=MEDIA_SOURCE,
 ]
 partial interface TextTrack {
     readonly attribute SourceBuffer? sourceBuffer;
index 8e0f5f4..7ddf576 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 
 #include "VideoTrack.h"
 
@@ -38,4 +38,4 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(MEDIA_SOURCE)
index d80a0f4..23fe023 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 [
-    Conditional=MEDIA_SOURCE&VIDEO_TRACK,
+    Conditional=MEDIA_SOURCE,
 ]
 partial interface VideoTrack {
     readonly attribute SourceBuffer? sourceBuffer;
index 61b9a66..b0090fc 100644 (file)
@@ -90,12 +90,10 @@ void HTMLVideoElementPictureInPicture::requestPictureInPicture(HTMLVideoElement&
         return;
     }
 
-#if ENABLE(VIDEO_TRACK)
     if (!videoElement.videoTracks() || !videoElement.videoTracks()->length()) {
         promise->reject(InvalidStateError, "The video element does not have a video track or it has not detected a video track yet.");
         return;
     }
-#endif
 
     bool userActivationRequired = !videoElement.document().pictureInPictureElement();
     if (userActivationRequired && !UserGestureIndicator::processingUserGesture()) {
index 8dc336c..83fd863 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-07  Philippe Normand  <pnormand@igalia.com>
+
+        Remove ENABLE_VIDEO_TRACK ifdef guards
+        https://bugs.webkit.org/show_bug.cgi?id=212568
+
+        Reviewed by Youenn Fablet.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2020-06-05  Ryan Haddad  <ryanhaddad@apple.com>
 
         Unreviewed, reverting r262619, r262625, and r262641.
index 2b13528..e8beb1e 100644 (file)
@@ -358,8 +358,6 @@ ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
 ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
 
-ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
-
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN = $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_$(WK_PLATFORM_NAME));
 ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN_macosx = ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN;
 
@@ -407,4 +405,4 @@ ENABLE_WIRELESS_PLAYBACK_TARGET = ENABLE_WIRELESS_PLAYBACK_TARGET;
 
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCESSIBILITY_ISOLATED_TREE) $(ENABLE_APPLE_PAY) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_C_LOOP) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_EDITABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXPERIMENTAL_FEATURES) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FULLSCREEN_API) $(ENABLE_PICTURE_IN_PICTURE_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_GPU_PROCESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) $(ENABLE_INSPECTOR_TELEMETRY) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MEMORY_SAMPLER) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION) $(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFSCREEN_CANVAS) $(ENABLE_OVERFLOW_SCROLLING_TOUCH) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESIZE_OBSERVER) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SANDBOX_EXTENSIONS) $(ENABLE_SERVER_PRECONNECT) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SHAREABLE_RESOURCE) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USERSELECT_ALL) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_ARCHIVE) $(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS) $(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS) $(ENABLE_WEBDRIVER_TOUCH_INTERACTIONS) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBXR) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_CRYPTO) $(ENABLE_WEB_RTC) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
index 61e10c5..7d39195 100644 (file)
@@ -1347,6 +1347,33 @@ html/canvas/WebGLVertexArrayObject.cpp
 html/canvas/WebGLVertexArrayObjectBase.cpp
 html/canvas/WebGLVertexArrayObjectOES.cpp
 
+html/track/AudioTrack.cpp
+html/track/AudioTrackList.cpp
+html/track/BufferedLineReader.cpp
+html/track/DataCue.cpp
+html/track/InbandDataTextTrack.cpp
+html/track/InbandGenericTextTrack.cpp
+html/track/InbandTextTrack.cpp
+html/track/InbandWebVTTTextTrack.cpp
+html/track/LoadableTextTrack.cpp
+html/track/TextTrack.cpp
+html/track/TextTrackCue.cpp
+html/track/TextTrackCueGeneric.cpp
+html/track/TextTrackCueList.cpp
+html/track/TextTrackList.cpp
+html/track/TrackBase.cpp
+html/track/TrackEvent.cpp
+html/track/TrackListBase.cpp
+html/track/VTTCue.cpp
+html/track/VTTRegion.cpp
+html/track/VTTRegionList.cpp
+html/track/VTTScanner.cpp
+html/track/VideoTrack.cpp
+html/track/VideoTrackList.cpp
+html/track/WebVTTElement.cpp
+html/track/WebVTTParser.cpp
+html/track/WebVTTTokenizer.cpp
+
 html/forms/FileIconLoader.cpp
 
 html/parser/CSSPreloadScanner.cpp
@@ -1582,6 +1609,7 @@ loader/cache/CachedSVGDocument.cpp
 loader/cache/CachedSVGDocumentReference.cpp
 loader/cache/CachedSVGFont.cpp
 loader/cache/CachedScript.cpp
+loader/cache/CachedTextTrack.cpp
 loader/cache/CachedXSLStyleSheet.cpp
 loader/cache/KeepaliveRequestTracker.cpp
 loader/cache/MemoryCache.cpp
@@ -1942,6 +1970,8 @@ platform/graphics/SimpleColor.cpp
 platform/graphics/StringTruncator.cpp
 platform/graphics/SurrogatePairAwareTextIterator.cpp
 platform/graphics/TextRun.cpp
+platform/graphics/TextTrackRepresentation.cpp
+platform/graphics/TrackPrivateBase.cpp
 platform/graphics/VelocityData.cpp
 platform/graphics/WOFFFileFormat.cpp
 platform/graphics/WidthIterator.cpp
@@ -3693,8 +3723,6 @@ JSWebGLVertexArrayObjectOES.cpp
 
 #endif
 
-#if ENABLE_VIDEO_TRACK
-
 JSAudioTrack.cpp
 JSAudioTrackList.cpp
 JSDataCue.cpp
@@ -3716,8 +3744,6 @@ JSTextTrackMediaSource.cpp
 JSVideoTrackMediaSource.cpp
 #endif
 
-#endif
-
 #if ENABLE_QUOTA
 
 JSDOMWindowQuota.cpp
index c9b5bbd..158a504 100644 (file)
                                41E1F343248A69D40022D5DE /* AudioSampleBufferCompressor.mm in Sources */,
                                CDA79827170A279100D45C55 /* AudioSessionIOS.mm in Sources */,
                                CD8A7BBB197735FE00CBD643 /* AudioSourceProviderAVFObjC.mm in Sources */,
-                               BE88E0D81715D2A200658D98 /* AudioTrack.cpp in Sources */,
-                               BE88E0DB1715D2A200658D98 /* AudioTrackList.cpp in Sources */,
                                CDE3A85717F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm in Sources */,
                                CD54A762180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.cpp in Sources */,
                                0719427F1D088F21002AA51D /* AVAssetMIMETypeCache.mm in Sources */,
                                CD11B3E1227CE6F30023AFC7 /* AVStreamDataParserMIMETypeCache.mm in Sources */,
                                CD336F6117F9F64700DDDCD0 /* AVTrackPrivateAVFObjCImpl.mm in Sources */,
                                070363E7181A1CDC00C074A5 /* AVVideoCaptureSource.mm in Sources */,
-                               7A45032F18DB717200377B34 /* BufferedLineReader.cpp in Sources */,
-                               0753860214489E9800B78452 /* CachedTextTrack.cpp in Sources */,
                                CDF4B7151E00B7E500E235A2 /* CDM.cpp in Sources */,
                                CD94A5DD1F71D5D800F525C5 /* CDMClearKey.cpp in Sources */,
                                CDB7045B1F7465A1003923DF /* CDMFairPlayStreaming.cpp in Sources */,
                                1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */,
                                2D22830323A8470700364B7E /* CursorMac.mm in Sources */,
                                5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */,
-                               BE23480C18A9870B00E4B6E8 /* DataCue.cpp in Sources */,
                                4463CF682212FA68001A8577 /* DataDetectorsCoreSoftLink.mm in Sources */,
                                515BE18F1D54F5FB00DD7C68 /* EmptyGamepadProvider.cpp in Sources */,
                                6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */,
                                1AC900C31943C0FC008625B5 /* HTTPHeaderNames.cpp in Sources */,
                                CD19FEAF1F574B6D000C42FB /* ImageDecoderAVFObjC.mm in Sources */,
                                CD27AE5122A9868700947FF9 /* ImageRotationSessionVT.mm in Sources */,
-                               BE961C5418AD338500D07DC5 /* InbandDataTextTrack.cpp in Sources */,
-                               BE16C59217CFE17200852C04 /* InbandGenericTextTrack.cpp in Sources */,
                                07E9E13018F62B370011A3A4 /* InbandMetadataTextTrackPrivateAVF.cpp in Sources */,
-                               07941791166E855F009416C2 /* InbandTextTrack.cpp in Sources */,
                                07B442D6166C70B000556CAD /* InbandTextTrackPrivateAVF.cpp in Sources */,
                                07AA6B6B166D2C0700D45671 /* InbandTextTrackPrivateAVFObjC.mm in Sources */,
-                               BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
                                CD063F821E23FA8900812BE3 /* InitDataRegistry.cpp in Sources */,
                                538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */,
                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
                                4186BD4E2140B9E80001826F /* LibWebRTCRtpTransceiverBackend.cpp in Sources */,
                                41D28D0D2139E05800F4206F /* LibWebRTCStatsCollector.cpp in Sources */,
                                4186BD3E213EE3400001826F /* LibWebRTCUtils.cpp in Sources */,
-                               9759E93E14EF1CF80026A2DD /* LoadableTextTrack.cpp in Sources */,
                                414598C223C8D177002B9CC8 /* LocalSampleBufferDisplayLayer.mm in Sources */,
                                FABE72FE1059C21100D999DD /* MathMLNames.cpp in Sources */,
                                2D9BF7051DBFBB24007A7D99 /* MediaEncryptedEvent.cpp in Sources */,
                                C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */,
                                6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */,
                                CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */,
-                               9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
-                               9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
-                               071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */,
-                               9759E94514EF1CF80026A2DD /* TextTrackCueList.cpp in Sources */,
-                               076970861463AD8700F502CF /* TextTrackList.cpp in Sources */,
-                               CD1E7347167BC78E009A885D /* TextTrackRepresentation.cpp in Sources */,
                                51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
-                               070334D9145A006F008D8D45 /* TrackBase.cpp in Sources */,
-                               070334D31459FFAD008D8D45 /* TrackEvent.cpp in Sources */,
-                               BE88E0C11715CE2600658D98 /* TrackListBase.cpp in Sources */,
-                               073BDC051F68436100EE34ED /* TrackPrivateBase.cpp in Sources */,
                                538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */,
                                538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */,
                                538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */,
                                3FBC4AF3189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm in Sources */,
                                52D5A18F1C54592300DE34A3 /* VideoLayerManagerObjC.mm in Sources */,
                                41E1F342248A69D00022D5DE /* VideoSampleBufferCompressor.mm in Sources */,
-                               BE88E0DE1715D2A200658D98 /* VideoTrack.cpp in Sources */,
-                               BE88E0E11715D2A200658D98 /* VideoTrackList.cpp in Sources */,
                                CD336F6717FA0AC600DDDCD0 /* VideoTrackPrivateAVFObjC.cpp in Sources */,
                                CD8B5A42180D149A008B8E65 /* VideoTrackPrivateMediaSourceAVFObjC.mm in Sources */,
                                26F9A83818A046AC00AEB88A /* ViewportConfiguration.cpp in Sources */,
-                               BE20507918A458680080647E /* VTTCue.cpp in Sources */,
-                               7AF9B20218CFB2DF00C64BEF /* VTTRegion.cpp in Sources */,
-                               7AF9B20518CFB2DF00C64BEF /* VTTRegionList.cpp in Sources */,
-                               7A93868518DCC14500B8263D /* VTTScanner.cpp in Sources */,
                                A14832B1187F61E100DA63A6 /* WAKAppKitStubs.m in Sources */,
                                A14832B3187F629100DA63A6 /* WAKClipView.m in Sources */,
                                A14832B5187F62FC00DA63A6 /* WAKResponder.m in Sources */,
                                0709D7921AE5557E004E42F8 /* WebMediaSessionManagerMac.cpp in Sources */,
                                1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */,
                                CECDC93C21F2972900976BD1 /* WebVideoFullscreenControllerAVKit.mm in Sources */,
-                               F12171F516A8CED2000053CA /* WebVTTElement.cpp in Sources */,
-                               5D21A80213ECE5DF00BB7064 /* WebVTTParser.cpp in Sources */,
-                               B10B6981140C174000BC1C26 /* WebVTTTokenizer.cpp in Sources */,
                                E1EE8B802413191F00E794D6 /* WebXRBoundedReferenceSpace.cpp in Sources */,
                                E1EE8B932413195000E794D6 /* WebXRFrame.cpp in Sources */,
                                E1EE8BA12413196300E794D6 /* WebXRInputSource.cpp in Sources */,
index 454fb5c..ba473ef 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "JSAudioTrack.h"
 
index 8dcd367..7043591 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "JSAudioTrackList.h"
 
index 7529572..da44153 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "JSTextTrackCue.h"
 
index 6e60cfc..e8558a9 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "JSTextTrack.h"
 
index 1c1b75a..8b579c4 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "JSTextTrackList.h"
 
index 79f2e7e..9a5328a 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "JSTrackCustom.h"
 
index 3c0f927..ef72d9b 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "Element.h"
 #include "JSDOMBinding.h"
@@ -45,4 +45,4 @@ inline void* root(TrackBase* track)
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index db80968..e71ddce 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "JSVideoTrack.h"
 
index 543d12e..726f217 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "Element.h"
 #include "JSVideoTrackList.h"
index f68866c..afd9bab 100644 (file)
@@ -249,7 +249,7 @@ PseudoId CSSSelector::pseudoId(PseudoElementType type)
         return PseudoId::ScrollbarTrackPiece;
     case PseudoElementResizer:
         return PseudoId::Resizer;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     case PseudoElementCue:
 #endif
     case PseudoElementSlotted:
@@ -509,7 +509,7 @@ String CSSSelector::selectorText(const String& rightSide) const
             case CSSSelector::PseudoClassFocusWithin:
                 builder.appendLiteral(":focus-within");
                 break;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
             case CSSSelector::PseudoClassFuture:
                 builder.appendLiteral(":future");
                 break;
@@ -619,7 +619,7 @@ String CSSSelector::selectorText(const String& rightSide) const
             case CSSSelector::PseudoClassOutOfRange:
                 builder.appendLiteral(":out-of-range");
                 break;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
             case CSSSelector::PseudoClassPast:
                 builder.appendLiteral(":past");
                 break;
@@ -698,7 +698,7 @@ String CSSSelector::selectorText(const String& rightSide) const
                 if (cs->value() == "placeholder")
                     builder.appendLiteral("::-webkit-input-placeholder");
                 break;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
             case CSSSelector::PseudoElementCue: {
                 if (auto* selectorList = cs->selectorList()) {
                     builder.appendLiteral("::cue(");
index 847a7ef..65d2bd5 100644 (file)
@@ -160,7 +160,7 @@ namespace WebCore {
 #endif
             PseudoClassInRange,
             PseudoClassOutOfRange,
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
             PseudoClassFuture,
             PseudoClassPast,
 #endif
@@ -179,7 +179,7 @@ namespace WebCore {
             PseudoElementUnknown = 0,
             PseudoElementAfter,
             PseudoElementBefore,
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
             PseudoElementCue,
 #endif
             PseudoElementFirstLetter,
index 6d0af26..724967e 100644 (file)
@@ -1029,7 +1029,7 @@ bool SelectorChecker::checkOne(CheckingContext& checkingContext, const LocalCont
             return isInRange(element);
         case CSSSelector::PseudoClassOutOfRange:
             return isOutOfRange(element);
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
         case CSSSelector::PseudoClassFuture:
             return matchesFutureCuePseudoClass(element);
         case CSSSelector::PseudoClassPast:
@@ -1088,7 +1088,7 @@ bool SelectorChecker::checkOne(CheckingContext& checkingContext, const LocalCont
 
     if (selector.match() == CSSSelector::PseudoElement) {
         switch (selector.pseudoElementType()) {
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
         case CSSSelector::PseudoElementCue: {
             LocalContext subcontext(context);
 
index 9bc96a6..21cc9f2 100644 (file)
@@ -39,7 +39,7 @@
 #include "HTMLAttachmentElement.h"
 #endif
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 #include "WebVTTElement.h"
 #endif
 
@@ -184,7 +184,7 @@ ALWAYS_INLINE bool containslanguageSubtagMatchingRange(StringView language, Stri
 ALWAYS_INLINE bool matchesLangPseudoClass(const Element& element, const Vector<AtomString>& argumentList)
 {
     AtomString language;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     if (is<WebVTTElement>(element))
         language = downcast<WebVTTElement>(element).language();
     else
@@ -423,7 +423,7 @@ ALWAYS_INLINE bool matchesPictureInPicturePseudoClass(const Element& element)
 
 #endif
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 ALWAYS_INLINE bool matchesFutureCuePseudoClass(const Element& element)
 {
index a7bcc10..10cab00 100644 (file)
@@ -1,6 +1,6 @@
 after
 before
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 cue
 #endif
 first-letter
index d746706..ed88707 100644 (file)
@@ -104,7 +104,7 @@ inline bool CSSParserSelector::needsImplicitShadowCombinatorForMatching() const
 {
     return match() == CSSSelector::PseudoElement
         && (pseudoElementType() == CSSSelector::PseudoElementWebKitCustom
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
             || pseudoElementType() == CSSSelector::PseudoElementCue
 #endif
             || pseudoElementType() == CSSSelector::PseudoElementPart
@@ -113,7 +113,7 @@ inline bool CSSParserSelector::needsImplicitShadowCombinatorForMatching() const
 
 inline bool CSSParserSelector::isPseudoElementCueFunction() const
 {
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     return m_selector->match() == CSSSelector::PseudoElement && m_selector->pseudoElementType() == CSSSelector::PseudoElementCue;
 #else
     return false;
index 8eeb5f3..38d1712 100644 (file)
@@ -559,7 +559,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTok
         }
     } else {
         selector = CSSParserSelector::parsePseudoElementSelector(token.value());
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
         // Treat the ident version of cue as PseudoElementWebkitCustom.
         if (token.type() == IdentToken && selector && selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementCue)
             selector->setPseudoElementType(CSSSelector::PseudoElementWebKitCustom);
@@ -671,7 +671,7 @@ std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTok
     
     if (selector->match() == CSSSelector::PseudoElement) {
         switch (selector->pseudoElementType()) {
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
         case CSSSelector::PseudoElementCue: {
             DisallowPseudoElementsScope scope(*this);
             auto selectorList = makeUnique<CSSSelectorList>();
index 9bceef5..1065566 100644 (file)
@@ -621,7 +621,7 @@ static inline FunctionType addPseudoClassType(const CSSSelector& selector, Selec
         return FunctionType::SimpleSelectorChecker;
 #endif
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     case CSSSelector::PseudoClassFuture:
         fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr<CSSOperationPtrTag>(matchesFutureCuePseudoClass));
         return FunctionType::SimpleSelectorChecker;
index 702fb99..a18f1a6 100644 (file)
 #include "TouchEvent.h"
 #endif
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 #include "CaptionUserPreferences.h"
 #endif
 
@@ -5493,7 +5493,7 @@ void Document::privateBrowsingStateDidChange(PAL::SessionID sessionID)
 #endif
 }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 void Document::registerForCaptionPreferencesChangedCallbacks(HTMLMediaElement& element)
 {
index e388366..7f20094 100644 (file)
@@ -1106,8 +1106,10 @@ public:
     void suspend(ReasonForSuspension);
     void resume(ReasonForSuspension);
 
+#if ENABLE(VIDEO)
     void registerMediaElement(HTMLMediaElement&);
     void unregisterMediaElement(HTMLMediaElement&);
+#endif
 
     bool audioPlaybackRequiresUserGesture() const;
     bool videoPlaybackRequiresUserGesture() const;
@@ -1121,7 +1123,7 @@ public:
 
     void storageBlockingStateDidChange();
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     void registerForCaptionPreferencesChangedCallbacks(HTMLMediaElement&);
     void unregisterForCaptionPreferencesChangedCallbacks(HTMLMediaElement&);
     void captionPreferencesChanged();
@@ -1836,7 +1838,7 @@ private:
     HashSet<HTMLMediaElement*> m_mediaElements;
 #endif
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     HashSet<HTMLMediaElement*> m_captionPreferencesChangedElements;
     WeakPtr<HTMLMediaElement> m_mediaElementShowingTextTrack;
 #endif
index 6488f9a..72cfaa5 100644 (file)
@@ -75,7 +75,7 @@ DeviceOrientationEvent conditional=DEVICE_ORIENTATION
 OrientationEvent interfaceName=Event, conditional=ORIENTATION_EVENTS
 WebKitMediaKeyMessageEvent conditional=LEGACY_ENCRYPTED_MEDIA
 WebKitMediaKeyNeededEvent conditional=LEGACY_ENCRYPTED_MEDIA
-TrackEvent conditional=VIDEO_TRACK
+TrackEvent conditional=VIDEO
 SecurityPolicyViolationEvent
 GestureEvent conditional=IOS_GESTURE_EVENTS|MAC_GESTURE_EVENTS
 WebKitPlaybackTargetAvailabilityEvent conditional=WIRELESS_PLAYBACK_TARGET
index bbcd48f..fc1db2c 100644 (file)
@@ -6,7 +6,7 @@ AbortSignal
 ApplePaySession conditional=APPLE_PAY
 AudioNode conditional=WEB_AUDIO
 AudioContext conditional=WEB_AUDIO
-AudioTrackList conditional=VIDEO_TRACK
+AudioTrackList conditional=VIDEO
 Clipboard
 DedicatedWorkerGlobalScope
 DOMApplicationCache
@@ -46,10 +46,10 @@ ServiceWorkerRegistration conditional=SERVICE_WORKER
 SourceBuffer conditional=MEDIA_SOURCE
 SourceBufferList conditional=MEDIA_SOURCE
 SpeechSynthesisUtterance conditional=SPEECH_SYNTHESIS
-TextTrack conditional=VIDEO_TRACK
-TextTrackCue conditional=VIDEO_TRACK
-TextTrackList conditional=VIDEO_TRACK
-VideoTrackList conditional=VIDEO_TRACK
+TextTrack conditional=VIDEO
+TextTrackCue conditional=VIDEO
+TextTrackList conditional=VIDEO
+VideoTrackList conditional=VIDEO
 VisualViewport
 WebAnimation
 WebGPUDevice conditional=WEBGPU
index 3b0b702..431cb36 100644 (file)
@@ -198,7 +198,7 @@ public:
     bool isAfterPseudoElement() const { return pseudoId() == PseudoId::After; }
     PseudoId pseudoId() const { return (isElementNode() && hasCustomStyleResolveCallbacks()) ? customPseudoId() : PseudoId::None; }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     virtual bool isWebVTTElement() const { return false; }
 #endif
     bool isStyledElement() const { return getFlag(IsHTMLFlag) || getFlag(IsSVGFlag) || getFlag(IsMathMLFlag); }
index ba18cbd..4b24d62 100644 (file)
@@ -356,7 +356,7 @@ void BackForwardCache::markPagesForContentsSizeChanged(Page& page)
     }
 }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 void BackForwardCache::markPagesForCaptionPreferencesChanged()
 {
     for (auto& item : m_items) {
index 9203bc4..adaafab 100644 (file)
@@ -64,7 +64,7 @@ public:
 
     void markPagesForDeviceOrPageScaleChanged(Page&);
     void markPagesForContentsSizeChanged(Page&);
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     void markPagesForCaptionPreferencesChanged();
 #endif
 
index 08af39d..aa1f31f 100644 (file)
@@ -153,7 +153,7 @@ void CachedPage::restore(Page& page)
 
     page.setNeedsRecalcStyleInAllFrames();
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     if (m_needsCaptionPreferencesChanged)
         page.captionPreferencesChanged();
 #endif
@@ -173,7 +173,7 @@ void CachedPage::clear()
     ASSERT(m_cachedMainFrame);
     m_cachedMainFrame->clear();
     m_cachedMainFrame = nullptr;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     m_needsCaptionPreferencesChanged = false;
 #endif
     m_needsDeviceOrPageScaleChanged = false;
index 0df16fc..6d97fd9 100644 (file)
@@ -51,7 +51,7 @@ public:
     
     CachedFrame* cachedMainFrame() { return m_cachedMainFrame.get(); }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     void markForCaptionPreferencesChanged() { m_needsCaptionPreferencesChanged = true; }
 #endif
 
@@ -63,7 +63,7 @@ private:
     Page& m_page;
     MonotonicTime m_expirationTime;
     std::unique_ptr<CachedFrame> m_cachedMainFrame;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     bool m_needsCaptionPreferencesChanged { false };
 #endif
     bool m_needsDeviceOrPageScaleChanged { false };
index 0abacaa..63bd510 100644 (file)
@@ -244,9 +244,7 @@ String HTMLLinkElement::as() const
         || (RuntimeEnabledFeatures::sharedFeatures().mediaPreloadingEnabled()
             && (equalLettersIgnoringASCIICase(as, "video")
                 || equalLettersIgnoringASCIICase(as, "audio")))
-#if ENABLE(VIDEO_TRACK)
         || equalLettersIgnoringASCIICase(as, "track")
-#endif
         || equalLettersIgnoringASCIICase(as, "font"))
         return as.convertToASCIILowercase();
     return String();
index 87ceb40..58bfca1 100644 (file)
@@ -31,6 +31,7 @@
 #include "ApplicationCacheHost.h"
 #include "ApplicationCacheResource.h"
 #include "Attribute.h"
+#include "AudioTrackList.h"
 #include "Blob.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
 #include "FullscreenManager.h"
 #include "HTMLParserIdioms.h"
 #include "HTMLSourceElement.h"
+#include "HTMLTrackElement.h"
 #include "HTMLVideoElement.h"
+#include "InbandGenericTextTrack.h"
+#include "InbandTextTrackPrivate.h"
+#include "InbandWebVTTTextTrack.h"
 #include "InspectorInstrumentation.h"
 #include "JSDOMException.h"
 #include "JSDOMPromiseDeferred.h"
@@ -87,6 +92,7 @@
 #include "RenderVideo.h"
 #include "RenderView.h"
 #include "ResourceLoadInfo.h"
+#include "RuntimeEnabledFeatures.h"
 #include "ScriptController.h"
 #include "ScriptDisallowedScope.h"
 #include "ScriptSourceCode.h"
 #include "Settings.h"
 #include "ShadowRoot.h"
 #include "SleepDisabler.h"
+#include "TextTrackCueList.h"
+#include "TextTrackList.h"
 #include "TimeRanges.h"
 #include "UserContentController.h"
 #include "UserGestureIndicator.h"
 #include "VideoPlaybackQuality.h"
+#include "VideoTrackList.h"
 #include <JavaScriptCore/ScriptObject.h>
 #include <JavaScriptCore/Uint8Array.h>
 #include <limits>
 #include <wtf/Ref.h>
 #include <wtf/text/CString.h>
 
-#if ENABLE(VIDEO_TRACK)
-#include "AudioTrackList.h"
-#include "HTMLTrackElement.h"
-#include "InbandGenericTextTrack.h"
-#include "InbandTextTrackPrivate.h"
-#include "InbandWebVTTTextTrack.h"
-#include "RuntimeEnabledFeatures.h"
-#include "TextTrackCueList.h"
-#include "TextTrackList.h"
-#include "VideoTrackList.h"
-#endif
-
 #if ENABLE(WEB_AUDIO)
 #include "AudioSourceProvider.h"
 #include "MediaElementAudioSourceNode.h"
@@ -282,8 +279,6 @@ String convertEnumerationToString(HTMLMediaElement::TextTrackVisibilityCheckType
     return values[static_cast<size_t>(enumerationValue)];
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 class TrackDisplayUpdateScope {
 public:
     TrackDisplayUpdateScope(HTMLMediaElement& element)
@@ -300,8 +295,6 @@ private:
     HTMLMediaElement& m_element;
 };
 
-#endif
-
 struct HTMLMediaElement::TrackGroup {
     enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, Other };
 
@@ -447,11 +440,9 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum
     , m_haveSetUpCaptionContainer(false)
     , m_isScrubbingRemotely(false)
     , m_waitingToEnterFullscreen(false)
-#if ENABLE(VIDEO_TRACK)
     , m_tracksAreReady(true)
     , m_haveVisibleTextTrack(false)
     , m_processingPreferenceChange(false)
-#endif
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     , m_remote(RemotePlayback::create(*this))
 #endif
@@ -556,14 +547,12 @@ HTMLMediaElement::~HTMLMediaElement()
     AudioSession::sharedSession().removeMutedStateObserver(this);
 #endif
 
-#if ENABLE(VIDEO_TRACK)
     if (m_audioTracks)
         m_audioTracks->clearElement();
     if (m_textTracks)
         m_textTracks->clearElement();
     if (m_videoTracks)
         m_videoTracks->clearElement();
-#endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     if (hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent) || m_remote->hasAvailabilityCallbacks()) {
@@ -664,10 +653,8 @@ void HTMLMediaElement::registerWithDocument(Document& document)
 
     document.registerForVisibilityStateChangedCallbacks(*this);
 
-#if ENABLE(VIDEO_TRACK)
     if (m_requireCaptionPreferencesChangedCallbacks)
         document.registerForCaptionPreferencesChangedCallbacks(*this);
-#endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     document.registerForDocumentSuspensionCallbacks(*this);
@@ -687,10 +674,8 @@ void HTMLMediaElement::unregisterWithDocument(Document& document)
 
     document.unregisterForVisibilityStateChangedCallbacks(*this);
 
-#if ENABLE(VIDEO_TRACK)
     if (m_requireCaptionPreferencesChangedCallbacks)
         document.unregisterForCaptionPreferencesChangedCallbacks(*this);
-#endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     document.unregisterForDocumentSuspensionCallbacks(*this);
@@ -796,10 +781,8 @@ void HTMLMediaElement::finishParsingChildren()
     HTMLElement::finishParsingChildren();
     m_parsingInProgress = false;
 
-#if ENABLE(VIDEO_TRACK)
     if (childrenOfType<HTMLTrackElement>(*this).first())
         scheduleConfigureTextTracks();
-#endif
 }
 
 bool HTMLMediaElement::rendererIsNeeded(const RenderStyle& style)
@@ -1209,9 +1192,7 @@ void HTMLMediaElement::prepareForLoad()
         // 4.11 - Update the duration attribute to Not-a-Number (NaN).
 
         updateMediaController();
-#if ENABLE(VIDEO_TRACK)
         updateActiveTextTrackCues(MediaTime::zeroTime());
-#endif
     }
 
     // 7 - Set the playbackRate attribute to the value of the defaultPlaybackRate attribute.
@@ -1278,7 +1259,6 @@ void HTMLMediaElement::selectMediaResource()
         ALWAYS_LOG(logSiteIdentifier, "lambda(), task fired");
 
         // 5. If the media element’s blocked-on-parser flag is false, then populate the list of pending text tracks.
-#if ENABLE(VIDEO_TRACK)
         // HTMLMediaElement::textTracksAreReady will need "... the text tracks whose mode was not in the
         // disabled state when the element's resource selection algorithm last started".
         // FIXME: Update this to match "populate the list of pending text tracks" step.
@@ -1290,7 +1270,6 @@ void HTMLMediaElement::selectMediaResource()
                     m_textTracksWhenResourceSelectionBegan.append(track);
             }
         }
-#endif
 
         enum Mode { None, Object, Attribute, Children };
         Mode mode = None;
@@ -1557,8 +1536,6 @@ void HTMLMediaElement::loadResource(const URL& initialURL, ContentType& contentT
     updateRenderer();
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 struct HTMLMediaElement::CueData {
     WTF_MAKE_STRUCT_FAST_ALLOCATED;
     PODIntervalTree<MediaTime, TextTrackCue*> cueTree;
@@ -1991,8 +1968,6 @@ CueList HTMLMediaElement::currentlyActiveCues() const
     return m_cueData->currentlyActiveCues;
 }
 
-#endif
-
 static inline bool isAllowedToLoadMediaURL(HTMLMediaElement& element, const URL& url, bool isInUserAgentShadowTree)
 {
     // Elements in user agent show tree should load whatever the embedding document policy is.
@@ -2320,7 +2295,7 @@ SuccessOr<MediaPlaybackDenialReason> HTMLMediaElement::canTransitionFromAutoplay
     else
         ALWAYS_LOG(LOGIDENTIFIER, "can transition!");
 #endif
-    
+
     return permitted;
 }
 
@@ -2342,18 +2317,12 @@ void HTMLMediaElement::setReadyState(MediaPlayer::ReadyState state)
     ReadyState oldState = m_readyState;
     ReadyState newState = static_cast<ReadyState>(state);
 
-#if ENABLE(VIDEO_TRACK)
     bool tracksAreReady = textTracksAreReady();
 
     if (newState == oldState && m_tracksAreReady == tracksAreReady)
         return;
 
     m_tracksAreReady = tracksAreReady;
-#else
-    if (newState == oldState)
-        return;
-    bool tracksAreReady = true;
-#endif
 
     ALWAYS_LOG(LOGIDENTIFIER, "new state = ", state, ", current state = ", m_readyState);
 
@@ -2473,9 +2442,7 @@ void HTMLMediaElement::setReadyState(MediaPlayer::ReadyState state)
 
     updatePlayState();
     updateMediaController();
-#if ENABLE(VIDEO_TRACK)
     updateActiveTextTrackCues(currentMediaTime());
-#endif
 }
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
@@ -2501,7 +2468,7 @@ void HTMLMediaElement::mediaPlayerKeyNeeded(Uint8Array* initData)
 
     if (!hasEventListeners("webkitneedkey")
 #if ENABLE(ENCRYPTED_MEDIA)
-        // Only fire an error if ENCRYPTED_MEDIA is not enabled, to give clients of the 
+        // Only fire an error if ENCRYPTED_MEDIA is not enabled, to give clients of the
         // "encrypted" event a chance to handle it without resulting in a synthetic error.
         && (!RuntimeEnabledFeatures::sharedFeatures().encryptedMediaAPIEnabled() || document().quirks().hasBrokenEncryptedMediaAPISupportQuirk())
 #endif
@@ -3461,7 +3428,7 @@ void HTMLMediaElement::playInternal()
         ALWAYS_LOG(LOGIDENTIFIER, "returning because of interruption");
         return;
     }
-    
+
     // 4.8.10.9. Playing the media resource
     if (!m_player || m_networkState == NETWORK_EMPTY)
         selectMediaResource();
@@ -3673,7 +3640,7 @@ ExceptionOr<void> HTMLMediaElement::setVolume(double volume)
     });
 
 #endif
-    
+
     return { };
 }
 
@@ -3868,9 +3835,7 @@ void HTMLMediaElement::playbackProgressTimerFired()
     if (!requestedPlaybackRate())
         return;
 
-#if ENABLE(VIDEO_TRACK)
     updateActiveTextTrackCues(currentMediaTime());
-#endif
 
 #if ENABLE(MEDIA_SOURCE)
     if (m_mediaSource)
@@ -3928,8 +3893,6 @@ double HTMLMediaElement::percentLoaded() const
     return buffered.toDouble() / duration.toDouble();
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 void HTMLMediaElement::mediaPlayerDidAddAudioTrack(AudioTrackPrivate& track)
 {
     if (isPlaying() && !m_mediaSession->playbackPermitted()) {
@@ -4527,7 +4490,6 @@ void HTMLMediaElement::configureTextTracks()
     updateCaptionContainer();
     configureTextTrackDisplay();
 }
-#endif
 
 bool HTMLMediaElement::havePotentialSourceChild()
 {
@@ -4724,9 +4686,7 @@ void HTMLMediaElement::mediaPlayerTimeChanged()
 {
     ALWAYS_LOG(LOGIDENTIFIER);
 
-#if ENABLE(VIDEO_TRACK)
     updateActiveTextTrackCues(currentMediaTime());
-#endif
 
     beginProcessingMediaPlayerCallback();
 
@@ -5087,10 +5047,8 @@ void HTMLMediaElement::mediaPlayerCharacteristicChanged()
 
     beginProcessingMediaPlayerCallback();
 
-#if ENABLE(VIDEO_TRACK)
     if (captionDisplayMode() == CaptionUserPreferences::Automatic && m_subtitleTrackLanguage != m_player->languageOfPrimaryAudioTrack())
         markCaptionAndSubtitleTracksAsUnconfigured(AfterDelay);
-#endif
 
     if (potentiallyPlaying() && displayMode() == PosterWaitingForVideo) {
         setDisplayMode(Video);
@@ -5493,13 +5451,11 @@ void HTMLMediaElement::userCancelledLoad()
     m_readyState = HAVE_NOTHING;
     updateMediaController();
 
-#if ENABLE(VIDEO_TRACK)
     auto* context = scriptExecutionContext();
     if (!context || context->activeDOMObjectsAreStopped())
         return; // Document is about to be destructed. Avoid updating layout in updateActiveTextTrackCues.
 
     updateActiveTextTrackCues(MediaTime::zeroTime());
-#endif
 }
 
 void HTMLMediaElement::clearMediaPlayer()
@@ -5515,9 +5471,7 @@ void HTMLMediaElement::clearMediaPlayer()
 
     m_blob = nullptr;
 
-#if ENABLE(VIDEO_TRACK)
     forgetResourceSpecificTracks();
-#endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     if (hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent) || m_remote->hasAvailabilityCallbacks()) {
@@ -5549,10 +5503,8 @@ void HTMLMediaElement::clearMediaPlayer()
 
     m_loadState = WaitingForSource;
 
-#if ENABLE(VIDEO_TRACK)
     if (m_textTracks)
         configureTextTrackDisplay();
-#endif
 
     m_mediaSession->clientCharacteristicsChanged();
     m_mediaSession->canProduceAudioChanged();
@@ -5735,7 +5687,6 @@ void HTMLMediaElement::visibilityStateChanged()
     }
 }
 
-#if ENABLE(VIDEO_TRACK)
 bool HTMLMediaElement::requiresTextTrackRepresentation() const
 {
     return (m_videoFullscreenMode != VideoFullscreenModeNone) && m_player ? m_player->requiresTextTrackRepresentation() : false;
@@ -5757,7 +5708,6 @@ void HTMLMediaElement::syncTextTrackBounds()
     if (m_player)
         m_player->syncTextTrackBounds();
 }
-#endif // ENABLE(VIDEO_TRACK)
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
 void HTMLMediaElement::webkitShowPlaybackTargetPicker()
@@ -6093,7 +6043,7 @@ WEBCORE_EXPORT void HTMLMediaElement::setVideoFullscreenStandby(bool value)
         return;
 
     m_videoFullscreenStandby = value;
-    
+
 #if ENABLE(VIDEO_PRESENTATION_MODE)
     if (m_player)
         m_player->videoFullscreenStandbyChanged();
@@ -6200,9 +6150,7 @@ void HTMLMediaElement::setVideoFullscreenLayer(PlatformLayer* platformLayer, WTF
 
     m_player->setVideoFullscreenLayer(platformLayer, WTFMove(completionHandler));
     invalidateStyleAndLayerComposition();
-#if ENABLE(VIDEO_TRACK)
     updateTextTrackDisplay();
-#endif
 }
 
 void HTMLMediaElement::setVideoFullscreenFrame(FloatRect frame)
@@ -6233,7 +6181,6 @@ bool HTMLMediaElement::hasClosedCaptions() const
     if (m_player && m_player->hasClosedCaptions())
         return true;
 
-#if ENABLE(VIDEO_TRACK)
     if (!m_textTracks)
         return false;
 
@@ -6244,7 +6191,6 @@ bool HTMLMediaElement::hasClosedCaptions() const
         if (track.kind() == TextTrack::Kind::Captions || track.kind() == TextTrack::Kind::Subtitles)
             return true;
     }
-#endif
 
     return false;
 }
@@ -6254,8 +6200,6 @@ bool HTMLMediaElement::closedCaptionsVisible() const
     return m_closedCaptionsVisible;
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 bool HTMLMediaElement::textTracksAreReady() const
 {
     // 4.8.10.12.1 Text track model
@@ -6337,8 +6281,6 @@ void HTMLMediaElement::updateTextTrackRepresentationImageIfNeeded()
     m_mediaControlsHost->updateTextTrackRepresentationImageIfNeeded();
 }
 
-#endif
-
 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
 {
     ALWAYS_LOG(LOGIDENTIFIER, closedCaptionVisible);
@@ -6351,11 +6293,8 @@ void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
     m_closedCaptionsVisible = closedCaptionVisible;
     m_player->setClosedCaptionsVisible(closedCaptionVisible);
 
-#if ENABLE(VIDEO_TRACK)
     markCaptionAndSubtitleTracksAsUnconfigured(Immediately);
     updateTextTrackDisplay();
-#else
-#endif
 }
 
 void HTMLMediaElement::setWebkitClosedCaptionsVisible(bool visible)
@@ -6505,8 +6444,6 @@ void HTMLMediaElement::configureMediaControls()
     ensureMediaControlsShadowRoot();
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 void HTMLMediaElement::captionPreferencesChanged()
 {
     if (!isVideo())
@@ -6570,8 +6507,6 @@ void HTMLMediaElement::markCaptionAndSubtitleTracksAsUnconfigured(ReconfigureMod
         scheduleConfigureTextTracks();
 }
 
-#endif
-
 void HTMLMediaElement::createMediaPlayer()
 {
     INFO_LOG(LOGIDENTIFIER);
@@ -6585,9 +6520,7 @@ void HTMLMediaElement::createMediaPlayer()
     detachMediaSource();
 #endif
 
-#if ENABLE(VIDEO_TRACK)
     forgetResourceSpecificTracks();
-#endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     if (m_isPlayingToWirelessTarget)
@@ -8006,7 +7939,7 @@ void HTMLMediaElement::setInActiveDocument(bool inActiveDocument)
 
 HTMLMediaElementEnums::BufferingPolicy HTMLMediaElement::bufferingPolicy() const
 {
-    return m_bufferingPolicy;    
+    return m_bufferingPolicy;
 }
 
 bool HTMLMediaElement::hasMediaStreamSource() const
index 2b68de8..15c9c3c 100644 (file)
@@ -28,7 +28,9 @@
 #if ENABLE(VIDEO)
 
 #include "ActiveDOMObject.h"
+#include "AudioTrack.h"
 #include "AutoplayEvent.h"
+#include "CaptionUserPreferences.h"
 #include "DeferrableTask.h"
 #include "GenericEventQueue.h"
 #include "HTMLElement.h"
 #include "MediaPlayer.h"
 #include "MediaProducer.h"
 #include "MediaSessionIdentifier.h"
+#include "TextTrack.h"
+#include "VideoTrack.h"
 #include "VisibilityChangeClient.h"
 #include <wtf/Function.h>
 #include <wtf/LoggerHelper.h>
 #include <wtf/WeakPtr.h>
 
-#if ENABLE(VIDEO_TRACK)
-#include "AudioTrack.h"
-#include "CaptionUserPreferences.h"
-#include "TextTrack.h"
-#include "VideoTrack.h"
-#endif
-
 #if USE(AUDIO_SESSION) && PLATFORM(MAC)
 #include "AudioSession.h"
 #endif
@@ -106,10 +103,8 @@ template<typename, typename> class PODInterval;
 class RemotePlayback;
 #endif
 
-#if ENABLE(VIDEO_TRACK)
 using CueInterval = PODInterval<MediaTime, TextTrackCue*>;
 using CueList = Vector<CueInterval>;
-#endif
 
 using MediaProvider = Optional<Variant<
 #if ENABLE(MEDIA_STREAM)
@@ -129,11 +124,9 @@ class HTMLMediaElement
     , private MediaPlayerClient
     , private MediaProducer
     , private VisibilityChangeClient
-#if ENABLE(VIDEO_TRACK)
     , private AudioTrackClient
     , private TextTrackClient
     , private VideoTrackClient
-#endif
 #if USE(AUDIO_SESSION) && PLATFORM(MAC)
     , private AudioSession::MutedStateObserver
 #endif
@@ -333,7 +326,6 @@ public:
 
     bool shouldForceControlsDisplay() const;
 
-#if ENABLE(VIDEO_TRACK)
     ExceptionOr<TextTrack&> addTextTrack(const String& kind, const String& label, const String& language);
 
     AudioTrackList& ensureAudioTracks();
@@ -399,7 +391,6 @@ public:
     using HTMLMediaElementEnums::TextTrackVisibilityCheckType;
     void textTrackReadyStateChanged(TextTrack*);
     void updateTextTrackRepresentationImageIfNeeded();
-#endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     void webkitShowPlaybackTargetPicker();
@@ -788,7 +779,6 @@ private:
 
     URL selectNextSourceChild(ContentType*, String* keySystem, InvalidURLAction);
 
-#if ENABLE(VIDEO_TRACK)
     bool ignoreTrackDisplayUpdateRequests() const;
     void beginIgnoringTrackDisplayUpdateRequests();
     void endIgnoringTrackDisplayUpdateRequests();
@@ -803,7 +793,6 @@ private:
     bool textTracksAreReady() const;
     void configureTextTrackDisplay(TextTrackVisibilityCheckType = CheckTextTrackVisibility);
     void updateTextTrackDisplay();
-#endif
 
     // These "internal" functions do not check user gesture restrictions.
     void playInternal();
@@ -1114,7 +1103,6 @@ private:
     bool m_isScrubbingRemotely : 1;
     bool m_waitingToEnterFullscreen : 1;
 
-#if ENABLE(VIDEO_TRACK)
     bool m_tracksAreReady : 1;
     bool m_haveVisibleTextTrack : 1;
     bool m_processingPreferenceChange : 1;
@@ -1137,7 +1125,6 @@ private:
     int m_ignoreTrackDisplayUpdate { 0 };
 
     bool m_requireCaptionPreferencesChangedCallbacks { false };
-#endif
 
 #if ENABLE(WEB_AUDIO)
     // This is a weak reference, since m_audioSourceNode holds a reference to us.
index 7a72dd0..4cfea16 100644 (file)
@@ -109,10 +109,10 @@ typedef (
     [Conditional=ENCRYPTED_MEDIA, EnabledAtRuntime=EncryptedMediaAPI, DisabledByQuirk=hasBrokenEncryptedMediaAPISupport] attribute EventHandler onwaitingforkey;
     [Conditional=ENCRYPTED_MEDIA, EnabledAtRuntime=EncryptedMediaAPI, DisabledByQuirk=hasBrokenEncryptedMediaAPISupport] Promise<void> setMediaKeys(MediaKeys? mediaKeys);
 
-    [Conditional=VIDEO_TRACK, MayThrowException] TextTrack addTextTrack(DOMString kind, optional DOMString label = "", optional DOMString language = "");
-    [Conditional=VIDEO_TRACK, ImplementedAs=ensureAudioTracks] readonly attribute AudioTrackList audioTracks;
-    [Conditional=VIDEO_TRACK, ImplementedAs=ensureTextTracks] readonly attribute TextTrackList textTracks;
-    [Conditional=VIDEO_TRACK, ImplementedAs=ensureVideoTracks] readonly attribute VideoTrackList videoTracks;
+    [MayThrowException] TextTrack addTextTrack(DOMString kind, optional DOMString label = "", optional DOMString language = "");
+    [ImplementedAs=ensureAudioTracks] readonly attribute AudioTrackList audioTracks;
+    [ImplementedAs=ensureTextTracks] readonly attribute TextTrackList textTracks;
+    [ImplementedAs=ensureVideoTracks] readonly attribute VideoTrackList videoTracks;
 
     [Reflect] attribute DOMString mediaGroup;
 
index dad8a3c..f67a9ba 100644 (file)
@@ -135,7 +135,7 @@ thead interfaceName=HTMLTableSectionElement
 time
 title
 tr interfaceName=HTMLTableRowElement
-track wrapperOnlyIfMediaIsAvailable, conditional=VIDEO_TRACK
+track wrapperOnlyIfMediaIsAvailable, conditional=VIDEO
 tt interfaceName=HTMLElement
 u interfaceName=HTMLElement
 ul interfaceName=HTMLUListElement
index afa7c66..8ae5e7d 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "HTMLTrackElement.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "ContentSecurityPolicy.h"
 #include "Event.h"
index 434f214..2239e81 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "ActiveDOMObject.h"
 #include "HTMLElement.h"
index fe40aa1..c1a4e38 100644 (file)
@@ -25,7 +25,7 @@
 
 [
     ActiveDOMObject,
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
 ] interface HTMLTrackElement : HTMLElement {
     [CEReactions=NotNeeded] attribute DOMString kind;
     [CEReactions=NotNeeded, Reflect, URL] attribute USVString src;
index eaebab4..f0b7fe3 100644 (file)
@@ -4593,8 +4593,8 @@ ExceptionOr<void> WebGLRenderingContextBase::texImageSourceHelper(TexImageFuncti
             return { };
         texImageImpl(functionID, target, level, internalformat, xoffset, yoffset, zoffset, format, type, image.get(), GraphicsContextGL::DOMSource::Video, m_unpackFlipY, m_unpackPremultiplyAlpha, inputSourceImageRect, depth, unpackImageHeight);
         return { };
-#endif // ENABLE(VIDEO)
     }
+#endif // ENABLE(VIDEO)
     );
 
     return WTF::visit(visitor, source);
@@ -5012,7 +5012,9 @@ bool WebGLRenderingContextBase::validateTexFuncParameters(const char* functionNa
     // temporary data based on this combination, so it must be legal.
     if (sourceType == SourceHTMLImageElement
         || sourceType == SourceHTMLCanvasElement
+#if ENABLE(VIDEO)
         || sourceType == SourceHTMLVideoElement
+#endif
         || sourceType == SourceImageData
         || sourceType == SourceImageBitmap) {
         if (!validateTexImageSourceFormatAndType(functionName, functionType, internalformat, format, type))
index 1d3e92d..da052e0 100644 (file)
@@ -64,8 +64,6 @@ WTF_MAKE_ISO_ALLOCATED_IMPL(MediaControlTextTrackContainerElement);
 
 using namespace HTMLNames;
 
-#if ENABLE(VIDEO_TRACK)
-
 Ref<MediaControlTextTrackContainerElement> MediaControlTextTrackContainerElement::create(Document& document, HTMLMediaElement& mediaElement)
 {
     auto element = adoptRef(*new MediaControlTextTrackContainerElement(document, mediaElement));
@@ -479,8 +477,6 @@ WTFLogChannel& MediaControlTextTrackContainerElement::logChannel() const
 }
 #endif // !RELEASE_LOG_DISABLED
 
-#endif // ENABLE(VIDEO_TRACK)
-
 // ----------------------------
 
 } // namespace WebCore
index 63e9ee5..57e3bef 100644 (file)
@@ -40,8 +40,6 @@
 
 namespace WebCore {
 
-#if ENABLE(VIDEO_TRACK)
-
 class HTMLMediaElement;
 class VTTCue;
 
@@ -107,8 +105,6 @@ private:
     bool m_needsGenerateTextTrackRepresentation { false };
 };
 
-#endif
-
 } // namespace WebCore
 
 #endif // ENABLE(VIDEO)
index 23a91d0..809f1bc 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "AudioTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLMediaElement.h"
 #include <wtf/NeverDestroyed.h>
index a9a956c..99a4532 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrackPrivate.h"
 #include "TrackBase.h"
index dcdb7a6..7fdc96d 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     ExportMacro=WEBCORE_EXPORT,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction
index 5875fd5..6405817 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrackList.h"
 
index fcdc934..8ae0342 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TrackListBase.h"
 
@@ -61,4 +61,4 @@ static_assert(sizeof(AudioTrackList) == sizeof(TrackListBase), "");
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 7781c09..ad4930b 100644 (file)
@@ -25,7 +25,7 @@
 
 [
     ActiveDOMObject,
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction,
 ] interface AudioTrackList : EventTarget {
index 4bc0275..047922d 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "DataCue.h"
 
index 311e550..bf6ef2a 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "SerializedPlatformDataCue.h"
 #include "TextTrackCue.h"
index b9e357a..1fb1eb8 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     Constructor(unrestricted double startTime, unrestricted double endTime, ArrayBuffer data),
     Constructor(unrestricted double startTime, unrestricted double endTime, any value, optional DOMString type),
     ConstructorCallWith=Document
index 0dc0d94..9ccb992 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "InbandDataTextTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "DataCue.h"
 #include "HTMLMediaElement.h"
index 3c5c193..b4df65a 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "InbandTextTrack.h"
 
index 14f42b6..6312117 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "InbandGenericTextTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLMediaElement.h"
 #include "InbandTextTrackPrivate.h"
index fac3dc6..d41fbf2 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "InbandTextTrack.h"
 #include "TextTrackCueGeneric.h"
index 85f28d1..a6cb182 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "InbandTextTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLMediaElement.h"
 #include "InbandDataTextTrack.h"
index ddcb8a0..10d7182 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "InbandTextTrackPrivateClient.h"
 #include "TextTrack.h"
@@ -94,4 +94,4 @@ SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::InbandTextTrack)
     static bool isType(const WebCore::TextTrack& track) { return track.isInband(); }
 SPECIALIZE_TYPE_TRAITS_END()
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index e1f6485..05d7510 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "InbandWebVTTTextTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "InbandTextTrackPrivate.h"
 #include "Logging.h"
index 1415a2a..84ee0e5 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "InbandTextTrack.h"
 #include "WebVTTParser.h"
@@ -60,4 +60,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index b250020..780be32 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "LoadableTextTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLTrackElement.h"
 #include "TextTrackCueList.h"
index 3d223a0..9c98e56 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TextTrack.h"
 #include "TextTrackLoader.h"
@@ -76,4 +76,4 @@ SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::LoadableTextTrack)
     static bool isType(const WebCore::TextTrack& track) { return track.trackType() == WebCore::TextTrack::TrackElement; }
 SPECIALIZE_TYPE_TRAITS_END()
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index d4e0f69..cf08602 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "TextTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "DataCue.h"
 #include "Document.h"
index 4fe46fe..db33651 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "ContextDestructionObserver.h"
 #include "TextTrackCue.h"
index 4b16e9d..7a1653f 100644 (file)
@@ -27,7 +27,7 @@ enum TextTrackMode { "disabled", "hidden", "showing" };
 enum TextTrackKind { "subtitles", "captions", "descriptions", "chapters", "metadata", "forced" };
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     ExportToWrappedFunction,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction,
index 7dc8aa3..d38a4da 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "TextTrackCue.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
index e2f4a50..54a3481 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "DocumentFragment.h"
 #include "HTMLElement.h"
index 7e02721..517f872 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     CustomIsReachable,
     CustomToJSObject,
     JSCustomMarkFunction,
index 88710a0..109a49b 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TextTrackCueGeneric.h"
 
index 1fcd419..41279e1 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "Color.h"
 #include "VTTCue.h"
index 17b352b..2ee4cbc 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     JSGenerateToJSObject,
     JSGenerateToNativeObject,
     NoInterfaceObject,
index 43db8fe..7eb9c44 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TextTrackCueList.h"
 
index 66ff08e..1e12c09 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TextTrackCue.h"
 
@@ -64,4 +64,4 @@ inline unsigned TextTrackCueList::length() const
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 6aaafdb..a432b7e 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     ImplementationLacksVTable,
 ] interface TextTrackCueList {
     readonly attribute unsigned long length;
index 9532d4d..ff9a149 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TextTrackList.h"
 
index 0281bae..cd2ff7b 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TrackListBase.h"
 
@@ -73,4 +73,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 35820a5..db39099 100644 (file)
@@ -25,7 +25,7 @@
 
 [
     ActiveDOMObject,
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction,
 ] interface TextTrackList : EventTarget {
index df1786f..09b0b7a 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/Language.h>
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLMediaElement.h"
 
index 0c2ecf5..2107d40 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include <wtf/LoggerHelper.h>
 #include <wtf/WeakPtr.h>
index 50fa732..66320d7 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TrackEvent.h"
 #include <wtf/IsoMallocInlines.h>
index 24942ef..33ed674 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrack.h"
 #include "Event.h"
@@ -68,4 +68,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 8a93304..586aa15 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     Constructor(DOMString type, optional TrackEventInit eventInitDict)
 ] interface TrackEvent : Event {
     readonly attribute (VideoTrack or AudioTrack or TextTrack)? track;
index bdba8f7..2643df4 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TrackListBase.h"
 
index 4a3cc9a..65e1c79 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "ActiveDOMObject.h"
 #include "EventTarget.h"
@@ -90,4 +90,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 3a8a61a..612a574 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "VTTCue.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
index 2bce032..6e96507 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLElement.h"
 #include "TextTrackCue.h"
index 8ee37f7..ecac0f5 100644 (file)
@@ -27,7 +27,7 @@ enum AutoKeyword { "auto" };
 typedef (double or AutoKeyword) LineAndPositionSetting;
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     Constructor(double startTime, double endTime, DOMString text),
     ConstructorCallWith=Document,
     JSGenerateToJSObject,
index cd8c87b..7f173fb 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "VTTRegion.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "DOMRect.h"
 #include "DOMTokenList.h"
index d6762fc..b9903ab 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "ContextDestructionObserver.h"
 #include "FloatPoint.h"
index 7a3e4a7..d467e30 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     Constructor(),
     ConstructorCallWith=ScriptExecutionContext,
     JSGenerateToNativeObject,
index cfc1622..f762d97 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "VTTRegionList.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 namespace WebCore {
 
index 7f9fd55..14f8115 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "VTTRegion.h"
 
@@ -68,4 +68,4 @@ inline void VTTRegionList::clear()
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 8431d8b..b102940 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     ImplementationLacksVTable,
     NoInterfaceObject,
 ] interface VTTRegionList {
index 38ed51c..8be1f49 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "VideoTrack.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLMediaElement.h"
 #include "VideoTrackList.h"
index 13f7a93..179e713 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TrackBase.h"
 #include "VideoTrackPrivate.h"
index 80eee2c..e01c48b 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 [
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction
 ] interface VideoTrack {
index f4028ee..8486566 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "VideoTrackList.h"
 
index 90ebe78..9660df6 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TrackListBase.h"
 
@@ -62,4 +62,4 @@ static_assert(sizeof(VideoTrackList) == sizeof(TrackListBase), "");
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 18f40ed..5f2b23a 100644 (file)
@@ -25,7 +25,7 @@
 
 [
     ActiveDOMObject,
-    Conditional=VIDEO_TRACK,
+    Conditional=VIDEO,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction,
 ] interface VideoTrackList : EventTarget {
index 3d82f60..9d2c87d 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "WebVTTElement.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLSpanElement.h"
 #include "RubyElement.h"
index 28471d6..decbe17 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "HTMLElement.h"
 #include <wtf/NeverDestroyed.h>
@@ -90,4 +90,4 @@ SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::WebVTTElement)
     static bool isType(const WebCore::Node& node) { return node.isWebVTTElement(); }
 SPECIALIZE_TYPE_TRAITS_END()
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 3ca48de..9f1d2d4 100644 (file)
  */
 
 #include "config.h"
-
-#if ENABLE(VIDEO_TRACK)
-
 #include "WebVTTParser.h"
 
+#if ENABLE(VIDEO)
+
 #include "HTMLParserIdioms.h"
 #include "ISOVTTCue.h"
 #include "ProcessingInstruction.h"
index 9bee734..fa33a2c 100644 (file)
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "BufferedLineReader.h"
 #include "DocumentFragment.h"
@@ -203,4 +203,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 73eacba..f0f458d 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 namespace WebCore {
 
@@ -95,4 +95,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index f200cba..57df653 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "WebVTTTokenizer.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "MarkupTokenizerInlines.h"
 #include <wtf/text/StringBuilder.h>
index 2b0c0c0..103767e 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "InputStreamPreprocessor.h"
 #include "WebVTTToken.h"
@@ -52,4 +52,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 9d66afd..a458571 100644 (file)
@@ -131,10 +131,8 @@ Optional<CachedResource::Type> LinkLoader::resourceTypeFromAsAttribute(const Str
         return CachedResource::Type::MediaResource;
     if (equalLettersIgnoringASCIICase(as, "font"))
         return CachedResource::Type::FontResource;
-#if ENABLE(VIDEO_TRACK)
     if (equalLettersIgnoringASCIICase(as, "track"))
         return CachedResource::Type::TextTrackResource;
-#endif
     return WTF::nullopt;
 }
 
@@ -149,10 +147,8 @@ static std::unique_ptr<LinkPreloadResourceClient> createLinkPreloadResourceClien
         return makeUnique<LinkPreloadStyleResourceClient>(loader, downcast<CachedCSSStyleSheet>(resource));
     case CachedResource::Type::FontResource:
         return makeUnique<LinkPreloadFontResourceClient>(loader, downcast<CachedFont>(resource));
-#if ENABLE(VIDEO_TRACK)
     case CachedResource::Type::TextTrackResource:
         return makeUnique<LinkPreloadDefaultResourceClient>(loader, downcast<CachedTextTrack>(resource));
-#endif
     case CachedResource::Type::MediaResource:
         ASSERT(RuntimeEnabledFeatures::sharedFeatures().mediaPreloadingEnabled());
         FALLTHROUGH;
@@ -196,11 +192,8 @@ bool LinkLoader::isSupportedType(CachedResource::Type resourceType, const String
         if (!RuntimeEnabledFeatures::sharedFeatures().mediaPreloadingEnabled())
             ASSERT_NOT_REACHED();
         return MIMETypeRegistry::isSupportedMediaMIMEType(mimeType);
-
-#if ENABLE(VIDEO_TRACK)
     case CachedResource::Type::TextTrackResource:
         return MIMETypeRegistry::isSupportedTextTrackMIMEType(mimeType);
-#endif
     case CachedResource::Type::RawResource:
 #if ENABLE(APPLICATION_MANIFEST)
     case CachedResource::Type::ApplicationManifest:
index 7f7f682..aaafd8f 100644 (file)
@@ -68,10 +68,9 @@ ResourceType toResourceType(CachedResource::Type type)
     case CachedResource::Type::RawResource:
         return ResourceType::Raw;
 
-#if ENABLE(VIDEO_TRACK)
     case CachedResource::Type::TextTrackResource:
         return ResourceType::Media;
-#endif
+
 #if ENABLE(APPLICATION_MANIFEST)
     case CachedResource::Type::ApplicationManifest:
         return ResourceType::Raw;
index bab2125..1c33fa8 100644 (file)
@@ -595,9 +595,7 @@ static void logResourceLoaded(Frame* frame, CachedResource::Type type)
         break;
 #endif
     case CachedResource::Type::LinkPrefetch:
-#if ENABLE(VIDEO_TRACK)
     case CachedResource::Type::TextTrackResource:
-#endif
         resourceType = DiagnosticLoggingKeys::otherKey();
         break;
     }
index 76a4e97..b241db6 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TextTrackLoader.h"
 
index a8648e4..4eb5c69 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
@@ -94,4 +94,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 79bd862..a412006 100644 (file)
@@ -102,7 +102,7 @@ ResourceLoadPriority CachedResource::defaultPriorityForResourceType(Type type)
         return ResourceLoadPriority::VeryLow;
     case Type::LinkPrefetch:
         return ResourceLoadPriority::VeryLow;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     case Type::TextTrackResource:
         return ResourceLoadPriority::Low;
 #endif
index 6f314f1..ca9df90 100644 (file)
@@ -82,9 +82,7 @@ public:
         XSLStyleSheet,
 #endif
         LinkPrefetch,
-#if ENABLE(VIDEO_TRACK)
         TextTrackResource,
-#endif
 #if ENABLE(APPLICATION_MANIFEST)
         ApplicationManifest,
 #endif
index 231edec..7873bf9 100644 (file)
@@ -35,6 +35,7 @@
 #include "CachedSVGDocument.h"
 #include "CachedSVGFont.h"
 #include "CachedScript.h"
+#include "CachedTextTrack.h"
 #include "CachedXSLStyleSheet.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "CachedApplicationManifest.h"
 #endif
 
-#if ENABLE(VIDEO_TRACK)
-#include "CachedTextTrack.h"
-#endif
-
 #if PLATFORM(IOS_FAMILY)
 #include "Device.h"
 #endif
@@ -144,10 +141,8 @@ static CachedResource* createResource(CachedResource::Type type, CachedResourceR
 #endif
     case CachedResource::Type::LinkPrefetch:
         return new CachedResource(WTFMove(request), CachedResource::Type::LinkPrefetch, sessionID, cookieJar);
-#if ENABLE(VIDEO_TRACK)
     case CachedResource::Type::TextTrackResource:
         return new CachedTextTrack(WTFMove(request), sessionID, cookieJar);
-#endif
 #if ENABLE(APPLICATION_MANIFEST)
     case CachedResource::Type::ApplicationManifest:
         return new CachedApplicationManifest(WTFMove(request), sessionID, cookieJar);
@@ -227,7 +222,7 @@ ResourceErrorOr<CachedResourceHandle<CachedFont>> CachedResourceLoader::requestF
     return castCachedResourceTo<CachedFont>(requestResource(CachedResource::Type::FontResource, WTFMove(request)));
 }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 ResourceErrorOr<CachedResourceHandle<CachedTextTrack>> CachedResourceLoader::requestTextTrack(CachedResourceRequest&& request)
 {
     return castCachedResourceTo<CachedTextTrack>(requestResource(CachedResource::Type::TextTrackResource, WTFMove(request)));
@@ -364,7 +359,7 @@ static MixedContentChecker::ContentType contentTypeFromResourceType(CachedResour
     case CachedResource::Type::LinkPrefetch:
         return MixedContentChecker::ContentType::Active;
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     case CachedResource::Type::TextTrackResource:
         return MixedContentChecker::ContentType::Active;
 #endif
@@ -400,7 +395,7 @@ bool CachedResourceLoader::checkInsecureContent(CachedResource::Type type, const
                 return false;
         }
         break;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     case CachedResource::Type::TextTrackResource:
 #endif
     case CachedResource::Type::MediaResource:
@@ -468,7 +463,7 @@ bool CachedResourceLoader::allowedByContentSecurityPolicy(CachedResource::Type t
             return false;
         break;
     case CachedResource::Type::MediaResource:
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     case CachedResource::Type::TextTrackResource:
 #endif
         if (!m_document->contentSecurityPolicy()->allowMediaFromSource(url, redirectResponseReceived))
@@ -765,7 +760,7 @@ static FetchOptions::Destination destinationForType(CachedResource::Type type)
     case CachedResource::Type::XSLStyleSheet:
         return FetchOptions::Destination::Xslt;
 #endif
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     case CachedResource::Type::TextTrackResource:
         return FetchOptions::Destination::Track;
 #endif
index 9acd31e..0d04e92 100644 (file)
@@ -97,7 +97,7 @@ public:
     ResourceErrorOr<CachedResourceHandle<CachedXSLStyleSheet>> requestXSLStyleSheet(CachedResourceRequest&&);
 #endif
     ResourceErrorOr<CachedResourceHandle<CachedResource>> requestLinkResource(CachedResource::Type, CachedResourceRequest&&);
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     ResourceErrorOr<CachedResourceHandle<CachedTextTrack>> requestTextTrack(CachedResourceRequest&&);
 #endif
 #if ENABLE(APPLICATION_MANIFEST)
index 0507c01..20ca2ce 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
-
 #include "CachedTextTrack.h"
 
 #include "CachedResourceClient.h"
@@ -66,5 +64,3 @@ void CachedTextTrack::finishLoading(SharedBuffer* data, const NetworkLoadMetrics
 }
 
 }
-
-#endif
index d5f42b2..e57a4fe 100644 (file)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
-
 #include "CachedResource.h"
 
 namespace WebCore {
@@ -46,5 +44,3 @@ private:
 } // namespace WebCore
 
 SPECIALIZE_TYPE_TRAITS_CACHED_RESOURCE(CachedTextTrack, CachedResource::Type::TextTrackResource)
-
-#endif // ENABLE(VIDEO_TRACK)
index b180150..c224d38 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CaptionUserPreferences.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrackList.h"
 #include "DOMWrapperWorld.h"
@@ -418,4 +418,4 @@ String CaptionUserPreferences::primaryAudioTrackLanguageOverride() const
     
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 613e789..ed22dfc 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrack.h"
 #include "TextTrack.h"
index e3950c9..7fa636e 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #if !USE(DIRECT2D)
 
@@ -891,4 +891,4 @@ Vector<RefPtr<TextTrack>> CaptionUserPreferencesMediaAF::sortedTrackListForMenu(
 
 #endif
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 3d87c42..89c46a0 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "CSSPropertyNames.h"
 #include "CaptionUserPreferences.h"
@@ -91,4 +91,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 8299df8..ddab06d 100644 (file)
@@ -1072,11 +1072,15 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin, bool inStable
 #endif
     }
 
+#if ENABLE(VIDEO)
     if (inStableState) {
         forEachMediaElement([] (HTMLMediaElement& element) {
             element.pageScaleFactorChanged();
         });
     }
+#else
+    UNUSED_PARAM(inStableState);
+#endif
 }
 
 void Page::setDelegatesScaling(bool delegatesScaling)
@@ -1143,10 +1147,11 @@ void Page::setUserInterfaceLayoutDirection(UserInterfaceLayoutDirection userInte
         return;
 
     m_userInterfaceLayoutDirection = userInterfaceLayoutDirection;
-
+#if ENABLE(VIDEO)
     forEachMediaElement([] (HTMLMediaElement& element) {
         element.userInterfaceLayoutDirectionChanged();
     });
+#endif
 }
 
 #if ENABLE(VIDEO)
@@ -1445,7 +1450,7 @@ void Page::doAfterUpdateRendering()
         document.updateHighlightPositions();
     });
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     forEachDocument([] (Document& document) {
         document.updateTextTrackRepresentationImageIfNeeded();
     });
@@ -2479,7 +2484,7 @@ void Page::hiddenPageCSSAnimationSuspensionStateChanged()
     }
 }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 void Page::captionPreferencesChanged()
 {
@@ -3031,6 +3036,8 @@ void Page::forEachMediaElement(const Function<void(HTMLMediaElement&)>& functor)
     forEachDocument([&] (Document& document) {
         document.forEachMediaElement(functor);
     });
+#else
+    UNUSED_PARAM(functor);
 #endif
 }
 
index d6a5e7a..101a265 100644 (file)
@@ -590,7 +590,7 @@ public:
 
     void hiddenPageCSSAnimationSuspensionStateChanged();
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     void captionPreferencesChanged();
 #endif
 
index 474b029..9898ef2 100644 (file)
@@ -36,7 +36,7 @@
 #include <JavaScriptCore/StructureInlines.h>
 #include <wtf/StdLibExtras.h>
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 #if PLATFORM(MAC) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
 #include "CaptionUserPreferencesMediaAF.h"
 #else
@@ -101,7 +101,7 @@ void PageGroup::removePage(Page& page)
     m_pages.remove(&page);
 }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 void PageGroup::captionPreferencesChanged()
 {
     for (auto& page : m_pages)
index 88c6587..1bb0a26 100644 (file)
@@ -32,7 +32,7 @@
 namespace WebCore {
 
 class Page;
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 class CaptionUserPreferences;
 #endif
 
@@ -53,7 +53,7 @@ public:
     const String& name() { return m_name; }
     unsigned identifier() { return m_identifier; }
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     WEBCORE_EXPORT void captionPreferencesChanged();
     WEBCORE_EXPORT CaptionUserPreferences& captionPreferences();
 #endif
@@ -64,7 +64,7 @@ private:
 
     unsigned m_identifier;
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
     std::unique_ptr<CaptionUserPreferences> m_captionPreferences;
 #endif
 };
index 5d840df..2d6bc6f 100644 (file)
@@ -318,16 +318,16 @@ backspaceKeyNavigationEnabled:
   initial: true
 shouldDisplaySubtitles:
   initial: false
-  conditional: VIDEO_TRACK
+  conditional: VIDEO
 shouldDisplayCaptions:
   initial: false
-  conditional: VIDEO_TRACK
+  conditional: VIDEO
 shouldDisplayTextDescriptions:
   initial: false
-  conditional: VIDEO_TRACK
+  conditional: VIDEO
 genericCueAPIEnabled:
   initial: false
-  conditional: VIDEO_TRACK
+  conditional: VIDEO
 useGPUProcessForMedia:
   initial: false
   conditional: GPU_PROCESS
index 46229c0..ff43e98 100644 (file)
@@ -1078,8 +1078,6 @@ String clickToExitFullScreenText()
     return WEB_UI_STRING("Click to Exit Full Screen", "Message to display in browser window when in webkit full screen mode.");
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 String textTrackSubtitlesText()
 {
     return WEB_UI_STRING("Subtitles", "Menu section heading for subtitles");
@@ -1105,9 +1103,7 @@ String audioTrackNoLabelText()
     return WEB_UI_STRING_KEY("Unknown", "Unknown (audio track)", "Menu item label for an audio track that has no other name");
 }
 
-#endif
-
-#if ENABLE(VIDEO_TRACK) && USE(CF)
+#if USE(CF)
 
 String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language)
 {
index 69aa3f8..6f32d53 100644 (file)
@@ -301,7 +301,6 @@ namespace WebCore {
 
     String clickToExitFullScreenText();
 
-#if ENABLE(VIDEO_TRACK)
     String textTrackSubtitlesText();
     String textTrackOffMenuItemText();
     String textTrackAutomaticMenuItemText();
@@ -316,7 +315,6 @@ namespace WebCore {
     String forcedTrackMenuItemText(const String&);
     String audioDescriptionTrackSuffixText(const String&);
 #endif
-#endif
 
     String snapshottedPlugInLabelTitle();
     String snapshottedPlugInLabelSubtitle();
index 89a486c..ea1c72b 100644 (file)
@@ -58,7 +58,7 @@
 #include "PreviewConverter.h"
 #endif
 
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && ENABLE(VIDEO)
 #include "ImageDecoderGStreamer.h"
 #endif
 
@@ -440,7 +440,7 @@ bool MIMETypeRegistry::isSupportedImageVideoOrSVGMIMEType(const String& mimeType
         return true;
 #endif
 
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && ENABLE(VIDEO)
     if (ImageDecoderGStreamer::supportsContainerType(mimeType))
         return true;
 #endif
index 09bfb8a..bee6ed5 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "SerializedPlatformDataCue.h"
 
-#if ENABLE(VIDEO_TRACK) && ENABLE(DATACUE_VALUE)
+#if ENABLE(VIDEO) && ENABLE(DATACUE_VALUE)
 
 namespace WebCore {
 
index f927864..7fae23e 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "TrackPrivateBase.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 namespace WebCore {
 
index a5c126e..868ed87 100644 (file)
@@ -38,7 +38,7 @@
 #include "ImageDecoderAVFObjC.h"
 #endif
 
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && ENABLE(VIDEO)
 #include "ImageDecoderGStreamer.h"
 #endif
 
@@ -53,7 +53,7 @@ RefPtr<ImageDecoder> ImageDecoder::create(SharedBuffer& data, const String& mime
         return ImageDecoderAVFObjC::create(data, mimeType, alphaOption, gammaAndColorProfileOption);
 #endif
 
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && ENABLE(VIDEO)
     if (ImageDecoderGStreamer::canDecodeType(mimeType))
         return ImageDecoderGStreamer::create(data, mimeType, alphaOption, gammaAndColorProfileOption);
 #endif
@@ -85,7 +85,7 @@ bool ImageDecoder::supportsMediaType(MediaType type)
         return true;
 #endif
 
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && ENABLE(VIDEO)
     if (ImageDecoderGStreamer::supportsMediaType(type))
         return true;
 #endif
index e344e7c..e438add 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "InbandGenericCue.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 
 namespace WebCore {
index c2b5d51..dc6ba5d 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "Color.h"
 #include "InbandGenericCueIdentifier.h"
index 9086198..7045dcb 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "InbandTextTrackPrivateClient.h"
 
@@ -131,5 +131,5 @@ template<> struct EnumTraits<WebCore::InbandTextTrackPrivate::Kind> {
 
 } // namespace WTF
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
 
index fd33eb9..5e5d398 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "Color.h"
 #include "InbandGenericCue.h"
@@ -65,4 +65,4 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 3c08d54..1c8e95c 100644 (file)
 #include "PlatformTimeRanges.h"
 #include <wtf/NeverDestroyed.h>
 #include <wtf/text/CString.h>
-
-#if ENABLE(VIDEO_TRACK)
 #include "InbandTextTrackPrivate.h"
-#endif
 
 #if ENABLE(MEDIA_SOURCE)
 #include "MediaSourcePrivateClient.h"
@@ -54,7 +51,7 @@
 #if USE(GSTREAMER)
 #include "MediaPlayerPrivateGStreamer.h"
 #define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 #include "MediaPlayerPrivateGStreamerMSE.h"
 #endif
 #endif // USE(GSTREAMER)
@@ -267,7 +264,7 @@ static void buildMediaEnginesVector()
         PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
 #endif
 
-#if USE(GSTREAMER) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if USE(GSTREAMER) && ENABLE(MEDIA_SOURCE)
     if (DeprecatedGlobalSettings::isGStreamerEnabled())
         MediaPlayerPrivateGStreamerMSE::registerMediaEngine(addMediaEngine);
 #endif
@@ -1377,8 +1374,6 @@ RefPtr<PlatformMediaResourceLoader> MediaPlayer::createResourceLoader()
     return client().mediaPlayerCreateResourceLoader();
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 void MediaPlayer::addAudioTrack(AudioTrackPrivate& track)
 {
     client().mediaPlayerDidAddAudioTrack(track);
@@ -1444,8 +1439,6 @@ Vector<RefPtr<PlatformTextTrack>> MediaPlayer::outOfBandTrackSources()
 
 #endif
 
-#endif // ENABLE(VIDEO_TRACK)
-
 void MediaPlayer::resetMediaEngines()
 {
     auto locker = holdLock(mediaEngineVectorLock);
index 86a7d45..77d66b5 100644 (file)
@@ -232,7 +232,6 @@ public:
     virtual bool mediaPlayerShouldUsePersistentCache() const { return true; }
     virtual const String& mediaPlayerMediaCacheDirectory() const { return emptyString(); }
 
-#if ENABLE(VIDEO_TRACK)
     virtual void mediaPlayerDidAddAudioTrack(AudioTrackPrivate&) { }
     virtual void mediaPlayerDidAddTextTrack(InbandTextTrackPrivate&) { }
     virtual void mediaPlayerDidAddVideoTrack(VideoTrackPrivate&) { }
@@ -241,9 +240,8 @@ public:
     virtual void mediaPlayerDidRemoveVideoTrack(VideoTrackPrivate&) { }
 
     virtual void textTrackRepresentationBoundsChanged(const IntRect&) { }
-#endif
 
-#if ENABLE(VIDEO_TRACK) && ENABLE(AVF_CAPTIONS)
+#if ENABLE(AVF_CAPTIONS)
     virtual Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources() { return { }; }
 #endif
 
@@ -537,7 +535,6 @@ public:
     CachedResourceLoader* cachedResourceLoader();
     RefPtr<PlatformMediaResourceLoader> createResourceLoader();
 
-#if ENABLE(VIDEO_TRACK)
     void addAudioTrack(AudioTrackPrivate&);
     void addTextTrack(InbandTextTrackPrivate&);
     void addVideoTrack(VideoTrackPrivate&);
@@ -549,9 +546,8 @@ public:
     void setTextTrackRepresentation(TextTrackRepresentation*);
     void syncTextTrackBounds();
     void tracksChanged();
-#endif
 
-#if ENABLE(VIDEO_TRACK) && ENABLE(AVF_CAPTIONS)
+#if ENABLE(AVF_CAPTIONS)
     void notifyTrackModeChanged();
     Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources();
 #endif
index baa0b63..84c7606 100644 (file)
@@ -239,12 +239,10 @@ public:
     virtual void setShouldContinueAfterKeyNeeded(bool) { }
 #endif
 
-#if ENABLE(VIDEO_TRACK)
     virtual bool requiresTextTrackRepresentation() const { return false; }
     virtual void setTextTrackRepresentation(TextTrackRepresentation*) { }
     virtual void syncTextTrackBounds() { };
     virtual void tracksChanged() { };
-#endif
 
 #if USE(GSTREAMER)
     virtual void simulateAudioInterruption() { }
index a3265e0..81e8c2b 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TextTrackRepresentation.h"
 
index 8b1f7f6..341b232 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef TextTrackRepresentation_h
 #define TextTrackRepresentation_h
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "PlatformLayer.h"
 #include <wtf/Forward.h>
index b7864f7..e7c1af3 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "TrackPrivateBase.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "Logging.h"
 #include <wtf/LoggerHelper.h>
index 4e413dd..004af4f 100644 (file)
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include <wtf/LoggerHelper.h>
 #include <wtf/MediaTime.h>
index c1c1184..718d80e 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "TrackPrivateBase.h"
 
index 99dddd8..7069c17 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef AVTrackPrivateAVFObjCImpl_h
 #define AVTrackPrivateAVFObjCImpl_h
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrackPrivate.h"
 #include "VideoTrackPrivate.h"
@@ -80,6 +80,6 @@ private:
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
 
 #endif
index 8a6154f..d38b2ac 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "AVTrackPrivateAVFObjCImpl.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #import "MediaSelectionGroupAVFObjC.h"
 #import <AVFoundation/AVAssetTrack.h>
@@ -241,4 +241,4 @@ int AVTrackPrivateAVFObjCImpl::trackID() const
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 8c1509e..b719f0a 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrackPrivate.h"
 
@@ -58,4 +58,4 @@ protected:
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 8d50266..5bcce50 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "Timer.h"
 #include <wtf/HashMap.h>
@@ -95,4 +95,4 @@ private:
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index b53ccf6..9bd5648 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "MediaSelectionGroupAVFObjC.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #import <AVFoundation/AVAsset.h>
 #import <AVFoundation/AVMediaSelectionGroup.h>
index cbedb53..73a6c31 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "VideoTrackPrivate.h"
 
@@ -58,4 +58,4 @@ protected:
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
index 49c77ec..8900510 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef AudioTrackPrivateAVFObjC_h
 #define AudioTrackPrivateAVFObjC_h
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "AudioTrackPrivateAVF.h"
 
@@ -82,7 +82,7 @@ private:
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
 
 
 #endif // AudioTrackPrivateAVFObjC_h
index df5226a..c1cb1a4 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "AudioTrackPrivateMediaSourceAVFObjC.h"
 
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 
 #include "AVTrackPrivateAVFObjCImpl.h"
 #include "SourceBufferPrivateAVFObjC.h"
index 1a4b181..9bc4f26 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "AudioTrackPrivateAVF.h"
 
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 
 OBJC_CLASS AVAssetTrack;
 
@@ -63,4 +63,4 @@ private:
 
 }
 
-#endif // ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(MEDIA_SOURCE)
index 936127d..d161756 100644 (file)
@@ -227,11 +227,9 @@ private:
 
     MediaTime getStartDate() const final;
 
-#if ENABLE(VIDEO_TRACK)
     bool requiresTextTrackRepresentation() const final;
     void setTextTrackRepresentation(TextTrackRepresentation*) final;
     void syncTextTrackBounds() final;
-#endif
 
     void setAVPlayerItem(AVPlayerItem *);
 
@@ -280,10 +278,8 @@ private:
     void setCurrentTextTrack(InbandTextTrackPrivateAVF*) final;
     InbandTextTrackPrivateAVF* currentTextTrack() const final { return m_currentTextTrack; }
 
-#if ENABLE(VIDEO_TRACK)
     void updateAudioTracks();
     void updateVideoTracks();
-#endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
     bool hasVideo() const final;
@@ -354,12 +350,10 @@ private:
 
     RetainPtr<AVPlayerItemLegibleOutput> m_legibleOutput;
 
-#if ENABLE(VIDEO_TRACK)
     Vector<RefPtr<AudioTrackPrivateAVFObjC>> m_audioTracks;
     Vector<RefPtr<VideoTrackPrivateAVFObjC>> m_videoTracks;
     RefPtr<MediaSelectionGroupAVFObjC> m_audibleGroup;
     RefPtr<MediaSelectionGroupAVFObjC> m_visualGroup;
-#endif
 
     InbandTextTrackPrivateAVF* m_currentTextTrack { nullptr };
 
index ec23743..0e18fff 100644 (file)
@@ -1911,8 +1911,6 @@ void MediaPlayerPrivateAVFoundationObjC::updateRotationSession()
     m_imageRotationSession = makeUnique<ImageRotationSessionVT>(WTFMove(finalTransform), naturalSize, kCVPixelFormatType_32BGRA, ImageRotationSessionVT::IsCGImageCompatible::Yes);
 }
 
-#if ENABLE(VIDEO_TRACK)
-
 template <typename RefT, typename PassRefT>
 void determineChangedTracksFromNewTracksAndOldItems(NSArray* tracks, NSString* trackType, Vector<RefT>& oldItems, RefT (*itemFactory)(AVPlayerItemTrack*), MediaPlayer* player, void (MediaPlayer::*removedFunction)(PassRefT), void (MediaPlayer::*addedFunction)(PassRefT))
 {
@@ -2073,8 +2071,6 @@ void MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation(TextTrackRep
     m_videoLayerManager->setTextTrackRepresentation(representation);
 }
 
-#endif // ENABLE(VIDEO_TRACK)
-
 #if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
 
 AudioSourceProvider* MediaPlayerPrivateAVFoundationObjC::audioSourceProvider()
index 29483ba..32d26f6 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "VideoTrackPrivateAVFObjC.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #import "AVTrackPrivateAVFObjCImpl.h"
 #import "MediaSelectionGroupAVFObjC.h"
index b19b3aa..ef1416c 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef VideoTrackPrivateAVFObjC_h
 #define VideoTrackPrivateAVFObjC_h
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO)
 
 #include "VideoTrackPrivateAVF.h"
 
@@ -81,6 +81,6 @@ private:
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO)
 
 #endif // VideoTrackPrivateAVFObjC_h
index 5dd7e62..c78b953 100644 (file)
@@ -29,7 +29,7 @@
 #include "IntSize.h"
 #include "VideoTrackPrivateAVF.h"
 
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 
 OBJC_CLASS AVAssetTrack;
 OBJC_CLASS AVPlayerItemTrack;
@@ -70,6 +70,6 @@ private:
 
 }
 
-#endif // ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(MEDIA_SOURCE)
 
 #endif
index 9756cff..2c73927 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "VideoTrackPrivateMediaSourceAVFObjC.h"
 
-#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE)
 
 #import "AVTrackPrivateAVFObjCImpl.h"
 #import "SourceBufferPrivateAVFObjC.h"
index c92db2e..512ee10 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef TextTrackRepresentationCocoa_h
 #define TextTrackRepresentationCocoa_h
 
-#if (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO_TRACK)
+#if (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO)
 
 #include "GenericTaskQueue.h"
 #include "TextTrackRepresentation.h"
@@ -62,6 +62,6 @@ private:
 
 }
 
-#endif // (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO_TRACK)
+#endif // (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO)
 
 #endif // TextTrackRepresentationCocoa_h
index 51a13f1..572de71 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO_TRACK)
+#if (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO)
 #import "TextTrackRepresentationCocoa.h"
 
 #import "FloatRect.h"
@@ -154,4 +154,4 @@ void TextTrackRepresentationCocoa::boundsChanged()
     });
 }
 
-#endif // (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO_TRACK)
+#endif // (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))) && ENABLE(VIDEO)
index b748864..6d3f428 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "AudioTrackPrivateGStreamer.h"
 
@@ -83,4 +83,4 @@ void AudioTrackPrivateGStreamer::setEnabled(bool enabled)
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index 472d206..1368187 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "AudioTrackPrivate.h"
 #include "GStreamerCommon.h"
@@ -71,4 +71,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index ad27785..8ac9ab3 100644 (file)
@@ -34,7 +34,7 @@
 #include <wtf/glib/GUniquePtr.h>
 #include <wtf/glib/RunLoopSourcePriority.h>
 
-#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#if USE(GSTREAMER_MPEGTS)
 #define GST_USE_UNSTABLE_API
 #include <gst/mpegts/mpegts.h>
 #undef GST_USE_UNSTABLE_API
@@ -250,7 +250,7 @@ bool initializeGStreamer(Optional<Vector<String>>&& options)
                 gst_allocator_set_default(GST_ALLOCATOR(g_object_new(gst_allocator_fast_malloc_get_type(), nullptr)));
         }
 
-#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#if USE(GSTREAMER_MPEGTS)
         if (isGStreamerInitialized)
             gst_mpegts_initialize();
 #endif
index 6c584f3..87a44d2 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ImageDecoderGStreamer.h"
 
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && ENABLE(VIDEO)
 
 #include "FloatSize.h"
 #include "GStreamerCommon.h"
index eebab84..7e3a608 100644 (file)
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && ENABLE(VIDEO)
 
 #include "GRefPtrGStreamer.h"
 #include "ImageDecoder.h"
index f5a54af..95ad28c 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "InbandTextTrackPrivate.h"
 
@@ -73,4 +73,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index ac05836..05021ba 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "InbandTextTrackPrivateGStreamer.h"
 
@@ -138,4 +138,4 @@ void InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged()
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index 200d542..c9d168d 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "GStreamerCommon.h"
 #include "InbandTextTrackPrivate.h"
@@ -76,4 +76,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index b8238d7..acc51a2 100644 (file)
 #include "TimeRanges.h"
 #include "VideoSinkGStreamer.h"
 #include "WebKitWebSourceGStreamer.h"
-
-#if ENABLE(VIDEO_TRACK)
 #include "AudioTrackPrivateGStreamer.h"
 #include "InbandMetadataTextTrackPrivateGStreamer.h"
 #include "InbandTextTrackPrivateGStreamer.h"
 #include "TextCombinerGStreamer.h"
 #include "TextSinkGStreamer.h"
 #include "VideoTrackPrivateGStreamer.h"
-#endif // ENABLE(VIDEO_TRACK)
 
 #if ENABLE(MEDIA_STREAM)
 #include "GStreamerMediaStreamSource.h"
 #include <wtf/URL.h>
 #include <wtf/WallTime.h>
 
-#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#if USE(GSTREAMER_MPEGTS)
 #define GST_USE_UNSTABLE_API
 #include <gst/mpegts/mpegts.h>
 #undef GST_USE_UNSTABLE_API
-#endif // ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER_MPEGTS)
 
-#if ENABLE(VIDEO_TRACK)
 #define CREATE_TRACK(type, Type) G_STMT_START {                         \
         m_has##Type = true;                                             \
         if (!useMediaSource) {                                          \
             m_player->add##Type##Track(*track);                         \
         }                                                               \
     } G_STMT_END
-#else
-#define CREATE_TRACK(type, Type) G_STMT_START { \
-        m_has##Type## = true;                   \
-    } G_STMT_END
-#endif // ENABLE(VIDEO_TRACK)
 
 #if USE(GSTREAMER_GL)
 #include "GLVideoSinkGStreamer.h"
@@ -224,7 +215,6 @@ MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer()
     GST_DEBUG_OBJECT(pipeline(), "Disposing player");
     m_isPlayerShuttingDown.store(true);
 
-#if ENABLE(VIDEO_TRACK)
     for (auto& track : m_audioTracks.values())
         track->disconnect();
 
@@ -233,7 +223,7 @@ MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer()
 
     for (auto& track : m_videoTracks.values())
         track->disconnect();
-#endif
+
     if (m_fillTimer.isActive())
         m_fillTimer.stop();
 
@@ -1053,7 +1043,6 @@ void MediaPlayerPrivateGStreamer::notifyPlayerOfVideo()
         return;
     }
 
-#if ENABLE(VIDEO_TRACK)
     Vector<String> validVideoStreams;
     for (unsigned i = 0; i < numTracks; ++i) {
         GRefPtr<GstPad> pad;
@@ -1080,7 +1069,6 @@ void MediaPlayerPrivateGStreamer::notifyPlayerOfVideo()
     }
 
     purgeInvalidVideoTracks(validVideoStreams);
-#endif
 
     m_player->mediaEngineUpdated();
 }
@@ -1129,7 +1117,6 @@ void MediaPlayerPrivateGStreamer::notifyPlayerOfAudio()
         return;
     }
 
-#if ENABLE(VIDEO_TRACK)
     Vector<String> validAudioStreams;
     for (unsigned i = 0; i < numTracks; ++i) {
         GRefPtr<GstPad> pad;
@@ -1156,12 +1143,10 @@ void MediaPlayerPrivateGStreamer::notifyPlayerOfAudio()
     }
 
     purgeInvalidAudioTracks(validAudioStreams);
-#endif
 
     m_player->mediaEngineUpdated();
 }
 
-#if ENABLE(VIDEO_TRACK)
 void MediaPlayerPrivateGStreamer::textChangedCallback(MediaPlayerPrivateGStreamer* player)
 {
     player->m_notifier->notify(MainThreadNotification::TextChanged, [player] {
@@ -1252,7 +1237,6 @@ void MediaPlayerPrivateGStreamer::newTextSample()
     } else
         GST_WARNING("Unable to handle sample with no stream start event.");
 }
-#endif
 
 MediaTime MediaPlayerPrivateGStreamer::platformDuration() const
 {
@@ -1551,11 +1535,9 @@ void MediaPlayerPrivateGStreamer::updateTracks(GRefPtr<GstStreamCollection>&& st
         else if (type & GST_STREAM_TYPE_VIDEO)
             CREATE_TRACK(video, Video);
         else if (type & GST_STREAM_TYPE_TEXT && !useMediaSource) {
-#if ENABLE(VIDEO_TRACK)
             auto track = InbandTextTrackPrivateGStreamer::create(textTrackIndex++, stream);
             m_textTracks.add(streamId, track.copyRef());
             m_player->addTextTrack(track.get());
-#endif
         } else
             GST_WARNING("Unknown track type found for stream %s", streamId.utf8().data());
     }
@@ -1997,7 +1979,7 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
                 m_player->requestInstallMissingPlugins(String::fromUTF8(detail.get()), String::fromUTF8(description.get()), missingPluginCallback.get());
             }
         }
-#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#if USE(GSTREAMER_MPEGTS)
         else if (GstMpegtsSection* section = gst_message_parse_mpegts_section(message)) {
             processMpegTsSection(section);
             gst_mpegts_section_unref(section);
@@ -2059,11 +2041,9 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
         } else
             GST_DEBUG_OBJECT(pipeline(), "Unhandled element message: %" GST_PTR_FORMAT, structure);
         break;
-#if ENABLE(VIDEO_TRACK)
     case GST_MESSAGE_TOC:
         processTableOfContents(message);
         break;
-#endif
     case GST_MESSAGE_TAG: {
         GstTagList* tags = nullptr;
         GUniqueOutPtr<gchar> tag;
@@ -2161,7 +2141,7 @@ void MediaPlayerPrivateGStreamer::updateBufferingStatus(GstBufferingMode mode, d
     }
 }
 
-#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#if USE(GSTREAMER_MPEGTS)
 void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegtsSection* section)
 {
     ASSERT(section);
@@ -2214,7 +2194,6 @@ void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegtsSection* section
 }
 #endif
 
-#if ENABLE(VIDEO_TRACK)
 void MediaPlayerPrivateGStreamer::processTableOfContents(GstMessage* message)
 {
     if (m_chaptersTrack)
@@ -2283,7 +2262,6 @@ void MediaPlayerPrivateGStreamer::purgeInvalidTextTracks(Vector<String> validTra
         return !validTrackIds.contains(keyAndValue.key);
     });
 }
-#endif
 
 void MediaPlayerPrivateGStreamer::uriDecodeBinElementAddedCallback(GstBin* bin, GstElement* element, MediaPlayerPrivateGStreamer* player)
 {
@@ -2807,7 +2785,6 @@ void MediaPlayerPrivateGStreamer::createGSTPlayBin(const URL& url, const String&
         g_signal_connect_swapped(m_pipeline.get(), "audio-changed", G_CALLBACK(audioChangedCallback), this);
     }
 
-#if ENABLE(VIDEO_TRACK)
     if (m_isLegacyPlaybin)
         g_signal_connect_swapped(m_pipeline.get(), "text-changed", G_CALLBACK(textChangedCallback), this);
 
@@ -2830,7 +2807,6 @@ void MediaPlayerPrivateGStreamer::createGSTPlayBin(const URL& url, const String&
     g_signal_connect_swapped(m_textAppSink.get(), "new-sample", G_CALLBACK(newTextSampleCallback), this);
 
     g_object_set(m_pipeline.get(), "text-sink", m_textAppSink.get(), nullptr);
-#endif
 
     g_object_set(m_pipeline.get(), "video-sink", createVideoSink(), "audio-sink", createAudioSink(), nullptr);
 
index 34f67d6..0937d9d 100644 (file)
@@ -32,6 +32,7 @@
 #include "MainThreadNotifier.h"
 #include "MediaPlayerPrivate.h"
 #include "PlatformLayer.h"
+#include "TrackPrivateBaseGStreamer.h"
 #include <glib.h>
 #include <gst/gst.h>
 #include <gst/pbutils/install-plugins.h>
 #include <wtf/LoggerHelper.h>
 #include <wtf/RunLoop.h>
 #include <wtf/WeakPtr.h>
-
-#if ENABLE(VIDEO_TRACK)
-#include "TrackPrivateBaseGStreamer.h"
 #include <wtf/text/AtomStringHash.h>
-#endif
+
 typedef struct _GstMpegtsSection GstMpegtsSection;
 
 #if USE(GSTREAMER_GL)
@@ -251,9 +249,7 @@ protected:
         AudioChanged = 1 << 2,
         VolumeChanged = 1 << 3,
         MuteChanged = 1 << 4,
-#if ENABLE(VIDEO_TRACK)
         TextChanged = 1 << 5,
-#endif
         SizeChanged = 1 << 6,
         StreamCollectionChanged = 1 << 7
     };
@@ -310,11 +306,8 @@ protected:
     void notifyPlayerOfVideo();
     void notifyPlayerOfVideoCaps();
     void notifyPlayerOfAudio();
-
-#if ENABLE(VIDEO_TRACK)
     void notifyPlayerOfText();
     void newTextSample();
-#endif
 
     void ensureAudioSourceProvider();
     void setAudioStreamProperties(GObject*);
@@ -325,10 +318,8 @@ protected:
     static void videoChangedCallback(MediaPlayerPrivateGStreamer*);
     static void videoSinkCapsChangedCallback(MediaPlayerPrivateGStreamer*);
     static void audioChangedCallback(MediaPlayerPrivateGStreamer*);
-#if ENABLE(VIDEO_TRACK)
     static void textChangedCallback(MediaPlayerPrivateGStreamer*);
     static GstFlowReturn newTextSampleCallback(MediaPlayerPrivateGStreamer*);
-#endif
 
     void timeChanged();
     void loadingFailed(MediaPlayer::NetworkState, MediaPlayer::ReadyState = MediaPlayer::ReadyState::HaveNothing, bool forceNotifications = false);
@@ -438,7 +429,6 @@ private:
     void updateBufferingStatus(GstBufferingMode, double percentage);
     void updateMaxTimeLoaded(double percentage);
 
-#if ENABLE(VIDEO_TRACK)
 #if USE(GSTREAMER_MPEGTS)
     void processMpegTsSection(GstMpegtsSection*);
 #endif
@@ -449,7 +439,7 @@ private:
     void purgeInvalidAudioTracks(Vector<String> validTrackIds);
     void purgeInvalidVideoTracks(Vector<String> validTrackIds);
     void purgeInvalidTextTracks(Vector<String> validTrackIds);
-#endif
+
     virtual bool doSeek(const MediaTime& position, float rate, GstSeekFlags seekType);
 
     String engineDescription() const override { return "GStreamer"; }
@@ -474,10 +464,8 @@ private:
 #endif
 
     Atomic<bool> m_isPlayerShuttingDown;
-#if ENABLE(VIDEO_TRACK)
     GRefPtr<GstElement> m_textAppSink;
     GRefPtr<GstPad> m_textAppSinkPad;
-#endif
     GstStructure* m_mediaLocations { nullptr };
     int m_mediaLocationCurrentIndex { 0 };
     bool m_isPlaybackRatePaused { false };
@@ -528,7 +516,6 @@ private:
     GRefPtr<GstElement> m_autoAudioSink;
     GRefPtr<GstElement> m_downloadBuffer;
     Vector<RefPtr<MediaPlayerRequestInstallMissingPluginsCallback>> m_missingPluginCallbacks;
-#if ENABLE(VIDEO_TRACK)
     HashMap<AtomString, RefPtr<AudioTrackPrivateGStreamer>> m_audioTracks;
     HashMap<AtomString, RefPtr<InbandTextTrackPrivateGStreamer>> m_textTracks;
     HashMap<AtomString, RefPtr<VideoTrackPrivateGStreamer>> m_videoTracks;
@@ -536,7 +523,6 @@ private:
 #if USE(GSTREAMER_MPEGTS)
     HashMap<AtomString, RefPtr<InbandMetadataTextTrackPrivateGStreamer>> m_metadataTracks;
 #endif
-#endif // ENABLE(VIDEO_TRACK)
     virtual bool isMediaSource() const { return false; }
 
     uint64_t m_httpResponseTotalSize { 0 };
index 8901360..b1c611c 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "TextCombinerGStreamer.h"
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "GStreamerCommon.h"
 
@@ -302,4 +302,4 @@ GstElement* webkitTextCombinerNew()
     return GST_ELEMENT(g_object_new(WEBKIT_TYPE_TEXT_COMBINER, nullptr));
 }
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index 20c5796..0906763 100644 (file)
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TextCombinerGStreamer_h
-#define TextCombinerGStreamer_h
+#pragma once
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include <glib-object.h>
 #include <gst/gst.h>
@@ -62,5 +61,4 @@ struct _WebKitTextCombinerClass {
 
 GstElement* webkitTextCombinerNew();
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
-#endif
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index e651deb..566af24 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "TextSinkGStreamer.h"
 
@@ -98,4 +98,4 @@ GstElement* webkitTextSinkNew()
     return GST_ELEMENT(g_object_new(WEBKIT_TYPE_TEXT_SINK, nullptr));
 }
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index d09be86..661f72f 100644 (file)
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TextSinkGStreamer_h
-#define TextSinkGStreamer_h
+#pragma once
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include <glib-object.h>
 #include <gst/app/gstappsink.h>
@@ -61,5 +60,4 @@ struct _WebKitTextSinkClass {
 
 GstElement* webkitTextSinkNew();
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
-#endif
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index 759f9c7..00014d5 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "TrackPrivateBaseGStreamer.h"
 
@@ -175,4 +175,4 @@ void TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged()
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index e8fab5d..0074dc2 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "GStreamerCommon.h"
 #include "MainThreadNotifier.h"
@@ -98,4 +98,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index f6b2220..e61f55a 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "VideoTrackPrivateGStreamer.h"
 
@@ -83,4 +83,4 @@ void VideoTrackPrivateGStreamer::setSelected(bool selected)
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index a98163d..634caa0 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "GStreamerCommon.h"
 #include "TrackPrivateBaseGStreamer.h"
@@ -72,4 +72,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER)
index 7fee2d2..1dc590d 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if ENABLE(VIDEO_TRACK) && ENABLE(DATACUE_VALUE)
+#if ENABLE(VIDEO) && ENABLE(DATACUE_VALUE)
 
 #include "SerializedPlatformDataCue.h"