Diff
Modified: trunk/Source/WebCore/ChangeLog (236932 => 236933)
--- trunk/Source/WebCore/ChangeLog 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/ChangeLog 2018-10-08 20:14:10 UTC (rev 236933)
@@ -1,5 +1,28 @@
2018-10-08 Jeremy Jones <[email protected]>
+ Remove dead code: resetMediaState.
+ https://bugs.webkit.org/show_bug.cgi?id=190355
+
+ Reviewed by Jon Lee.
+
+ No new tests because no behavior change.
+
+ Remove resetMediaState since it is no longer used.
+
+ * platform/cocoa/PlaybackSessionInterface.h:
+ (WebCore::PlaybackSessionInterface::~PlaybackSessionInterface):
+ * platform/ios/PlaybackSessionInterfaceAVKit.h:
+ * platform/ios/PlaybackSessionInterfaceAVKit.mm:
+ (WebCore::PlaybackSessionInterfaceAVKit::resetMediaState): Deleted.
+ * platform/ios/WebAVPlayerController.h:
+ * platform/ios/WebAVPlayerController.mm:
+ (-[WebAVPlayerController resetMediaState]): Deleted.
+ * platform/mac/PlaybackSessionInterfaceMac.h:
+ * platform/mac/PlaybackSessionInterfaceMac.mm:
+ (WebCore::PlaybackSessionInterfaceMac::resetMediaState): Deleted.
+
+2018-10-08 Jeremy Jones <[email protected]>
+
Use MediaPlayerEnums::VideoGravity in VideoFullscreenModel.
https://bugs.webkit.org/show_bug.cgi?id=190357
Modified: trunk/Source/WebCore/platform/cocoa/PlaybackSessionInterface.h (236932 => 236933)
--- trunk/Source/WebCore/platform/cocoa/PlaybackSessionInterface.h 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/platform/cocoa/PlaybackSessionInterface.h 2018-10-08 20:14:10 UTC (rev 236933)
@@ -37,7 +37,6 @@
class PlaybackSessionInterface {
public:
virtual ~PlaybackSessionInterface() { };
- virtual void resetMediaState() = 0;
};
}
Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h (236932 => 236933)
--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h 2018-10-08 20:14:10 UTC (rev 236933)
@@ -64,9 +64,6 @@
virtual ~PlaybackSessionInterfaceAVKit();
PlaybackSessionModel* playbackSessionModel() const { return m_playbackSessionModel; }
- // PlaybackSessionInterface
- WEBCORE_EXPORT void resetMediaState() override;
-
// PlaybackSessionModelClient
WEBCORE_EXPORT void durationChanged(double) override;
WEBCORE_EXPORT void currentTimeChanged(double currentTime, double anchorTime) override;
Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm (236932 => 236933)
--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm 2018-10-08 20:14:10 UTC (rev 236933)
@@ -77,11 +77,6 @@
invalidate();
}
-void PlaybackSessionInterfaceAVKit::resetMediaState()
-{
- [m_playerController resetMediaState];
-}
-
void PlaybackSessionInterfaceAVKit::durationChanged(double duration)
{
WebAVPlayerController* playerController = m_playerController.get();
Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.h (236932 => 236933)
--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.h 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.h 2018-10-08 20:14:10 UTC (rev 236933)
@@ -96,8 +96,6 @@
@property (NS_NONATOMIC_IOSONLY, retain, readwrite) AVValueTiming *minTiming;
@property (NS_NONATOMIC_IOSONLY, retain, readwrite) AVValueTiming *maxTiming;
-
-- (void)resetMediaState;
@end
#endif
Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm (236932 => 236933)
--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm 2018-10-08 20:14:10 UTC (rev 236933)
@@ -625,37 +625,6 @@
return [NSSet setWithObjects:@"hasLiveStreamingContent", @"minTiming", @"maxTiming", @"seekableTimeRangesLastModifiedTime", nil];
}
-- (void)resetMediaState
-{
- self.contentDuration = 0;
- self.contentDurationWithinEndTimes = 0;
- self.loadedTimeRanges = @[];
-
- self.canPlay = NO;
- self.canPause = NO;
- self.canTogglePlayback = NO;
- self.hasEnabledAudio = NO;
- self.canSeek = NO;
- self.status = AVPlayerControllerStatusUnknown;
-
- self.minTiming = nil;
- self.maxTiming = nil;
- self.timing = nil;
- self.rate = 0;
- self.volume = 0;
-
- self.seekableTimeRanges = [NSMutableArray array];
-
- self.canScanBackward = NO;
-
- self.audioMediaSelectionOptions = nil;
- self.currentAudioMediaSelectionOption = nil;
-
- self.legibleMediaSelectionOptions = nil;
- self.currentLegibleMediaSelectionOption = nil;
- _liveStreamEventModePossible = YES;
-}
-
@end
@implementation WebAVMediaSelectionOption
Modified: trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.h (236932 => 236933)
--- trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.h 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.h 2018-10-08 20:14:10 UTC (rev 236933)
@@ -49,9 +49,6 @@
virtual ~PlaybackSessionInterfaceMac();
PlaybackSessionModel* playbackSessionModel() const;
- // PlaybackSessionInterface
- void resetMediaState() final;
-
// PlaybackSessionModelClient
void durationChanged(double) final;
void currentTimeChanged(double /*currentTime*/, double /*anchorTime*/) final;
Modified: trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm (236932 => 236933)
--- trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm 2018-10-08 20:14:10 UTC (rev 236933)
@@ -66,10 +66,6 @@
return m_playbackSessionModel;
}
-void PlaybackSessionInterfaceMac::resetMediaState()
-{
-}
-
void PlaybackSessionInterfaceMac::durationChanged(double duration)
{
#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
Modified: trunk/Source/WebKit/ChangeLog (236932 => 236933)
--- trunk/Source/WebKit/ChangeLog 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebKit/ChangeLog 2018-10-08 20:14:10 UTC (rev 236933)
@@ -1,5 +1,22 @@
2018-10-08 Jeremy Jones <[email protected]>
+ Remove dead code: resetMediaState.
+ https://bugs.webkit.org/show_bug.cgi?id=190355
+
+ Reviewed by Jon Lee.
+
+ Remove resetMediaState since it is no longer used.
+
+ * UIProcess/Cocoa/PlaybackSessionManagerProxy.h:
+ * UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in:
+ * UIProcess/Cocoa/PlaybackSessionManagerProxy.mm:
+ (WebKit::PlaybackSessionManagerProxy::resetMediaState): Deleted.
+ * WebProcess/cocoa/PlaybackSessionManager.h:
+ * WebProcess/cocoa/PlaybackSessionManager.mm:
+ (WebKit::PlaybackSessionInterfaceContext::resetMediaState): Deleted.
+
+2018-10-08 Jeremy Jones <[email protected]>
+
Use MediaPlayerEnums::VideoGravity in VideoFullscreenModel.
https://bugs.webkit.org/show_bug.cgi?id=190357
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.h (236932 => 236933)
--- trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.h 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.h 2018-10-08 20:14:10 UTC (rev 236933)
@@ -199,7 +199,6 @@
// Messages from PlaybackSessionManager
void setUpPlaybackControlsManagerWithID(uint64_t contextId);
void clearPlaybackControlsManager();
- void resetMediaState(uint64_t contextId);
void currentTimeChanged(uint64_t contextId, double currentTime, double hostTime);
void bufferedTimeChanged(uint64_t contextId, double bufferedTime);
void seekableRangesVectorChanged(uint64_t contextId, Vector<std::pair<double, double>> ranges, double lastModifiedTime, double liveUpdateInterval);
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in (236932 => 236933)
--- trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in 2018-10-08 20:14:10 UTC (rev 236933)
@@ -22,7 +22,6 @@
#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
messages -> PlaybackSessionManagerProxy {
- ResetMediaState(uint64_t contextId)
CurrentTimeChanged(uint64_t contextId, double currentTime, double hostTime)
BufferedTimeChanged(uint64_t contextId, double bufferedTime)
SeekableRangesVectorChanged(uint64_t contextId, Vector<std::pair<double, double>> ranges, double lastModifiedTime, double liveUpdateInterval)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm (236932 => 236933)
--- trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm 2018-10-08 20:14:10 UTC (rev 236933)
@@ -394,11 +394,6 @@
m_page->videoControlsManagerDidChange();
}
-void PlaybackSessionManagerProxy::resetMediaState(uint64_t contextId)
-{
- ensureInterface(contextId).resetMediaState();
-}
-
void PlaybackSessionManagerProxy::currentTimeChanged(uint64_t contextId, double currentTime, double hostTime)
{
ensureModel(contextId).currentTimeChanged(currentTime);
Modified: trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.h (236932 => 236933)
--- trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.h 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.h 2018-10-08 20:14:10 UTC (rev 236933)
@@ -70,9 +70,6 @@
private:
friend class VideoFullscreenInterfaceContext;
- // PlaybackSessionInterface
- void resetMediaState() final;
-
// PlaybackSessionModelClient
void durationChanged(double) final;
void currentTimeChanged(double currentTime, double anchorTime) final;
@@ -128,7 +125,6 @@
void removeClientForContext(uint64_t contextId);
// Interface to PlaybackSessionInterfaceContext
- void resetMediaState(uint64_t contextId);
void durationChanged(uint64_t contextId, double);
void currentTimeChanged(uint64_t contextId, double currentTime, double anchorTime);
void bufferedTimeChanged(uint64_t contextId, double bufferedTime);
Modified: trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm (236932 => 236933)
--- trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm 2018-10-08 20:12:22 UTC (rev 236932)
+++ trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm 2018-10-08 20:14:10 UTC (rev 236933)
@@ -64,12 +64,6 @@
{
}
-void PlaybackSessionInterfaceContext::resetMediaState()
-{
- if (m_manager)
- m_manager->resetMediaState(m_contextId);
-}
-
void PlaybackSessionInterfaceContext::durationChanged(double duration)
{
if (m_manager)
@@ -322,11 +316,6 @@
#pragma mark Interface to PlaybackSessionInterfaceContext:
-void PlaybackSessionManager::resetMediaState(uint64_t contextId)
-{
- m_page->send(Messages::PlaybackSessionManagerProxy::ResetMediaState(contextId), m_page->pageID());
-}
-
void PlaybackSessionManager::durationChanged(uint64_t contextId, double duration)
{
m_page->send(Messages::PlaybackSessionManagerProxy::DurationChanged(contextId, duration), m_page->pageID());
