Changeset 267885 in webkit


Ignore:
Timestamp:
Oct 2, 2020 9:39:47 AM (4 years ago)
Author:
weinig@apple.com
Message:

Remove code behind ENABLE(MEDIA_SESSION), no ports enable it
​https://bugs.webkit.org/show_bug.cgi?id=216831

Reviewed by Alex Christensen.

.:

  • Source/cmake/OptionsFTW.cmake:
  • Source/cmake/WebKitFeatures.cmake:

Remove option to build with MEDIA_SESSION, no one was doing it.

Source/WebCore:

  • CMakeLists.txt:
  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:

Remove media session related files.

  • Modules/airplay/PlaybackTargetClientContextIdentifier.h: Added.
  • Modules/airplay/WebMediaSessionManager.cpp: Added.
  • Modules/airplay/WebMediaSessionManager.h: Added.
  • Modules/airplay/WebMediaSessionManagerClient.h: Added.
  • Modules/mediasession: Removed.
  • platform/mediasession: Removed.

Delete Modules/mediasession and platform/mediasession. Move files that
were actually used for the WIRELESS_PLAYBACK_TARGET feature to
Modules/airplay where other parts of that feature are implemented.

  • dom/Document.cpp:
  • dom/Document.h:
  • dom/EventTargetFactory.in:
  • html/HTMLMediaElement.cpp:
  • html/HTMLMediaElement.h:
  • page/ChromeClient.h:
  • page/Page.cpp:
  • page/Page.h:
  • testing/Internals.cpp:
  • testing/Internals.h:
  • testing/Internals.idl:

Remove all code inside ENABLE(MEDIA_SESSION).

Source/WebKit:

Removes all code in ENABLE(MEDIA_SESSION) and all media session
related SPI. It was never enabled and nothing ever adopted it.

  • Sources.txt:
  • SourcesCocoa.txt:
  • WebKit.xcodeproj/project.pbxproj:

Remove media session related files.

  • Shared/API/APIObject.h:
  • Shared/API/c/WKBase.h:
  • Shared/WebCoreArgumentCoders.cpp:
  • Shared/WebCoreArgumentCoders.h:
  • Shared/WebMediaSessionMetadata.cpp: Removed.
  • Shared/WebMediaSessionMetadata.h: Removed.
  • UIProcess/API/APIUIClient.h:
  • UIProcess/API/C/WKAPICast.h:
  • UIProcess/API/C/WKContext.cpp:
  • UIProcess/API/C/WKContext.h:
  • UIProcess/API/C/WKMediaSessionFocusManager.cpp: Removed.
  • UIProcess/API/C/WKMediaSessionFocusManager.h: Removed.
  • UIProcess/API/C/WKMediaSessionMetadata.cpp: Removed.
  • UIProcess/API/C/WKMediaSessionMetadata.h: Removed.
  • UIProcess/API/C/WKPage.cpp:
  • UIProcess/API/C/WKPagePrivate.h:
  • UIProcess/API/C/WKPageUIClient.h:
  • UIProcess/WebMediaSessionFocusManager.cpp: Removed.
  • UIProcess/WebMediaSessionFocusManager.h: Removed.
  • UIProcess/WebMediaSessionFocusManagerClient.cpp: Removed.
  • UIProcess/WebMediaSessionFocusManagerClient.h: Removed.
  • UIProcess/WebPageProxy.cpp:
  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • UIProcess/WebProcessPool.cpp:
  • UIProcess/WebProcessPool.h:
  • WebProcess/WebCoreSupport/WebChromeClient.cpp:
  • WebProcess/WebCoreSupport/WebChromeClient.h:
  • WebProcess/WebPage/WebPage.cpp:
  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/WebPage.messages.in:

Remove all code in ENABLE(MEDIA_SESSION).

Tools:

  • Scripts/webkitperl/FeatureList.pm:

Remove support for building with MEDIA_SESSION enabled.

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::createOtherPage):
(WTR::TestController::createWebViewWithOptions):
Update names to new 'unused' naming.

LayoutTests:

Remove always skipped Media Session tests.

Location:
trunk
Files:
13 deleted
57 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r267883 r267885  
     12020-10-02  Sam Weinig  <weinig@apple.com>
     2
     3        Remove code behind ENABLE(MEDIA_SESSION), no ports enable it
     4        https://bugs.webkit.org/show_bug.cgi?id=216831
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Source/cmake/OptionsFTW.cmake:
     9        * Source/cmake/WebKitFeatures.cmake:
     10        Remove option to build with MEDIA_SESSION, no one was doing it.
     11
    1122020-10-02  Karl Rackler  <rackler@apple.com>
    213

  • trunk/LayoutTests/ChangeLog

    r267884 r267885  
     12020-10-02  Sam Weinig  <weinig@apple.com>
     2
     3        Remove code behind ENABLE(MEDIA_SESSION), no ports enable it
     4        https://bugs.webkit.org/show_bug.cgi?id=216831
     5
     6        Reviewed by Alex Christensen.
     7
     8        Remove always skipped Media Session tests.
     9
     10        * TestExpectations:
     11        * gpu-process/TestExpectations:
     12        * media/session: Removed.
     13
    1142020-10-02  Sam Weinig  <weinig@apple.com>
    215

  • trunk/LayoutTests/TestExpectations

    r267883 r267885  
    19311931
    19321932webkit.org/b/146182 editing/selection/leak-document-with-selection-inside.html [ Pass Failure ]
    1933 
    1934 # Media Sessions is not yet enabled by default: ENABLE(MEDIA_SESSION)
    1935 media/session [ Skip ]
    19361933
    19371934# Experimental H265 support.

  • trunk/LayoutTests/gpu-process/TestExpectations

    r267883 r267885  
    259259media/remoteplayback-prompt.html [ Skip ]
    260260
    261 media/session [ Skip ]
    262 
    263261media/track/audio/audio-track-mkv-vorbis-addtrack.html [ Skip ]
    264262media/track/audio/audio-track-mkv-vorbis-enabled.html [ Skip ]

  • trunk/Source/WebCore/CMakeLists.txt

    r267883 r267885  
    4444    "${WEBCORE_DIR}/Modules/mediacontrols"
    4545    "${WEBCORE_DIR}/Modules/mediarecorder"
    46     "${WEBCORE_DIR}/Modules/mediasession"
    4746    "${WEBCORE_DIR}/Modules/mediasource"
    4847    "${WEBCORE_DIR}/Modules/mediastream"
    … …  
    140139    "${WEBCORE_DIR}/platform/mediacapabilities"
    141140    "${WEBCORE_DIR}/platform/mediarecorder"
    142     "${WEBCORE_DIR}/platform/mediasession"
    143141    "${WEBCORE_DIR}/platform/mediastream"
    144142    "${WEBCORE_DIR}/platform/mediastream/libwebrtc"
    … …  
    199197    Modules/mediacapabilities
    200198    Modules/mediarecorder
    201     Modules/mediasession
    202199    Modules/mediastream
    203200    Modules/notifications
    … …  
    327324    Modules/mediarecorder/MediaRecorder.idl
    328325    Modules/mediarecorder/MediaRecorderErrorEvent.idl
    329 
    330     Modules/mediasession/HTMLMediaElement+MediaSession.idl
    331     Modules/mediasession/MediaRemoteControls.idl
    332     Modules/mediasession/MediaSession.idl
    333326
    334327    Modules/mediasource/AudioTrack+MediaSource.idl

  • trunk/Source/WebCore/ChangeLog

    r267883 r267885  
     12020-10-02  Sam Weinig  <weinig@apple.com>
     2
     3        Remove code behind ENABLE(MEDIA_SESSION), no ports enable it
     4        https://bugs.webkit.org/show_bug.cgi?id=216831
     5
     6        Reviewed by Alex Christensen.
     7
     8        * CMakeLists.txt:
     9        * Sources.txt:
     10        * WebCore.xcodeproj/project.pbxproj:
     11        Remove media session related files.
     12
     13        * Modules/airplay/PlaybackTargetClientContextIdentifier.h: Added.
     14        * Modules/airplay/WebMediaSessionManager.cpp: Added.
     15        * Modules/airplay/WebMediaSessionManager.h: Added.
     16        * Modules/airplay/WebMediaSessionManagerClient.h: Added.
     17        * Modules/mediasession: Removed.
     18        * platform/mediasession: Removed.
     19        Delete Modules/mediasession and platform/mediasession. Move files that
     20        were actually used for the WIRELESS_PLAYBACK_TARGET feature to
     21        Modules/airplay where other parts of that feature are implemented.
     22
     23        * dom/Document.cpp:
     24        * dom/Document.h:
     25        * dom/EventTargetFactory.in:
     26        * html/HTMLMediaElement.cpp:
     27        * html/HTMLMediaElement.h:
     28        * page/ChromeClient.h:
     29        * page/Page.cpp:
     30        * page/Page.h:
     31        * testing/Internals.cpp:
     32        * testing/Internals.h:
     33        * testing/Internals.idl:
     34        Remove all code inside ENABLE(MEDIA_SESSION).
     35
    1362020-10-02  Karl Rackler  <rackler@apple.com>
    237

  • trunk/Source/WebCore/DerivedSources-input.xcfilelist

    r267883 r267885  
    157157$(PROJECT_DIR)/Modules/mediarecorder/MediaRecorder.idl
    158158$(PROJECT_DIR)/Modules/mediarecorder/MediaRecorderErrorEvent.idl
    159 $(PROJECT_DIR)/Modules/mediasession/HTMLMediaElement+MediaSession.idl
    160 $(PROJECT_DIR)/Modules/mediasession/MediaRemoteControls.idl
    161 $(PROJECT_DIR)/Modules/mediasession/MediaSession.idl
    162159$(PROJECT_DIR)/Modules/mediasource/AudioTrack+MediaSource.idl
    163160$(PROJECT_DIR)/Modules/mediasource/DOMURL+MediaSource.idl

  • trunk/Source/WebCore/DerivedSources-output.xcfilelist

    r267883 r267885  
    978978$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMarqueeElement.cpp
    979979$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMarqueeElement.h
    980 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElement+MediaSession.cpp
    981 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElement+MediaSession.h
    982980$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElement+RemotePlayback.cpp
    983981$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElement+RemotePlayback.h
    … …  
    986984$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElementAudioOutput.cpp
    987985$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElementAudioOutput.h
    988 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElementMediaSession.cpp
    989 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElementMediaSession.h
    990 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElementRemotePlayback.cpp
    991 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMediaElementRemotePlayback.h
    992986$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMenuElement.cpp
    993987$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSHTMLMenuElement.h
    … …  
    12481242$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaRecorderErrorEvent.cpp
    12491243$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaRecorderErrorEvent.h
    1250 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaRemoteControls.cpp
    1251 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaRemoteControls.h
    1252 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaSession.cpp
    1253 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaSession.h
    12541244$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaSource.cpp
    12551245$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSMediaSource.h

  • trunk/Source/WebCore/DerivedSources.make

    r267883 r267885  
    7171    $(WebCore)/Modules/mediacontrols \
    7272    $(WebCore)/Modules/mediarecorder \
    73     $(WebCore)/Modules/mediasession \
    7473    $(WebCore)/Modules/mediasource \
    7574    $(WebCore)/Modules/mediastream \
    … …  
    257256    $(WebCore)/Modules/mediarecorder/MediaRecorder.idl \
    258257    $(WebCore)/Modules/mediarecorder/MediaRecorderErrorEvent.idl \
    259     $(WebCore)/Modules/mediasession/HTMLMediaElement+MediaSession.idl \
    260     $(WebCore)/Modules/mediasession/MediaRemoteControls.idl \
    261     $(WebCore)/Modules/mediasession/MediaSession.idl \
    262258    $(WebCore)/Modules/mediasource/AudioTrack+MediaSource.idl \
    263259    $(WebCore)/Modules/mediasource/DOMURL+MediaSource.idl \

  • trunk/Source/WebCore/Headers.cmake

    r267883 r267885  
    11set(WebCore_PRIVATE_FRAMEWORK_HEADERS
     2    Modules/airplay/PlaybackTargetClientContextIdentifier.h
     3
    24    Modules/applepay/ApplePaySessionPaymentRequest.h
    35    Modules/applepay/Payment.h
    … …  
    8789
    8890    Modules/mediarecorder/MediaRecorderProvider.h
    89 
    90     Modules/mediasession/MediaSessionEvents.h
    91     Modules/mediasession/MediaSessionMetadata.h
    92     Modules/mediasession/PlaybackTargetClientContextIdentifier.h
    93     Modules/mediasession/WebMediaSessionManager.h
    94     Modules/mediasession/WebMediaSessionManagerClient.h
    9591
    9692    Modules/mediasource/SampleMap.h

  • trunk/Source/WebCore/Modules/webaudio/AudioWorkletNode.cpp

    r267883 r267885  
    3232#include "AudioWorkletNode.h"
    3333
     34#include "AudioContext.h"
     35#include "AudioNodeOutput.h"
    3436#include "AudioParamMap.h"
    3537#include "AudioWorkletNodeOptions.h"

  • trunk/Source/WebCore/Sources.txt

    r267883 r267885  
    131131Modules/mediarecorder/MediaRecorderErrorEvent.cpp
    132132Modules/mediarecorder/MediaRecorderProvider.cpp
    133 Modules/mediasession/HTMLMediaElementMediaSession.cpp
    134 Modules/mediasession/MediaRemoteControls.cpp
    135 Modules/mediasession/MediaSession.cpp
    136133Modules/mediasource/DOMURLMediaSource.cpp
    137134Modules/mediasource/MediaSource.cpp
    … …  
    31153112JSMediaRecorder.cpp
    31163113JSMediaRecorderErrorEvent.cpp
    3117 JSMediaRemoteControls.cpp
    3118 JSMediaSession.cpp
    31193114JSMediaSource.cpp
    31203115JSMediaStream.cpp

  • trunk/Source/WebCore/SourcesCocoa.txt

    r267883 r267885  
    5959JSApplePayShippingMethodUpdate.cpp
    6060JSApplePayValidateMerchantEvent.cpp
     61Modules/airplay/WebMediaSessionManager.cpp
    6162Modules/applepay/ApplePayCancelEvent.cpp
    6263Modules/applepay/ApplePayContactField.cpp
    … …  
    8990Modules/async-clipboard/ios/ClipboardImageReaderIOS.mm
    9091Modules/async-clipboard/mac/ClipboardImageReaderMac.mm
    91 Modules/mediasession/WebMediaSessionManager.cpp
    9292Modules/plugins/QuickTimePluginReplacement.mm
    9393Modules/plugins/YouTubePluginReplacement.cpp
    … …  
    522522platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm
    523523platform/mediarecorder/cocoa/VideoSampleBufferCompressor.mm
    524 platform/mediasession/mac/MediaSessionInterruptionProviderMac.mm
    525524platform/mediastream/ios/AVAudioSessionCaptureDevice.mm
    526525platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm @no-unify

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r267883 r267885  
    41094109                C6F0900F14327B6100685849 /* MutationObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = C6F0900614327B6100685849 /* MutationObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
    41104110                C6F0902D14327D4F00685849 /* JSMutationObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = C6F0902514327D4F00685849 /* JSMutationObserver.h */; };
    4111                 C9027F421B1D0AD200BFBFEF /* MediaSession.h in Headers */ = {isa = PBXBuildFile; fileRef = C9027F401B1D0AD200BFBFEF /* MediaSession.h */; };
    4112                 C90843D01B18E47D00B68564 /* MediaRemoteControls.h in Headers */ = {isa = PBXBuildFile; fileRef = C90843CE1B18E47D00B68564 /* MediaRemoteControls.h */; };
    4113                 C90F65551B2253B1002163A1 /* MediaSessionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C90F65531B225396002163A1 /* MediaSessionManager.cpp */; };
    4114                 C90F65561B2253BE002163A1 /* MediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C90F65541B225396002163A1 /* MediaSessionManager.h */; };
    4115                 C937FE8D1B1F6821008ECC5D /* HTMLMediaElementMediaSession.h in Headers */ = {isa = PBXBuildFile; fileRef = C968B2E61B1E72F700EF1F81 /* HTMLMediaElementMediaSession.h */; };
    4116                 C96F5EC51B5872260091EA9D /* MediaSessionInterruptionProviderMac.h in Headers */ = {isa = PBXBuildFile; fileRef = C96F5EC11B5872260091EA9D /* MediaSessionInterruptionProviderMac.h */; };
    4117                 C96F5EC71B5872260091EA9D /* MediaSessionInterruptionProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C96F5EC31B5872260091EA9D /* MediaSessionInterruptionProvider.cpp */; };
    4118                 C96F5EC81B5872260091EA9D /* MediaSessionInterruptionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = C96F5EC41B5872260091EA9D /* MediaSessionInterruptionProvider.h */; };
    41194111                C99058131E32C75F0073BDDA /* SuccessOr.h in Headers */ = {isa = PBXBuildFile; fileRef = C99058121E32B7340073BDDA /* SuccessOr.h */; settings = {ATTRIBUTES = (Private, ); }; };
    41204112                C9D467051E60C465008195FB /* AutoplayEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C9D467041E60C3EB008195FB /* AutoplayEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    4121                 C9D851F01B39DC780085062E /* MediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9D851EE1B39DC780085062E /* MediaSessionMetadata.h */; settings = {ATTRIBUTES = (Private, ); }; };
    4122                 C9F87CFE1B28F40E00979B83 /* MediaSessionEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = C9F87CFD1B28E5F600979B83 /* MediaSessionEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
    41234113                CA3BF67E10D99BAE00E6CE53 /* ScrollAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    41244114                CA6C1530220B98CC0055CBFC /* JSValueInWrappedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 931AE3B81FB80EAE00F5EFB2 /* JSValueInWrappedObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1422414214                C6F0902514327D4F00685849 /* JSMutationObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMutationObserver.h; sourceTree = "<group>"; };
    1422514215                C6F0917E143A2BB900685849 /* JSMutationObserverCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMutationObserverCustom.cpp; sourceTree = "<group>"; };
    14226                 C9026B631B1CF5AB001D99A7 /* JSMediaRemoteControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaRemoteControls.cpp; sourceTree = "<group>"; };
    14227                 C9026B641B1CF5AB001D99A7 /* JSMediaRemoteControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaRemoteControls.h; sourceTree = "<group>"; };
    14228                 C9027F3E1B1D0AB900BFBFEF /* MediaSession.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = MediaSession.idl; sourceTree = "<group>"; };
    14229                 C9027F3F1B1D0AD200BFBFEF /* MediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSession.cpp; sourceTree = "<group>"; };
    14230                 C9027F401B1D0AD200BFBFEF /* MediaSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSession.h; sourceTree = "<group>"; };
    14231                 C90843CD1B18E47D00B68564 /* MediaRemoteControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaRemoteControls.cpp; sourceTree = "<group>"; };
    14232                 C90843CE1B18E47D00B68564 /* MediaRemoteControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaRemoteControls.h; sourceTree = "<group>"; };
    14233                 C90F65531B225396002163A1 /* MediaSessionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSessionManager.cpp; sourceTree = "<group>"; };
    14234                 C90F65541B225396002163A1 /* MediaSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionManager.h; sourceTree = "<group>"; };
    14235                 C93458BB1B18D77E0088EE12 /* MediaRemoteControls.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaRemoteControls.idl; sourceTree = "<group>"; };
    14236                 C968B2E51B1E704500EF1F81 /* HTMLMediaElement+MediaSession.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = "HTMLMediaElement+MediaSession.idl"; sourceTree = "<group>"; };
    14237                 C968B2E61B1E72F700EF1F81 /* HTMLMediaElementMediaSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HTMLMediaElementMediaSession.h; sourceTree = "<group>"; };
    14238                 C968B2E71B1E778100EF1F81 /* HTMLMediaElementMediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaElementMediaSession.cpp; sourceTree = "<group>"; };
    14239                 C96F5EC11B5872260091EA9D /* MediaSessionInterruptionProviderMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionInterruptionProviderMac.h; sourceTree = "<group>"; };
    14240                 C96F5EC21B5872260091EA9D /* MediaSessionInterruptionProviderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSessionInterruptionProviderMac.mm; sourceTree = "<group>"; };
    14241                 C96F5EC31B5872260091EA9D /* MediaSessionInterruptionProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSessionInterruptionProvider.cpp; sourceTree = "<group>"; };
    14242                 C96F5EC41B5872260091EA9D /* MediaSessionInterruptionProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionInterruptionProvider.h; sourceTree = "<group>"; };
    1424314216                C99058121E32B7340073BDDA /* SuccessOr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SuccessOr.h; sourceTree = "<group>"; };
    1424414217                C9D467041E60C3EB008195FB /* AutoplayEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AutoplayEvent.h; sourceTree = "<group>"; };
    14245                 C9D851EE1B39DC780085062E /* MediaSessionMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSessionMetadata.h; sourceTree = "<group>"; };
    14246                 C9DADBC91B1D3B25001F17D8 /* JSMediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaSession.cpp; sourceTree = "<group>"; };
    14247                 C9DADBCA1B1D3B25001F17D8 /* JSMediaSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaSession.h; sourceTree = "<group>"; };
    14248                 C9F87CFD1B28E5F600979B83 /* MediaSessionEvents.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; path = MediaSessionEvents.h; sourceTree = "<group>"; };
    1424914218                CA091D8623CF907800AD4346 /* StyleImageSet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StyleImageSet.cpp; sourceTree = "<group>"; };
    1425014219                CA091D8923CF908800AD4346 /* StyleImageSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleImageSet.h; sourceTree = "<group>"; };
    … …  
    1676216731                        usesTabs = 0;
    1676316732                };
    16764                 0709D78B1AE5552E004E42F8 /* mediasession */ = {
    16765                         isa = PBXGroup;
    16766                         children = (
    16767                                 C968B2E51B1E704500EF1F81 /* HTMLMediaElement+MediaSession.idl */,
    16768                                 C968B2E71B1E778100EF1F81 /* HTMLMediaElementMediaSession.cpp */,
    16769                                 C968B2E61B1E72F700EF1F81 /* HTMLMediaElementMediaSession.h */,
    16770                                 C90843CD1B18E47D00B68564 /* MediaRemoteControls.cpp */,
    16771                                 C90843CE1B18E47D00B68564 /* MediaRemoteControls.h */,
    16772                                 C93458BB1B18D77E0088EE12 /* MediaRemoteControls.idl */,
    16773                                 C9027F3F1B1D0AD200BFBFEF /* MediaSession.cpp */,
    16774                                 C9027F401B1D0AD200BFBFEF /* MediaSession.h */,
    16775                                 C9027F3E1B1D0AB900BFBFEF /* MediaSession.idl */,
    16776                                 C9F87CFD1B28E5F600979B83 /* MediaSessionEvents.h */,
    16777                                 C90F65531B225396002163A1 /* MediaSessionManager.cpp */,
    16778                                 C90F65541B225396002163A1 /* MediaSessionManager.h */,
    16779                                 C9D851EE1B39DC780085062E /* MediaSessionMetadata.h */,
    16780                                 446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */,
    16781                                 0709D78C1AE55554004E42F8 /* WebMediaSessionManager.cpp */,
    16782                                 0709D78D1AE55554004E42F8 /* WebMediaSessionManager.h */,
    16783                                 0709D7941AE55A29004E42F8 /* WebMediaSessionManagerClient.h */,
    16784                         );
    16785                         path = mediasession;
    16786                         sourceTree = "<group>";
    16787                 };
    1678816733                07221B4617CEC32700848E51 /* mediastream */ = {
    1678916734                        isa = PBXGroup;
    … …  
    2335723302                                CD9A37F517C7D93600C5FA7A /* mediacontrols */,
    2335823303                                4D3B00A0215D5C0F0076B983 /* mediarecorder */,
    23359                                 0709D78B1AE5552E004E42F8 /* mediasession */,
    2336023304                                B1A942DD15B5CE2200D525D1 /* mediasource */,
    2336123305                                07221B4617CEC32700848E51 /* mediastream */,
    … …  
    2444424388                                E44614100CD6826900FADA75 /* JSMediaError.cpp */,
    2444524389                                E44614110CD6826900FADA75 /* JSMediaError.h */,
    24446                                 C9026B631B1CF5AB001D99A7 /* JSMediaRemoteControls.cpp */,
    24447                                 C9026B641B1CF5AB001D99A7 /* JSMediaRemoteControls.h */,
    24448                                 C9DADBC91B1D3B25001F17D8 /* JSMediaSession.cpp */,
    24449                                 C9DADBCA1B1D3B25001F17D8 /* JSMediaSession.h */,
    2445024390                                7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */,
    2445124391                                7E46F6F91627A2C900062223 /* JSOESElementIndexUint.h */,
    … …  
    2697526915                                9AC6F02021148F1E00CBDA06 /* mediacapabilities */,
    2697626916                                4D3B5012217E58A300665DB1 /* mediarecorder */,
    26977                                 C96F5EBF1B5872260091EA9D /* mediasession */,
    2697826917                                07221B9217CF0AD400848E51 /* mediastream */,
    2697926918                                59C77F101054591C00506104 /* mock */,
    … …  
    2727827217                        sourceTree = "<group>";
    2727927218                };
    27280                 C96F5EBF1B5872260091EA9D /* mediasession */ = {
    27281                         isa = PBXGroup;
    27282                         children = (
    27283                                 C96F5EC01B5872260091EA9D /* mac */,
    27284                                 C96F5EC31B5872260091EA9D /* MediaSessionInterruptionProvider.cpp */,
    27285                                 C96F5EC41B5872260091EA9D /* MediaSessionInterruptionProvider.h */,
    27286                         );
    27287                         path = mediasession;
    27288                         sourceTree = "<group>";
    27289                 };
    27290                 C96F5EC01B5872260091EA9D /* mac */ = {
    27291                         isa = PBXGroup;
    27292                         children = (
    27293                                 C96F5EC11B5872260091EA9D /* MediaSessionInterruptionProviderMac.h */,
    27294                                 C96F5EC21B5872260091EA9D /* MediaSessionInterruptionProviderMac.mm */,
    27295                         );
    27296                         path = mac;
    27297                         sourceTree = "<group>";
    27298                 };
    2729927219                CD0DBB3E142274E600280263 /* audio */ = {
    2730027220                        isa = PBXGroup;
    … …  
    2767727597                        isa = PBXGroup;
    2767827598                        children = (
     27599                                446DC64624A29D9B0061F390 /* PlaybackTargetClientContextIdentifier.h */,
    2767927600                                A5DEBD9F16FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.cpp */,
    2768027601                                A5DEBDA016FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.h */,
    2768127602                                A5DEBDA116FB908700836FE0 /* WebKitPlaybackTargetAvailabilityEvent.idl */,
     27603                                0709D78C1AE55554004E42F8 /* WebMediaSessionManager.cpp */,
     27604                                0709D78D1AE55554004E42F8 /* WebMediaSessionManager.h */,
     27605                                0709D7941AE55A29004E42F8 /* WebMediaSessionManagerClient.h */,
    2768227606                        );
    2768327607                        path = airplay;
    … …  
    3169231616                                E44613A50CD6331000FADA75 /* HTMLMediaElement.h in Headers */,
    3169331617                                CD5209E61B0BD9E10077184E /* HTMLMediaElementEnums.h in Headers */,
    31694                                 C937FE8D1B1F6821008ECC5D /* HTMLMediaElementMediaSession.h in Headers */,
    3169531618                                CDC312EA22FCD7C6001204EC /* HTMLMediaElementRemotePlayback.h in Headers */,
    3169631619                                A8EA79F40A1916DF00A8EF5F /* HTMLMenuElement.h in Headers */,
    … …  
    3303832961                                4D73F94E218C4A87003A3ED6 /* MediaRecorderPrivateWriterCocoa.h in Headers */,
    3303932962                                4176E89623C3537B003E83FE /* MediaRecorderProvider.h in Headers */,
    33040                                 C90843D01B18E47D00B68564 /* MediaRemoteControls.h in Headers */,
    3304132963                                CD8ACA8F1D23971900ECC59E /* MediaRemoteSoftLink.h in Headers */,
    3304232964                                CEEFCD7A19DB31F7003876D7 /* MediaResourceLoader.h in Headers */,
    … …  
    3304532967                                CDBEAEAD19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h in Headers */,
    3304632968                                A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers */,
    33047                                 C9027F421B1D0AD200BFBFEF /* MediaSession.h in Headers */,
    33048                                 C9F87CFE1B28F40E00979B83 /* MediaSessionEvents.h in Headers */,
    3304932969                                CDA9593F2412BAE000910EEF /* MediaSessionHelperIOS.h in Headers */,
    3305032970                                414460A22412994500814BE7 /* MediaSessionIdentifier.h in Headers */,
    33051                                 C96F5EC81B5872260091EA9D /* MediaSessionInterruptionProvider.h in Headers */,
    33052                                 C96F5EC51B5872260091EA9D /* MediaSessionInterruptionProviderMac.h in Headers */,
    33053                                 C90F65561B2253BE002163A1 /* MediaSessionManager.h in Headers */,
    3305432971                                417F7AEF2139BF6F00FBA7EC /* MediaSessionManagerCocoa.h in Headers */,
    3305532972                                07638A991884487200E15A1B /* MediaSessionManagerIOS.h in Headers */,
    33056                                 C9D851F01B39DC780085062E /* MediaSessionMetadata.h in Headers */,
    3305732973                                CD3A495F17A9D01B00274E42 /* MediaSource.h in Headers */,
    3305832974                                CD641EB31818F5ED00EE4C41 /* MediaSourcePrivate.h in Headers */,
    … …  
    3528535201                                CDBEAEAC19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm in Sources */,
    3528635202                                CDA9593524123CB800910EEF /* MediaSessionHelperIOS.mm in Sources */,
    35287                                 C96F5EC71B5872260091EA9D /* MediaSessionInterruptionProvider.cpp in Sources */,
    35288                                 C90F65551B2253B1002163A1 /* MediaSessionManager.cpp in Sources */,
    3528935203                                07638A9A1884487200E15A1B /* MediaSessionManagerIOS.mm in Sources */,
    3529035204                                CDC8B5A6180474F70016E685 /* MediaSourcePrivateAVFObjC.mm in Sources */,

  • trunk/Source/WebCore/dom/Document.cpp

    r267883 r267885  
    299299#endif
    300300
    301 #if ENABLE(MEDIA_SESSION)
    302 #include "MediaSession.h"
    303 #endif
    304 
    305301#if USE(QUICK_LOOK)
    306302#include "QuickLook.h"
    … …  
    41864182#endif
    41874183
    4188 #if ENABLE(MEDIA_SESSION)
    4189     if (HTMLMediaElement* sourceElement = HTMLMediaElement::elementWithID(sourceElementID)) {
    4190         if (sourceElement->isPlaying())
    4191             state |= MediaProducer::IsSourceElementPlaying;
    4192 
    4193         if (auto* session = sourceElement->session()) {
    4194             if (auto* controls = session->controls()) {
    4195                 if (controls->previousTrackEnabled())
    4196                     state |= MediaProducer::IsPreviousTrackControlEnabled;
    4197                 if (controls->nextTrackEnabled())
    4198                     state |= MediaProducer::IsNextTrackControlEnabled;
    4199             }
    4200         }
    4201     }
    4202 #endif
    4203 
    42044184    if (m_userHasInteractedWithMediaElement)
    42054185        state |= MediaProducer::HasUserInteractedWithMediaElement;
    … …  
    74707450#endif // ENABLE(WIRELESS_PLAYBACK_TARGET)
    74717451
    7472 #if ENABLE(MEDIA_SESSION)
    7473 
    7474 MediaSession& Document::defaultMediaSession()
    7475 {
    7476     if (!m_defaultMediaSession)
    7477         m_defaultMediaSession = MediaSession::create(*scriptExecutionContext());
    7478     return *m_defaultMediaSession;
    7479 }
    7480 
    7481 #endif
    7482 
    74837452ShouldOpenExternalURLsPolicy Document::shouldOpenExternalURLsPolicyToPropagate() const
    74847453{

  • trunk/Source/WebCore/dom/Document.h

    r267883 r267885  
    178178class MediaQueryList;
    179179class MediaQueryMatcher;
    180 class MediaSession;
    181180class MessagePortChannelProvider;
    182181class MouseEventWithHitTestResults;
    … …  
    10981097    bool mediaDataLoadsAutomatically() const;
    10991098
    1100 #if ENABLE(MEDIA_SESSION)
    1101     MediaSession& defaultMediaSession();
    1102 #endif
    1103 
    11041099    void privateBrowsingStateDidChange(PAL::SessionID);
    11051100
    … …  
    19531948#endif
    19541949
    1955 #if ENABLE(MEDIA_SESSION)
    1956     RefPtr<MediaSession> m_defaultMediaSession;
    1957 #endif
    1958 
    19591950#if ENABLE(INDEXED_DATABASE)
    19601951    RefPtr<IDBClient::IDBConnectionProxy> m_idbConnectionProxy;

  • trunk/Source/WebCore/dom/EventTargetFactory.in

    r267883 r267885  
    2323MediaKeySession conditional=ENCRYPTED_MEDIA
    2424MediaQueryList
    25 MediaRemoteControls conditional=MEDIA_SESSION
    2625MediaRecorder conditional=MEDIA_STREAM
    2726MediaSource conditional=MEDIA_SOURCE

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r267883 r267885  
    138138#endif
    139139
    140 #if ENABLE(MEDIA_SESSION)
    141 #include "MediaSession.h"
    142 #endif
    143 
    144140#if ENABLE(MEDIA_SOURCE)
    145141#include "DOMWindow.h"
    … …  
    318314    return elements;
    319315}
    320 
    321 #if ENABLE(MEDIA_SESSION)
    322 typedef HashMap<uint64_t, HTMLMediaElement*> IDToElementMap;
    323 
    324 static IDToElementMap& elementIDsToElements()
    325 {
    326     static NeverDestroyed<IDToElementMap> map;
    327     return map;
    328 }
    329 
    330 HTMLMediaElement* HTMLMediaElement::elementWithID(uint64_t id)
    331 {
    332     if (id == HTMLMediaElementInvalidID)
    333         return nullptr;
    334 
    335     return elementIDsToElements().get(id);
    336 }
    337 
    338 static uint64_t nextElementID()
    339 {
    340     static uint64_t elementID = 0;
    341     return ++elementID;
    342 }
    343 #endif
    344316
    345317struct MediaElementSessionInfo {
    … …  
    518490#endif
    519491
    520 #if ENABLE(MEDIA_SESSION)
    521     m_elementID = nextElementID();
    522     elementIDsToElements().add(m_elementID, this);
    523 
    524     setSessionInternal(document.defaultMediaSession());
    525 #endif
    526 
    527492    registerWithDocument(document);
    528493
    … …  
    588553    if (m_isolatedWorld)
    589554        m_isolatedWorld->clearWrappers();
    590 
    591 #if ENABLE(MEDIA_SESSION)
    592     if (m_session) {
    593         m_session->removeMediaElement(*this);
    594         m_session = nullptr;
    595     }
    596 
    597     elementIDsToElements().remove(m_elementID);
    598 #endif
    599555
    600556    m_seekTaskQueue.close();
    … …  
    34963452        scheduleEvent(eventNames().playEvent);
    34973453
    3498 #if ENABLE(MEDIA_SESSION)
    3499         // 6.3 Activating a media session from a media element
    3500         // When the play() method is invoked, the paused attribute is true, and the readyState attribute has the value
    3501         // HAVE_FUTURE_DATA or HAVE_ENOUGH_DATA, then
    3502         // 1. Let media session be the value of the current media session.
    3503         // 2. If we are not currently in media session's list of active participating media elements then append
    3504         //    ourselves to this list.
    3505         // 3. Let activated be the result of running the media session invocation algorithm for media session.
    3506         // 4. If activated is failure, pause ourselves.
    3507         if (m_readyState == HAVE_ENOUGH_DATA || m_readyState == HAVE_FUTURE_DATA) {
    3508             if (m_session) {
    3509                 m_session->addActiveMediaElement(*this);
    3510 
    3511                 if (m_session->kind() == MediaSessionKind::Content) {
    3512                     if (Page* page = document().page())
    3513                         page->chrome().client().focusedContentMediaElementDidChange(m_elementID);
    3514                 }
    3515 
    3516                 if (!m_session->invoke()) {
    3517                     pause();
    3518                     return;
    3519                 }
    3520             }
    3521         }
    3522 #endif
    35233454        if (m_readyState <= HAVE_CURRENT_DATA)
    35243455            scheduleEvent(eventNames().waitingEvent);
    … …  
    37233654        updateShouldPlay();
    37243655
    3725 #if ENABLE(MEDIA_SESSION)
    3726         document().updateIsPlayingMedia(m_elementID);
    3727 #else
    37283656        document().updateIsPlayingMedia();
    3729 #endif
    37303657
    37313658#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    … …  
    51165043    }
    51175044
    5118 #if ENABLE(MEDIA_SESSION)
    5119     document().updateIsPlayingMedia(m_elementID);
    5120 #else
    51215045    document().updateIsPlayingMedia();
    5122 #endif
    51235046
    51245047    checkForAudioAndVideo();
    … …  
    52935216    }
    52945217
    5295 #if ENABLE(MEDIA_SESSION)
    5296     document().updateIsPlayingMedia(m_elementID);
    5297 #else
    52985218    document().updateIsPlayingMedia();
    5299 #endif
    5300 
    53015219#endif // PLATFORM(IOS_FAMILY)
    53025220}
    … …  
    54155333        scheduleNotifyAboutPlaying();
    54165334
    5417 #if ENABLE(MEDIA_SESSION)
    5418     document().updateIsPlayingMedia(m_elementID);
    5419 #else
    54205335    document().updateIsPlayingMedia();
    5421 #endif
    54225336
    54235337#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    … …  
    76417555    m_mediaState = state;
    76427556    m_mediaSession->mediaStateDidChange(m_mediaState);
    7643 #if ENABLE(MEDIA_SESSION)
    7644     document().updateIsPlayingMedia(m_elementID);
    7645 #else
     7557
    76467558    document().updateIsPlayingMedia();
    7647 #endif
    76487559}
    76497560#endif
    … …  
    77507661    if (m_mediaController)
    77517662        volumeMultiplier *= m_mediaController->volume();
    7752 #if ENABLE(MEDIA_SESSION)
    7753     if (m_shouldDuck)
    7754         volumeMultiplier *= 0.25;
    7755 #endif
    7756 
    77577663    return m_volume * volumeMultiplier;
    77587664}
    … …  
    78147720    return false;
    78157721}
    7816 
    7817 #if ENABLE(MEDIA_SESSION)
    7818 
    7819 double HTMLMediaElement::playerVolume() const
    7820 {
    7821     return m_player ? m_player->volume() : 0;
    7822 }
    7823 
    7824 MediaSession* HTMLMediaElement::session() const
    7825 {
    7826     RefPtr<MediaSession> session = m_session.get();
    7827     if (session && session == &document().defaultMediaSession())
    7828         return nullptr;
    7829 
    7830     return session.get();
    7831 }
    7832 
    7833 void HTMLMediaElement::setSession(MediaSession* session)
    7834 {
    7835     // 6.1. Extensions to the HTMLMediaElement interface
    7836     // 1. Let m be the media element in question.
    7837     // 2. Let old media session be m’s current media session, if it has one, and null otherwise.
    7838     // 3. Let m’s current media session be the new value or the top-level browsing context’s media session if the new value is null.
    7839     // 4. Let new media session be m’s current media session.
    7840 
    7841     // 5. Update media sessions: If old media session and new media session are the same (whether both null or both the same media session), then terminate these steps.
    7842     if (m_session.get() == session)
    7843         return;
    7844 
    7845     if (m_session) {
    7846         // 6. If m is an audio-producing participant of old media session, then pause m and remove m from old media session’s list of audio-producing participants.
    7847         if (m_session->isMediaElementActive(*this))
    7848             pause();
    7849 
    7850         m_session->removeMediaElement(*this);
    7851 
    7852         // 7. If old media session is not null and no longer has one or more audio-producing participants, then run the media session deactivation algorithm for old media session.
    7853         if (!m_session->hasActiveMediaElements())
    7854             m_session->deactivate();
    7855     }
    7856 
    7857     if (session)
    7858         setSessionInternal(*session);
    7859     else
    7860         setSessionInternal(document().defaultMediaSession());
    7861 }
    7862 
    7863 void HTMLMediaElement::setSessionInternal(MediaSession& session)
    7864 {
    7865     m_session = &session;
    7866     session.addMediaElement(*this);
    7867     m_kind = session.kind();
    7868 }
    7869 
    7870 void HTMLMediaElement::setShouldDuck(bool duck)
    7871 {
    7872     if (m_shouldDuck == duck)
    7873         return;
    7874 
    7875     m_shouldDuck = duck;
    7876     updateVolume();
    7877 }
    7878 
    7879 #endif
    78807722
    78817723void HTMLMediaElement::allowsMediaDocumentInlinePlaybackChanged()

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r267883 r267885  
    486486    void mediaLoadingFailedFatally(MediaPlayer::NetworkState);
    487487
    488 #if ENABLE(MEDIA_SESSION)
    489     WEBCORE_EXPORT double playerVolume() const;
    490 
    491     const String& kind() const { return m_kind; }
    492     void setKind(const String& kind) { m_kind = kind; }
    493 
    494     MediaSession* session() const;
    495     void setSession(MediaSession*);
    496 
    497     void setShouldDuck(bool);
    498 
    499     static HTMLMediaElement* elementWithID(uint64_t);
    500     uint64_t elementID() const { return m_elementID; }
    501 #endif
    502 
    503488    RefPtr<VideoPlaybackQuality> getVideoPlaybackQuality();
    504489
    … …  
    709694    using EventTarget::dispatchEvent;
    710695    void dispatchEvent(Event&) override;
    711 #endif
    712 
    713 #if ENABLE(MEDIA_SESSION)
    714     void setSessionInternal(MediaSession&);
    715696#endif
    716697
    … …  
    10461027    int m_processingMediaPlayerCallback { 0 };
    10471028
    1048 #if ENABLE(MEDIA_SESSION)
    1049     String m_kind;
    1050     RefPtr<MediaSession> m_session;
    1051     bool m_shouldDuck { false };
    1052     uint64_t m_elementID;
    1053 #endif
    1054 
    10551029#if ENABLE(MEDIA_SOURCE)
    10561030    RefPtr<MediaSource> m_mediaSource;

  • trunk/Source/WebCore/page/ChromeClient.h

    r267883 r267885  
    465465    virtual void handleAutoplayEvent(AutoplayEvent, OptionSet<AutoplayEventFlags>) { }
    466466
    467 #if ENABLE(MEDIA_SESSION)
    468     virtual void hasMediaSessionWithActiveMediaElementsDidChange(bool) { }
    469     virtual void mediaSessionMetadataDidChange(const MediaSessionMetadata&) { }
    470     virtual void focusedContentMediaElementDidChange(uint64_t) { }
    471 #endif
    472 
    473467#if ENABLE(WEB_CRYPTO)
    474468    virtual bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const { return false; }

  • trunk/Source/WebCore/page/Page.cpp

    r267883 r267885  
    155155#endif
    156156
    157 #if ENABLE(MEDIA_SESSION)
    158 #include "MediaSessionManager.h"
    159 #endif
    160 
    161157#if ENABLE(INDEXED_DATABASE)
    162158#include "IDBConnectionToServer.h"
    … …  
    20972093#endif
    20982094}
    2099 
    2100 #if ENABLE(MEDIA_SESSION)
    2101 
    2102 void Page::handleMediaEvent(MediaEventType eventType)
    2103 {
    2104     switch (eventType) {
    2105     case MediaEventType::PlayPause:
    2106         MediaSessionManager::singleton().togglePlayback();
    2107         break;
    2108     case MediaEventType::TrackNext:
    2109         MediaSessionManager::singleton().skipToNextTrack();
    2110         break;
    2111     case MediaEventType::TrackPrevious:
    2112         MediaSessionManager::singleton().skipToPreviousTrack();
    2113         break;
    2114     }
    2115 }
    2116 
    2117 void Page::setVolumeOfMediaElement(double volume, uint64_t elementID)
    2118 {
    2119     if (HTMLMediaElement* element = HTMLMediaElement::elementWithID(elementID))
    2120         element->setVolume(volume, ASSERT_NO_EXCEPTION);
    2121 }
    2122 
    2123 #endif
    21242095
    21252096unsigned Page::subframeCount() const

  • trunk/Source/WebCore/page/Page.h

    r267883 r267885  
    6161#if ENABLE(APPLICATION_MANIFEST)
    6262#include "ApplicationManifest.h"
    63 #endif
    64 
    65 #if ENABLE(MEDIA_SESSION)
    66 #include "MediaSessionEvents.h"
    6763#endif
    6864
    … …  
    661657    bool canUseCredentialStorage() const { return m_canUseCredentialStorage; }
    662658
    663 #if ENABLE(MEDIA_SESSION)
    664     WEBCORE_EXPORT void handleMediaEvent(MediaEventType);
    665     WEBCORE_EXPORT void setVolumeOfMediaElement(double, uint64_t);
    666 #endif
    667 
    668659#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    669660    void addPlaybackTargetPickerClient(PlaybackTargetClientContextIdentifier);

  • trunk/Source/WebCore/testing/Internals.cpp

    r267883 r267885  
    286286#endif
    287287
    288 #if ENABLE(MEDIA_SESSION)
    289 #include "MediaSession.h"
    290 #include "MediaSessionManager.h"
    291 #endif
    292 
    293288#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    294289#include "MediaPlaybackTargetContext.h"
    … …  
    42874282    return element.isDisablingSleep();
    42884283}
    4289 
    42904284#endif // ENABLE(VIDEO)
    4291 
    4292 #if ENABLE(MEDIA_SESSION)
    4293 
    4294 void Internals::sendMediaSessionStartOfInterruptionNotification(MediaSessionInterruptingCategory category)
    4295 {
    4296     MediaSessionManager::singleton().didReceiveStartOfInterruptionNotification(category);
    4297 }
    4298 
    4299 void Internals::sendMediaSessionEndOfInterruptionNotification(MediaSessionInterruptingCategory category)
    4300 {
    4301     MediaSessionManager::singleton().didReceiveEndOfInterruptionNotification(category);
    4302 }
    4303 
    4304 String Internals::mediaSessionCurrentState(MediaSession* session) const
    4305 {
    4306     switch (session->currentState()) {
    4307     case MediaSession::State::Active:
    4308         return "active";
    4309     case MediaSession::State::Interrupted:
    4310         return "interrupted";
    4311     case MediaSession::State::Idle:
    4312         return "idle";
    4313     }
    4314 }
    4315 
    4316 double Internals::mediaElementPlayerVolume(HTMLMediaElement* element) const
    4317 {
    4318     ASSERT_ARG(element, element);
    4319     return element->playerVolume();
    4320 }
    4321 
    4322 void Internals::sendMediaControlEvent(MediaControlEvent event)
    4323 {
    4324     // FIXME: No good reason to use a single function with an argument instead of three functions.
    4325     switch (event) {
    4326     case MediControlEvent::PlayPause:
    4327         MediaSessionManager::singleton().togglePlayback();
    4328         break;
    4329     case MediControlEvent::NextTrack:
    4330         MediaSessionManager::singleton().skipToNextTrack();
    4331         break;
    4332     case MediControlEvent::PreviousTrack:
    4333         MediaSessionManager::singleton().skipToPreviousTrack();
    4334         break;
    4335     }
    4336 }
    4337 
    4338 #endif // ENABLE(MEDIA_SESSION)
    43394285
    43404286#if ENABLE(WEB_AUDIO)

  • trunk/Source/WebCore/testing/Internals.h

    r267883 r267885  
    4141#include <JavaScriptCore/Float32Array.h>
    4242#include <wtf/Optional.h>
    43 
    44 #if ENABLE(MEDIA_SESSION)
    45 #include "MediaSessionInterruptionProvider.h"
    46 #endif
    4743
    4844#if ENABLE(VIDEO)
    … …  
    667663#endif
    668664
    669 #if ENABLE(MEDIA_SESSION)
    670     void sendMediaSessionStartOfInterruptionNotification(MediaSessionInterruptingCategory);
    671     void sendMediaSessionEndOfInterruptionNotification(MediaSessionInterruptingCategory);
    672     String mediaSessionCurrentState(MediaSession&) const;
    673     double mediaElementPlayerVolume(HTMLMediaElement&) const;
    674     enum class MediaControlEvent { PlayPause, NextTrack, PreviousTrack };
    675     void sendMediaControlEvent(MediaControlEvent);
    676 #endif
    677 
    678665#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    679666    void setMockMediaPlaybackTargetPickerEnabled(bool);

  • trunk/Source/WebCore/testing/Internals.idl

    r267883 r267885  
    4545    "ResourceLoadPriorityHigh",
    4646    "ResourceLoadPriorityVeryHigh"
    47 };
    48 
    49 [Conditional=MEDIA_SESSION] enum MediaSessionInterruptingCategory {
    50     "content",
    51     "transient",
    52     "transient-solo"
    53 };
    54 
    55 [Conditional=MEDIA_SESSION] enum MediaControlEvent {
    56     "play-pause",
    57     "next-track",
    58     "previous-track"
    5947};
    6048
    … …  
    697685    [Conditional=VIDEO, MayThrowException] undefined beginMediaSessionInterruption(DOMString interruptionType);
    698686    [Conditional=VIDEO] undefined endMediaSessionInterruption(DOMString flags);
    699     [Conditional=MEDIA_SESSION] undefined sendMediaSessionStartOfInterruptionNotification(MediaSessionInterruptingCategory category);
    700     [Conditional=MEDIA_SESSION] undefined sendMediaSessionEndOfInterruptionNotification(MediaSessionInterruptingCategory category);
    701     [Conditional=MEDIA_SESSION] DOMString mediaSessionCurrentState(MediaSession session);
    702     [Conditional=MEDIA_SESSION] double mediaElementPlayerVolume(HTMLMediaElement element);
    703     [Conditional=MEDIA_SESSION] undefined sendMediaControlEvent(MediaControlEvent event);
    704687    [Conditional=VIDEO] undefined applicationWillBecomeInactive();
    705688    [Conditional=VIDEO] undefined applicationDidBecomeActive();

  • trunk/Source/WebKit/ChangeLog

    r267883 r267885  
     12020-10-02  Sam Weinig  <weinig@apple.com>
     2
     3        Remove code behind ENABLE(MEDIA_SESSION), no ports enable it
     4        https://bugs.webkit.org/show_bug.cgi?id=216831
     5
     6        Reviewed by Alex Christensen.
     7
     8        Removes all code in ENABLE(MEDIA_SESSION) and all media session
     9        related SPI. It was never enabled and nothing ever adopted it.
     10
     11        * Sources.txt:
     12        * SourcesCocoa.txt:
     13        * WebKit.xcodeproj/project.pbxproj:
     14        Remove media session related files.
     15
     16        * Shared/API/APIObject.h:
     17        * Shared/API/c/WKBase.h:
     18        * Shared/WebCoreArgumentCoders.cpp:
     19        * Shared/WebCoreArgumentCoders.h:
     20        * Shared/WebMediaSessionMetadata.cpp: Removed.
     21        * Shared/WebMediaSessionMetadata.h: Removed.
     22        * UIProcess/API/APIUIClient.h:
     23        * UIProcess/API/C/WKAPICast.h:
     24        * UIProcess/API/C/WKContext.cpp:
     25        * UIProcess/API/C/WKContext.h:
     26        * UIProcess/API/C/WKMediaSessionFocusManager.cpp: Removed.
     27        * UIProcess/API/C/WKMediaSessionFocusManager.h: Removed.
     28        * UIProcess/API/C/WKMediaSessionMetadata.cpp: Removed.
     29        * UIProcess/API/C/WKMediaSessionMetadata.h: Removed.
     30        * UIProcess/API/C/WKPage.cpp:
     31        * UIProcess/API/C/WKPagePrivate.h:
     32        * UIProcess/API/C/WKPageUIClient.h:
     33        * UIProcess/WebMediaSessionFocusManager.cpp: Removed.
     34        * UIProcess/WebMediaSessionFocusManager.h: Removed.
     35        * UIProcess/WebMediaSessionFocusManagerClient.cpp: Removed.
     36        * UIProcess/WebMediaSessionFocusManagerClient.h: Removed.
     37        * UIProcess/WebPageProxy.cpp:
     38        * UIProcess/WebPageProxy.h:
     39        * UIProcess/WebPageProxy.messages.in:
     40        * UIProcess/WebProcessPool.cpp:
     41        * UIProcess/WebProcessPool.h:
     42        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     43        * WebProcess/WebCoreSupport/WebChromeClient.h:
     44        * WebProcess/WebPage/WebPage.cpp:
     45        * WebProcess/WebPage/WebPage.h:
     46        * WebProcess/WebPage/WebPage.messages.in:
     47        Remove all code in ENABLE(MEDIA_SESSION).
     48
    1492020-10-02  Karl Rackler  <rackler@apple.com>
    250

  • trunk/Source/WebKit/Shared/API/APIObject.h

    r267883 r267885  
    180180        WindowFeatures,
    181181
    182 #if ENABLE(MEDIA_SESSION)
    183         MediaSessionFocusManager,
    184         MediaSessionMetadata,
    185 #endif
    186 
    187182#if ENABLE(WEB_AUTHN)
    188183        WebAuthenticationAssertionResponse,
    … …  
    429424        API::Object::Type::WindowFeatures,
    430425
    431 #if ENABLE(MEDIA_SESSION)
    432         API::Object::Type::MediaSessionFocusManager,
    433         API::Object::Type::MediaSessionMetadata,
    434 #endif
    435 
    436426#if ENABLE(WEB_AUTHN)
    437427        API::Object::Type::WebAuthenticationAssertionResponse,

  • trunk/Source/WebKit/Shared/API/c/WKBase.h

    r267883 r267885  
    106106typedef const struct OpaqueWKInspector* WKInspectorRef;
    107107typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
    108 typedef const struct OpaqueWKMediaSessionFocusManager* WKMediaSessionFocusManagerRef;
    109 typedef const struct OpaqueWKMediaSessionMetadata* WKMediaSessionMetadataRef;
    110108typedef const struct OpaqueWKMessageListener* WKMessageListenerRef;
    111109typedef const struct OpaqueWKNavigationAction* WKNavigationActionRef;

  • trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp

    r267883 r267885  
    110110#endif
    111111
    112 #if ENABLE(MEDIA_SESSION)
    113 #include <WebCore/MediaSessionMetadata.h>
    114 #endif
    115 
    116112#if ENABLE(MEDIA_STREAM)
    117113#include <WebCore/CaptureDevice.h>
    … …  
    21062102    return true;
    21072103}
    2108 
    2109 #if ENABLE(MEDIA_SESSION)
    2110 void ArgumentCoder<MediaSessionMetadata>::encode(Encoder& encoder, const MediaSessionMetadata& result)
    2111 {
    2112     encoder << result.artist();
    2113     encoder << result.album();
    2114     encoder << result.title();
    2115     encoder << result.artworkURL();
    2116 }
    2117 
    2118 bool ArgumentCoder<MediaSessionMetadata>::decode(Decoder& decoder, MediaSessionMetadata& result)
    2119 {
    2120     String artist, album, title;
    2121     URL artworkURL;
    2122     if (!decoder.decode(artist))
    2123         return false;
    2124     if (!decoder.decode(album))
    2125         return false;
    2126     if (!decoder.decode(title))
    2127         return false;
    2128     if (!decoder.decode(artworkURL))
    2129         return false;
    2130     result = MediaSessionMetadata(title, artist, album, artworkURL);
    2131     return true;
    2132 }
    2133 #endif
    21342104
    21352105void ArgumentCoder<ScrollableAreaParameters>::encode(Encoder& encoder, const ScrollableAreaParameters& parameters)

  • trunk/Source/WebKit/Shared/WebCoreArgumentCoders.h

    r267883 r267885  
    188188#endif
    189189
    190 #if ENABLE(MEDIA_SESSION)
    191 class MediaSessionMetadata;
    192 #endif
    193 
    194190#if ENABLE(MEDIA_STREAM)
    195191struct MediaConstraints;
    … …  
    633629    static void encode(Encoder&, const WebCore::ContentFilterUnblockHandler&);
    634630    static WARN_UNUSED_RETURN bool decode(Decoder&, WebCore::ContentFilterUnblockHandler&);
    635 };
    636 #endif
    637 
    638 #if ENABLE(MEDIA_SESSION)
    639 template<> struct ArgumentCoder<WebCore::MediaSessionMetadata> {
    640     static void encode(Encoder&, const WebCore::MediaSessionMetadata&);
    641     static WARN_UNUSED_RETURN bool decode(Decoder&, WebCore::MediaSessionMetadata&);
    642631};
    643632#endif

  • trunk/Source/WebKit/Sources.txt

    r267883 r267885  
    198198Shared/WebKeyboardEvent.cpp @no-unify
    199199Shared/WebKit2Initialize.cpp @no-unify
    200 Shared/WebMediaSessionMetadata.cpp
    201200Shared/WebMemorySampler.cpp
    202201Shared/WebMouseEvent.cpp @no-unify
    … …  
    380379UIProcess/API/C/WKInspector.cpp
    381380UIProcess/API/C/WKKeyValueStorageManager.cpp
    382 UIProcess/API/C/WKMediaSessionMetadata.cpp
    383381UIProcess/API/C/WKMessageListener.cpp
    384382UIProcess/API/C/WKMockDisplay.cpp

  • trunk/Source/WebKit/SourcesCocoa.txt

    r267883 r267885  
    227227UIProcess/ViewGestureController.cpp
    228228UIProcess/ViewSnapshotStore.cpp
    229 UIProcess/WebMediaSessionFocusManager.cpp
    230 UIProcess/WebMediaSessionFocusManagerClient.cpp
    231229UIProcess/WebMemoryPressureHandler.cpp
    232230UIProcess/WKImagePreviewViewController.mm
    … …  
    235233
    236234UIProcess/API/C/WKContextMenuListener.cpp
    237 UIProcess/API/C/WKMediaSessionFocusManager.cpp
    238235UIProcess/API/C/WKTestingSupport.cpp
    239236UIProcess/API/C/WKUserScriptRef.cpp

  • trunk/Source/WebKit/UIProcess/API/APIUIClient.h

    r267883 r267885  
    6161class WebPageProxy;
    6262struct NavigationActionData;
    63 
    64 #if ENABLE(MEDIA_SESSION)
    65 class WebMediaSessionMetadata;
    66 #endif
    6763}
    6864
    … …  
    162158    virtual void handleAutoplayEvent(WebKit::WebPageProxy&, WebCore::AutoplayEvent, OptionSet<WebCore::AutoplayEventFlags>) { }
    163159
    164 #if ENABLE(MEDIA_SESSION)
    165     virtual void mediaSessionMetadataDidChange(WebKit::WebPageProxy&, WebKit::WebMediaSessionMetadata*) { }
    166 #endif
    167 
    168160#if PLATFORM(IOS_FAMILY)
    169161#if HAVE(APP_LINKS)

  • trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h

    r267883 r267885  
    9595class WebIconDatabase;
    9696class WebInspectorProxy;
    97 class WebMediaSessionFocusManager;
    98 class WebMediaSessionMetadata;
    9997class WebNotification;
    10098class WebNotificationManagerProxy;
    … …  
    137135WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
    138136WK_ADD_API_MAPPING(WKInspectorRef, WebInspectorProxy)
    139 WK_ADD_API_MAPPING(WKMediaSessionFocusManagerRef, WebMediaSessionFocusManager)
    140 WK_ADD_API_MAPPING(WKMediaSessionMetadataRef, WebMediaSessionMetadata)
    141137WK_ADD_API_MAPPING(WKMessageListenerRef, API::MessageListener)
    142138WK_ADD_API_MAPPING(WKNavigationActionRef, API::NavigationAction)

  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r267883 r267885  
    437437}
    438438
    439 WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context)
    440 {
    441 #if ENABLE(MEDIA_SESSION)
    442     return WebKit::toAPI(WebKit::toImpl(context)->supplement<WebKit::WebMediaSessionFocusManager>());
    443 #else
    444     UNUSED_PARAM(context);
    445     return nullptr;
    446 #endif
    447 }
    448 
    449439WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef contextRef)
    450440{

  • trunk/Source/WebKit/UIProcess/API/C/WKContext.h

    r267883 r267885  
    172172WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);
    173173WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKWebsiteDataStoreGetDefaultDataStore);
    174 WK_EXPORT WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context);
    175174WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
    176175WK_EXPORT WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKWebsiteDataStoreGetDefaultDataStore);

  • trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

    r267883 r267885  
    9595#endif
    9696
    97 #if ENABLE(MEDIA_SESSION)
    98 #include "WebMediaSessionMetadata.h"
    99 #include <WebCore/MediaSessionEvents.h>
    100 #endif
    101 
    10297#if PLATFORM(COCOA)
    10398#include "VersionChecks.h"
    … …  
    20342029        }
    20352030
    2036 #if ENABLE(MEDIA_SESSION)
    2037         void mediaSessionMetadataDidChange(WebPageProxy& page, WebMediaSessionMetadata* metadata) final
    2038         {
    2039             if (!m_client.mediaSessionMetadataDidChange)
    2040                 return;
    2041 
    2042             m_client.mediaSessionMetadataDidChange(toAPI(&page), toAPI(metadata), m_client.base.clientInfo);
    2043         }
    2044 #endif
    20452031#if ENABLE(POINTER_LOCK)
    20462032        void requestPointerLock(WebPageProxy* page) final
    … …  
    27302716#else
    27312717    UNUSED_PARAM(page);
    2732 #endif
    2733 }
    2734 
    2735 bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page)
    2736 {
    2737 #if ENABLE(MEDIA_SESSION)
    2738     return toImpl(page)->hasMediaSessionWithActiveMediaElements();
    2739 #else
    2740     UNUSED_PARAM(page);
    2741     return false;
    2742 #endif
    2743 }
    2744 
    2745 void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType wkEventType)
    2746 {
    2747 #if ENABLE(MEDIA_SESSION)
    2748     MediaEventType eventType;
    2749 
    2750     switch (wkEventType) {
    2751     case kWKMediaEventTypePlayPause:
    2752         eventType = MediaEventType::PlayPause;
    2753         break;
    2754     case kWKMediaEventTypeTrackNext:
    2755         eventType = MediaEventType::TrackNext;
    2756         break;
    2757     case kWKMediaEventTypeTrackPrevious:
    2758         eventType = MediaEventType::TrackPrevious;
    2759         break;
    2760     default:
    2761         ASSERT_NOT_REACHED();
    2762         return;
    2763     }
    2764 
    2765     toImpl(page)->handleMediaEvent(eventType);
    2766 #else
    2767     UNUSED_PARAM(page);
    2768     UNUSED_PARAM(wkEventType);
    27692718#endif
    27702719}

  • trunk/Source/WebKit/UIProcess/API/C/WKPagePrivate.h

    r267883 r267885  
    152152typedef uint32_t WKMediaState;
    153153
    154 
    155154WK_EXPORT WKMediaState WKPageGetMediaState(WKPageRef page);
    156 
    157 enum {
    158     kWKMediaEventTypePlayPause,
    159     kWKMediaEventTypeTrackNext,
    160     kWKMediaEventTypeTrackPrevious
    161 };
    162 typedef uint32_t WKMediaEventType;
    163 
    164 WK_EXPORT bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page);
    165 WK_EXPORT void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType event);
    166155
    167156WK_EXPORT void WKPageLoadURLWithShouldOpenExternalURLsPolicy(WKPageRef page, WKURLRef url, bool shouldOpenExternalURLs);

  • trunk/Source/WebKit/UIProcess/API/C/WKPageUIClient.h

    r267883 r267885  
    127127typedef void (*WKCheckUserMediaPermissionCallback)(WKPageRef page, WKFrameRef frame, WKSecurityOriginRef userMediaDocumentOrigin, WKSecurityOriginRef topLevelDocumentOrigin, WKUserMediaPermissionCheckRef devicesRequest, const void *clientInfo);
    128128typedef void (*WKPageDidClickAutoFillButtonCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
    129 typedef void (*WKPageMediaSessionMetadataDidChangeCallback)(WKPageRef page, WKMediaSessionMetadataRef metadata, const void* clientInfo);
    130129typedef void (*WKHandleAutoplayEventCallback)(WKPageRef page, WKAutoplayEvent event, WKAutoplayEventFlags flags, const void* clientInfo);
    131130typedef void (*WKFullscreenMayReturnToInlineCallback)(WKPageRef page, const void* clientInfo);
    … …  
    504503    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm;
    505504    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt;
    506     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     505    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    507506} WKPageUIClientV5;
    508507
    … …  
    577576    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    578577    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    579     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     578    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    580579
    581580    // Version 6.
    … …  
    657656    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    658657    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    659     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     658    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    660659
    661660    // Version 6.
    … …  
    741740    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    742741    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    743     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     742    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    744743   
    745744    // Version 6.
    … …  
    829828    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    830829    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    831     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     830    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    832831
    833832    // Version 6.
    … …  
    920919    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    921920    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    922     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     921    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    923922   
    924923    // Version 6.
    … …  
    10151014    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    10161015    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    1017     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     1016    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    10181017
    10191018    // Version 6.
    … …  
    11131112    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    11141113    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    1115     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     1114    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    11161115   
    11171116    // Version 6.
    … …  
    12141213    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    12151214    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    1216     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     1215    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    12171216
    12181217    // Version 6.
    … …  
    13181317    WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV5           runJavaScriptConfirm_deprecatedForUseWithV5;
    13191318    WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV5            runJavaScriptPrompt_deprecatedForUseWithV5;
    1320     WKPageMediaSessionMetadataDidChangeCallback                         mediaSessionMetadataDidChange;
     1319    void*                                                               unused5; // Used to be mediaSessionMetadataDidChange.
    13211320
    13221321    // Version 6.

  • trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

    r267883 r267885  
    687687{
    688688#if ENABLE(APP_BOUND_DOMAINS)
    689     RefPtr<API::Array> originURLsArray = toImpl(originURLsRef);
     689    RefPtr<API::Array> originURLsArray = WebKit::toImpl(originURLsRef);
    690690    size_t newSize = originURLsArray ? originURLsArray->size() : 0;
    691691    HashSet<WebCore::RegistrableDomain> domains;

  • trunk/Source/WebKit/UIProcess/ProvisionalPageProxy.h

    r267883 r267885  
    2929#include "MessageSender.h"
    3030#include "PolicyDecision.h"
     31#include "ProcessThrottler.h"
    3132#include "SandboxExtension.h"
    3233#include "WebFramePolicyListenerProxy.h"

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r267883 r267885  
    245245#endif
    246246
    247 #if ENABLE(MEDIA_SESSION)
    248 #include "WebMediaSessionFocusManager.h"
    249 #include "WebMediaSessionMetadata.h"
    250 #include <WebCore/MediaSessionMetadata.h>
    251 #endif
    252 
    253247#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    254248#include "PlaybackSessionManagerProxy.h"
    … …  
    60546048    send(Messages::WebPage::ResumeAllMediaPlayback());
    60556049}
    6056 
    6057 #if ENABLE(MEDIA_SESSION)
    6058 void WebPageProxy::handleMediaEvent(MediaEventType eventType)
    6059 {
    6060     if (!hasRunningProcess())
    6061         return;
    6062    
    6063     send(Messages::WebPage::HandleMediaEvent(eventType));
    6064 }
    6065 
    6066 void WebPageProxy::setVolumeOfMediaElement(double volume, uint64_t elementID)
    6067 {
    6068     if (!hasRunningProcess())
    6069         return;
    6070 
    6071     send(Messages::WebPage::SetVolumeOfMediaElement(volume, elementID));
    6072 }
    6073 #endif
    60746050
    60756051void WebPageProxy::setMayStartMediaWhenInWindow(bool mayStartMedia)
    … …  
    89778953void WebPageProxy::isPlayingMediaDidChange(MediaProducer::MediaStateFlags newState, uint64_t sourceElementID)
    89788954{
    8979 #if ENABLE(MEDIA_SESSION)
    8980     WebMediaSessionFocusManager* focusManager = process().processPool().supplement<WebMediaSessionFocusManager>();
    8981     ASSERT(focusManager);
    8982     focusManager->updatePlaybackAttributesFromMediaState(this, sourceElementID, newState);
    8983 #endif
    8984 
    89858955#if PLATFORM(IOS_FAMILY)
    89868956    if (!m_process->throttler().shouldBeRunnable())
    … …  
    91289098
    91299099    callback->performCallbackWithReturnValue(hasActiveSession, registeredAsNowPlayingApplication, title, duration, elapsedTime, uniqueIdentifier);
    9130 }
    9131 #endif
    9132 
    9133 #if ENABLE(MEDIA_SESSION)
    9134 void WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange(bool state)
    9135 {
    9136     m_hasMediaSessionWithActiveMediaElements = state;
    9137 }
    9138 
    9139 void WebPageProxy::mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata& metadata)
    9140 {
    9141     Ref<WebMediaSessionMetadata> webMetadata = WebMediaSessionMetadata::create(metadata);
    9142     m_uiClient->mediaSessionMetadataDidChange(*this, webMetadata.ptr());
    9143 }
    9144 
    9145 void WebPageProxy::focusedContentMediaElementDidChange(uint64_t elementID)
    9146 {
    9147     WebMediaSessionFocusManager* focusManager = process().processPool().supplement<WebMediaSessionFocusManager>();
    9148     ASSERT(focusManager);
    9149     focusManager->setFocusedMediaElement(*this, elementID);
    91509100}
    91519101#endif

  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r267883 r267885  
    170170#endif
    171171
    172 #if ENABLE(MEDIA_SESSION)
    173 namespace WebCore {
    174 class MediaSessionMetadata;
    175 }
    176 #endif
    177 
    178172#if USE(DIRECT2D)
    179173interface ID3D11Device1;
    … …  
    13451339    void resumeAllMediaPlayback();
    13461340
    1347 #if ENABLE(MEDIA_SESSION)
    1348     bool hasMediaSessionWithActiveMediaElements() const { return m_hasMediaSessionWithActiveMediaElements; }
    1349     void handleMediaEvent(WebCore::MediaEventType);
    1350     void setVolumeOfMediaElement(double, uint64_t);
    1351 #endif
    1352        
    13531341#if ENABLE(POINTER_LOCK)
    13541342    void didAllowPointerLock();
    … …  
    14741462    void requestActiveNowPlayingSessionInfo(Ref<NowPlayingInfoCallback>&&);
    14751463    void nowPlayingInfoCallback(bool, bool, const String&, double, double, uint64_t, CallbackID);
    1476 #endif
    1477 
    1478 #if ENABLE(MEDIA_SESSION)
    1479     void hasMediaSessionWithActiveMediaElementsDidChange(bool);
    1480     void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&);
    1481     void focusedContentMediaElementDidChange(uint64_t);
    14821464#endif
    14831465
    … …  
    27792761#endif
    27802762
    2781 #if ENABLE(MEDIA_SESSION)
    2782     bool m_hasMediaSessionWithActiveMediaElements { false };
    2783 #endif
    2784 
    27852763#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
    27862764    bool m_requiresTargetMonitoring { false };

  • trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

    r267883 r267885  
    475475    HandleAutoplayEvent(enum:uint8_t WebCore::AutoplayEvent event, OptionSet<WebCore::AutoplayEventFlags> flags)
    476476
    477 #if ENABLE(MEDIA_SESSION)
    478     HasMediaSessionWithActiveMediaElementsDidChange(bool state)
    479     MediaSessionMetadataDidChange(WebCore::MediaSessionMetadata metadata);
    480     FocusedContentMediaElementDidChange(uint64_t elementID)
    481 #endif
    482 
    483477#if PLATFORM(MAC)
    484478    DidPerformImmediateActionHitTest(struct WebKit::WebHitTestResultData result, bool contentPreventsDefault, WebKit::UserData userData)

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r267883 r267885  
    290290    addSupplement<WebGeolocationManagerProxy>();
    291291    addSupplement<WebNotificationManagerProxy>();
    292 #if ENABLE(MEDIA_SESSION)
    293     addSupplement<WebMediaSessionFocusManager>();
    294 #endif
    295292
    296293    processPools().append(this);

  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r267883 r267885  
    6060#include <wtf/text/WTFString.h>
    6161
    62 #if ENABLE(MEDIA_SESSION)
    63 #include "WebMediaSessionFocusManager.h"
    64 #endif
    65 
    6662#if PLATFORM(COCOA)
    6763OBJC_CLASS NSMutableDictionary;

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r267883 r267885  
    17071707                C6A4CA0B2252899800169289 /* WKBundlePageMac.h in Headers */ = {isa = PBXBuildFile; fileRef = C6A4CA092252899800169289 /* WKBundlePageMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17081708                C6A4CA0C2252899800169289 /* WKBundlePageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6A4CA0A2252899800169289 /* WKBundlePageMac.mm */; };
    1709                 C98C48A61B6FD4C300145103 /* WebMediaSessionFocusManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */; };
    1710                 C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1711                 C9C1833C1B74026D007036A7 /* WebMediaSessionFocusManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C9C183381B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.h */; };
    1712                 C9CD43981B4B001D00239E33 /* WebMediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */; };
    1713                 C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17141709                CA05397923EE324400A553DC /* ContentAsStringIncludesChildFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = CA05397823EE324400A553DC /* ContentAsStringIncludesChildFrames.h */; };
    17151710                CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CD003A5119D49B5D005ABCE0 /* WebMediaKeyStorageManager.h */; };
    … …  
    50545049                C6A4CA092252899800169289 /* WKBundlePageMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKBundlePageMac.h; sourceTree = "<group>"; };
    50555050                C6A4CA0A2252899800169289 /* WKBundlePageMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKBundlePageMac.mm; sourceTree = "<group>"; };
    5056                 C98C48A31B6FD4C300145103 /* WebMediaSessionFocusManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionFocusManager.cpp; sourceTree = "<group>"; };
    5057                 C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionFocusManager.h; sourceTree = "<group>"; };
    5058                 C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMediaSessionFocusManager.cpp; sourceTree = "<group>"; };
    5059                 C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMediaSessionFocusManager.h; sourceTree = "<group>"; };
    5060                 C9C183371B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionFocusManagerClient.cpp; sourceTree = "<group>"; };
    5061                 C9C183381B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionFocusManagerClient.h; sourceTree = "<group>"; };
    5062                 C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionMetadata.cpp; sourceTree = "<group>"; };
    5063                 C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionMetadata.h; sourceTree = "<group>"; };
    5064                 C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMediaSessionMetadata.cpp; sourceTree = "<group>"; };
    5065                 C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMediaSessionMetadata.h; sourceTree = "<group>"; };
    50665051                CA05397823EE324400A553DC /* ContentAsStringIncludesChildFrames.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContentAsStringIncludesChildFrames.h; sourceTree = "<group>"; };
    50675052                CD003A5019D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebMediaKeyStorageManager.cpp; path = MediaCache/WebMediaKeyStorageManager.cpp; sourceTree = "<group>"; };
    … …  
    61326117                                BC9BA5021697C45300E44616 /* WebKit2Initialize.cpp */,
    61336118                                BC9BA5031697C45300E44616 /* WebKit2Initialize.h */,
    6134                                 C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */,
    6135                                 C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */,
    61366119                                905620E812BC248B000799B6 /* WebMemorySampler.cpp */,
    61376120                                905620E912BC248B000799B6 /* WebMemorySampler.h */,
    … …  
    90529035                                BC1BE1F012D54DBD0004A228 /* WebGeolocationProvider.h */,
    90539036                                51C8E19B1F21617200BF731B /* WebIconDatabase.h */,
    9054                                 C98C48A31B6FD4C300145103 /* WebMediaSessionFocusManager.cpp */,
    9055                                 C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */,
    9056                                 C9C183371B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.cpp */,
    9057                                 C9C183381B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.h */,
    90589037                                2D3EF4401917646300034184 /* WebMemoryPressureHandler.cpp */,
    90599038                                2D3EF4411917646300034184 /* WebMemoryPressureHandler.h */,
    … …  
    92589237                                51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */,
    92599238                                2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */,
    9260                                 C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */,
    9261                                 C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */,
    9262                                 C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */,
    9263                                 C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */,
    92649239                                5CABDC8422C40FCC001EDE8E /* WKMessageListener.cpp */,
    92659240                                5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */,
    … …  
    1132111296                                1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */,
    1132211297                                CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */,
    11323                                 C98C48A61B6FD4C300145103 /* WebMediaSessionFocusManager.h in Headers */,
    11324                                 C9C1833C1B74026D007036A7 /* WebMediaSessionFocusManagerClient.h in Headers */,
    11325                                 C9CD43981B4B001D00239E33 /* WebMediaSessionMetadata.h in Headers */,
    1132611298                                9B5BEC262400F4A90070C6EF /* WebMediaStrategy.h in Headers */,
    1132711299                                2D3EF4431917646300034184 /* WebMemoryPressureHandler.h in Headers */,
    … …  
    1162211594                                2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
    1162311595                                5CE912142293C280005BEC78 /* WKMain.h in Headers */,
    11624                                 C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
    11625                                 C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
    1162611596                                1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */,
    1162711597                                5CABDC8622C40FDE001EDE8E /* WKMessageListener.h in Headers */,

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r267883 r267885  
    11761176}
    11771177
    1178 #if ENABLE(MEDIA_SESSION)
    1179 
    1180 void WebChromeClient::hasMediaSessionWithActiveMediaElementsDidChange(bool state)
    1181 {
    1182     m_page.send(Messages::WebPageProxy::HasMediaSessionWithActiveMediaElementsDidChange(state));
    1183 }
    1184 
    1185 void WebChromeClient::mediaSessionMetadataDidChange(const MediaSessionMetadata& metadata)
    1186 {
    1187     m_page.send(Messages::WebPageProxy::MediaSessionMetadataDidChange(metadata));
    1188 }
    1189 
    1190 void WebChromeClient::focusedContentMediaElementDidChange(uint64_t elementID)
    1191 {
    1192     m_page.send(Messages::WebPageProxy::FocusedContentMediaElementDidChange(elementID));
    1193 }
    1194 
    1195 #endif
    1196 
    11971178#if ENABLE(WEB_CRYPTO)
    11981179

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h

    r267883 r267885  
    338338    void handleAutoplayEvent(WebCore::AutoplayEvent, OptionSet<WebCore::AutoplayEventFlags>) final;
    339339
    340 #if ENABLE(MEDIA_SESSION)
    341     void hasMediaSessionWithActiveMediaElementsDidChange(bool) final;
    342     void mediaSessionMetadataDidChange(const WebCore::MediaSessionMetadata&) final;
    343     void focusedContentMediaElementDidChange(uint64_t) final;
    344 #endif
    345 
    346340#if ENABLE(WEB_CRYPTO)
    347341    bool wrapCryptoKey(const Vector<uint8_t>&, Vector<uint8_t>&) const final;

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r267883 r267885  
    51915191}
    51925192
    5193 #if ENABLE(MEDIA_SESSION)
    5194 void WebPage::handleMediaEvent(uint32_t eventType)
    5195 {
    5196     m_page->handleMediaEvent(static_cast<MediaEventType>(eventType));
    5197 }
    5198 
    5199 void WebPage::setVolumeOfMediaElement(double volume, uint64_t elementID)
    5200 {
    5201     m_page->setVolumeOfMediaElement(volume, elementID);
    5202 }
    5203 #endif
    5204 
    52055193void WebPage::setMayStartMediaWhenInWindow(bool mayStartMedia)
    52065194{

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

    r267883 r267885  
    968968    void stopMediaCapture();
    969969
    970 #if ENABLE(MEDIA_SESSION)
    971     void handleMediaEvent(uint32_t /* WebCore::MediaEventType */);
    972     void setVolumeOfMediaElement(double, uint64_t);
    973 #endif
    974 
    975970    void updateMainFrameScrollOffsetPinning();
    976971

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

    r267883 r267885  
    412412    StopMediaCapture()
    413413
    414 #if ENABLE(MEDIA_SESSION)
    415     HandleMediaEvent(uint32_t eventType)
    416     SetVolumeOfMediaElement(double volume, uint64_t elementID)
    417 #endif
    418 
    419414    SetCanRunBeforeUnloadConfirmPanel(bool canRunBeforeUnloadConfirmPanel)
    420415    SetCanRunModal(bool canRunModal)

  • trunk/Source/cmake/OptionsFTW.cmake

    r267883 r267885  
    115115WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE OFF)
    116116WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PRIVATE OFF)
    117 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE OFF)
    118117WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE OFF)
    119118WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STATISTICS PRIVATE OFF)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r267883 r267885  
    167167    WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" PRIVATE OFF)
    168168    WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CONTROLS_SCRIPT "Toggle definition of media controls in Javascript" PRIVATE ON)
    169     WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SESSION "Toggle Media Session support" PRIVATE OFF)
    170169    WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SOURCE "Toggle Media Source support" PRIVATE OFF)
    171170    WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STATISTICS "Toggle Media Statistics support" PRIVATE OFF)

  • trunk/Tools/ChangeLog

    r267883 r267885  
     12020-10-02  Sam Weinig  <weinig@apple.com>
     2
     3        Remove code behind ENABLE(MEDIA_SESSION), no ports enable it
     4        https://bugs.webkit.org/show_bug.cgi?id=216831
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Scripts/webkitperl/FeatureList.pm:
     9        Remove support for building with MEDIA_SESSION enabled.
     10
     11        * WebKitTestRunner/TestController.cpp:
     12        (WTR::TestController::createOtherPage):
     13        (WTR::TestController::createWebViewWithOptions):
     14        Update names to new 'unused' naming.
     15
    1162020-10-02  Karl Rackler  <rackler@apple.com>
    217

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r267883 r267885  
    120120    $mediaCaptureSupport,
    121121    $mediaControlsScriptSupport,
    122     $mediaSessionSupport,
    123122    $mediaSourceSupport,
    124123    $mediaStatisticsSupport,
    … …  
    400399      define => "ENABLE_MEDIA_CONTROLS_SCRIPT", value => \$mediaControlsScriptSupport },
    401400
    402     { option => "media-session", desc => "Toggle Media Session support",
    403       define => "ENABLE_MEDIA_SESSION", value => \$mediaSessionSupport },
    404 
    405401    { option => "media-source", desc => "Toggle Media Source support",
    406402      define => "ENABLE_MEDIA_SOURCE", value => \$mediaSourceSupport },

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r267883 r267885  
    382382        0, // runJavaScriptConfirm
    383383        0, // runJavaScriptPrompt
    384         0, // mediaSessionMetadataDidChange
     384        0, // unused5
    385385        createOtherPage,
    386386        runJavaScriptAlert,
    … …  
    715715        0, // runJavaScriptConfirm
    716716        0, // runJavaScriptPrompt
    717         0, // mediaSessionMetadataDidChange
     717        0, // unused5
    718718        createOtherPage,
    719719        runJavaScriptAlert,
Note: See TracChangeset for help on using the changeset viewer.