Remove unused MediaPlayer methods
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Dec 2019 18:28:49 +0000 (18:28 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Dec 2019 18:28:49 +0000 (18:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=205341
<rdar://problem/58006776>

Reviewed by Jer Noble.

Source/WebCore:

No new tests, this just removes unused code.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaLoadingFailedFatally):
(WebCore::HTMLMediaElement::mediaPlayerSawUnsupportedTracks): Deleted.
(WebCore::HTMLMediaElement::mediaPlayerSetSize): Deleted.
(WebCore::HTMLMediaElement::mediaPlayerIsPaused const): Deleted.
* html/HTMLMediaElement.h:
* html/HTMLVideoElement.cpp:
(WebCore::HTMLVideoElement::setDisplayMode):
* html/MediaDocument.cpp:
(WebCore::MediaDocument::MediaDocument):
(WebCore::MediaDocument::~MediaDocument):
(WebCore::MediaDocument::mediaElementSawUnsupportedTracks): Deleted.
* html/MediaDocument.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::canLoadPoster const): Deleted.
(WebCore::MediaPlayer::setPoster): Deleted.
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerContentsScale const):
(WebCore::MediaPlayerClient::mediaPlayerPlatformVolumeConfigurationRequired const):
(WebCore::MediaPlayerClient::mediaPlayerSawUnsupportedTracks): Deleted.
(WebCore::MediaPlayerClient::mediaPlayerSetSize): Deleted.
(WebCore::MediaPlayerClient::mediaPlayerIsPaused const): Deleted.
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::setSize):
(WebCore::MediaPlayerPrivateInterface::canLoadPoster const): Deleted.
(WebCore::MediaPlayerPrivateInterface::setPoster): Deleted.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::setSize): Deleted.
(WebCore::MediaPlayerPrivateAVFoundation::repaint): Deleted.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::setClosedCaptionsVisible): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setSize): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:

Source/WebKit:

* GPUProcess/media/RemoteMediaPlayerProxy.cpp:
(WebKit::RemoteMediaPlayerProxy::mediaPlayerSawUnsupportedTracks): Deleted.
(WebKit::RemoteMediaPlayerProxy::mediaPlayerRepaint): Deleted.
(WebKit::RemoteMediaPlayerProxy::mediaPlayerAcceleratedCompositingEnabled): Deleted.
(WebKit::RemoteMediaPlayerProxy::mediaPlayerSetSize): Deleted.
(WebKit::RemoteMediaPlayerProxy::mediaPlayerIsPaused const): Deleted.
(WebKit::RemoteMediaPlayerProxy::mediaPlayerIsLooping const): Deleted.
* GPUProcess/media/RemoteMediaPlayerProxy.h:
* WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::canLoadPoster const): Deleted.
(WebKit::MediaPlayerPrivateRemote::setPoster): Deleted.
* WebProcess/GPU/media/MediaPlayerPrivateRemote.h:

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

22 files changed:
Source/WebCore/ChangeLog
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/HTMLMediaElement.h
Source/WebCore/html/HTMLVideoElement.cpp
Source/WebCore/html/MediaDocument.cpp
Source/WebCore/html/MediaDocument.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/MediaPlayer.h
Source/WebCore/platform/graphics/MediaPlayerPrivate.h
Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h
Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h
Source/WebKit/ChangeLog
Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp
Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h
Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp
Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h

index 763c50e..8d4b772 100644 (file)
@@ -1,3 +1,52 @@
+2019-12-18  Eric Carlson  <eric.carlson@apple.com>
+
+        Remove unused MediaPlayer methods
+        https://bugs.webkit.org/show_bug.cgi?id=205341
+        <rdar://problem/58006776>
+
+        Reviewed by Jer Noble.
+
+        No new tests, this just removes unused code.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaLoadingFailedFatally):
+        (WebCore::HTMLMediaElement::mediaPlayerSawUnsupportedTracks): Deleted.
+        (WebCore::HTMLMediaElement::mediaPlayerSetSize): Deleted.
+        (WebCore::HTMLMediaElement::mediaPlayerIsPaused const): Deleted.
+        * html/HTMLMediaElement.h:
+        * html/HTMLVideoElement.cpp:
+        (WebCore::HTMLVideoElement::setDisplayMode):
+        * html/MediaDocument.cpp:
+        (WebCore::MediaDocument::MediaDocument):
+        (WebCore::MediaDocument::~MediaDocument):
+        (WebCore::MediaDocument::mediaElementSawUnsupportedTracks): Deleted.
+        * html/MediaDocument.h:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::canLoadPoster const): Deleted.
+        (WebCore::MediaPlayer::setPoster): Deleted.
+        * platform/graphics/MediaPlayer.h:
+        (WebCore::MediaPlayerClient::mediaPlayerContentsScale const):
+        (WebCore::MediaPlayerClient::mediaPlayerPlatformVolumeConfigurationRequired const):
+        (WebCore::MediaPlayerClient::mediaPlayerSawUnsupportedTracks): Deleted.
+        (WebCore::MediaPlayerClient::mediaPlayerSetSize): Deleted.
+        (WebCore::MediaPlayerClient::mediaPlayerIsPaused const): Deleted.
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::setSize):
+        (WebCore::MediaPlayerPrivateInterface::canLoadPoster const): Deleted.
+        (WebCore::MediaPlayerPrivateInterface::setPoster): Deleted.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::setSize): Deleted.
+        (WebCore::MediaPlayerPrivateAVFoundation::repaint): Deleted.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+        * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setClosedCaptionsVisible): Deleted.
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setSize): Deleted.
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+
 2019-12-18  Doug Kelly  <dougk@apple.com>
 
         Ensure transparency layers are properly ended when only painting root background
index 730b4e3..3a6cbf0 100644 (file)
@@ -2238,11 +2238,6 @@ void HTMLMediaElement::mediaLoadingFailedFatally(MediaPlayer::NetworkState error
 
     // 6 - Abort the overall resource selection algorithm.
     m_currentSourceNode = nullptr;
-
-#if PLATFORM(COCOA)
-    if (is<MediaDocument>(document()))
-        downcast<MediaDocument>(document()).mediaElementSawUnsupportedTracks();
-#endif
 }
 
 void HTMLMediaElement::cancelPendingEventsAndCallbacks()
@@ -5040,17 +5035,6 @@ void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
     endProcessingMediaPlayerCallback();
 }
 
-void HTMLMediaElement::mediaPlayerSawUnsupportedTracks()
-{
-    INFO_LOG(LOGIDENTIFIER);
-
-    // The MediaPlayer came across content it cannot completely handle.
-    // This is normally acceptable except when we are in a standalone
-    // MediaDocument. If so, tell the document what has happened.
-    if (is<MediaDocument>(document()))
-        downcast<MediaDocument>(document()).mediaElementSawUnsupportedTracks();
-}
-
 void HTMLMediaElement::mediaPlayerResourceNotSupported()
 {
     INFO_LOG(LOGIDENTIFIER);
@@ -7086,12 +7070,6 @@ float HTMLMediaElement::mediaPlayerContentsScale() const
     return 1;
 }
 
-void HTMLMediaElement::mediaPlayerSetSize(const IntSize& size)
-{
-    setIntegralAttribute(widthAttr, size.width());
-    setIntegralAttribute(heightAttr, size.height());
-}
-
 void HTMLMediaElement::mediaPlayerPause()
 {
     pause();
@@ -7107,11 +7085,6 @@ bool HTMLMediaElement::mediaPlayerPlatformVolumeConfigurationRequired() const
     return !m_volumeInitialized;
 }
 
-bool HTMLMediaElement::mediaPlayerIsPaused() const
-{
-    return paused();
-}
-
 bool HTMLMediaElement::mediaPlayerIsLooping() const
 {
     return loop();
index a5f187b..b2596a4 100644 (file)
@@ -665,7 +665,6 @@ private:
     void mediaPlayerDurationChanged() final;
     void mediaPlayerRateChanged() final;
     void mediaPlayerPlaybackStateChanged() final;
-    void mediaPlayerSawUnsupportedTracks() final;
     void mediaPlayerResourceNotSupported() final;
     void mediaPlayerRepaint() final;
     void mediaPlayerSizeChanged() final;
@@ -719,11 +718,9 @@ private:
     bool mediaPlayerIsVideo() const override;
     LayoutRect mediaPlayerContentBoxRect() const override;
     float mediaPlayerContentsScale() const override;
-    void mediaPlayerSetSize(const IntSize&) override;
     void mediaPlayerPause() override;
     void mediaPlayerPlay() override;
     bool mediaPlayerPlatformVolumeConfigurationRequired() const override;
-    bool mediaPlayerIsPaused() const override;
     bool mediaPlayerIsLooping() const override;
     CachedResourceLoader* mediaPlayerCachedResourceLoader() override;
     RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() override;
index 1e9f50d..643121b 100644 (file)
@@ -270,16 +270,6 @@ void HTMLVideoElement::setDisplayMode(DisplayMode mode)
 
     HTMLMediaElement::setDisplayMode(mode);
 
-    if (player() && player()->canLoadPoster()) {
-        bool canLoad = true;
-        if (!poster.isEmpty()) {
-            if (RefPtr<Frame> frame = document().frame())
-                canLoad = frame->loader().willLoadMediaElementURL(poster, *this);
-        }
-        if (canLoad)
-            player()->setPoster(poster);
-    }
-
     if (auto* renderer = this->renderer()) {
         if (displayMode() != oldMode)
             renderer->updateFromElement();
index aaed5ae..04de751 100644 (file)
@@ -146,7 +146,6 @@ void MediaDocumentParser::appendBytes(DocumentWriter&, const char*, size_t)
     
 MediaDocument::MediaDocument(Frame* frame, const URL& url)
     : HTMLDocument(frame, url, MediaDocumentClass)
-    , m_replaceMediaElementTimer(*this, &MediaDocument::replaceMediaElementTimerFired)
 {
     setCompatibilityMode(DocumentCompatibilityMode::QuirksMode);
     lockCompatibilityMode();
@@ -156,7 +155,6 @@ MediaDocument::MediaDocument(Frame* frame, const URL& url)
 
 MediaDocument::~MediaDocument()
 {
-    ASSERT(!m_replaceMediaElementTimer.isActive());
 }
 
 Ref<DocumentParser> MediaDocument::createParser()
@@ -228,16 +226,6 @@ void MediaDocument::defaultEventHandler(Event& event)
     }
 }
 
-void MediaDocument::mediaElementSawUnsupportedTracks()
-{
-    // The HTMLMediaElement was told it has something that the underlying 
-    // MediaPlayer cannot handle so we should switch from <video> to <embed> 
-    // and let the plugin handle this. Don't do it immediately as this 
-    // function may be called directly from a media engine callback, and 
-    // replaceChild will destroy the element, media player, and media engine.
-    m_replaceMediaElementTimer.startOneShot(0_s);
-}
-
 void MediaDocument::replaceMediaElementTimerFired()
 {
     auto htmlBody = makeRefPtr(bodyOrFrameset());
index 52bc551..a90d4f2 100644 (file)
@@ -40,7 +40,6 @@ public:
     }
     virtual ~MediaDocument();
 
-    void mediaElementSawUnsupportedTracks();
     void mediaElementNaturalSizeChanged(const IntSize&);
     String outgoingReferrer() const { return m_outgoingReferrer; }
 
@@ -53,7 +52,6 @@ private:
 
     void replaceMediaElementTimerFired();
 
-    Timer m_replaceMediaElementTimer;
     String m_outgoingReferrer;
 };
 
index e272f3b..05cab0c 100644 (file)
@@ -152,9 +152,6 @@ public:
 
     void paint(GraphicsContext&, const FloatRect&) final { }
 
-    bool canLoadPoster() const final { return false; }
-    void setPoster(const String&) final { }
-
     bool hasSingleSecurityOrigin() const final { return true; }
 };
 
@@ -593,16 +590,6 @@ void MediaPlayer::prepareForRendering()
     m_private->prepareForRendering();
 }
 
-bool MediaPlayer::canLoadPoster() const
-{
-    return m_private->canLoadPoster();
-}
-
-void MediaPlayer::setPoster(const String& url)
-{
-    m_private->setPoster(url);
-}    
-
 void MediaPlayer::cancelLoad()
 {
     m_private->cancelLoad();
index 761bc50..62c8cdf 100644 (file)
@@ -162,11 +162,6 @@ public:
     // the play/pause status changed
     virtual void mediaPlayerPlaybackStateChanged() { }
 
-    // The MediaPlayer has found potentially problematic media content.
-    // This is used internally to trigger swapping from a <video>
-    // element to an <embed> in standalone documents
-    virtual void mediaPlayerSawUnsupportedTracks() { }
-
     // The MediaPlayer could not discover an engine which supports the requested resource.
     virtual void mediaPlayerResourceNotSupported() { }
 
@@ -226,11 +221,9 @@ public:
     virtual bool mediaPlayerIsVideo() const { return false; }
     virtual LayoutRect mediaPlayerContentBoxRect() const { return LayoutRect(); }
     virtual float mediaPlayerContentsScale() const { return 1; }
-    virtual void mediaPlayerSetSize(const IntSize&) { }
     virtual void mediaPlayerPause() { }
     virtual void mediaPlayerPlay() { }
     virtual bool mediaPlayerPlatformVolumeConfigurationRequired() const { return false; }
-    virtual bool mediaPlayerIsPaused() const { return true; }
     virtual bool mediaPlayerIsLooping() const { return false; }
     virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() { return nullptr; }
     virtual RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() { return nullptr; }
@@ -461,9 +454,6 @@ public:
     bool hasAvailableVideoFrame() const;
     void prepareForRendering();
 
-    bool canLoadPoster() const;
-    void setPoster(const String&);
-
 #if USE(NATIVE_FULLSCREEN_VIDEO)
     void enterFullscreen();
     void exitFullscreen();
index 9894a6c..bcf92df 100644 (file)
@@ -152,7 +152,7 @@ public:
     virtual unsigned long long totalBytes() const { return 0; }
     virtual bool didLoadingProgress() const = 0;
 
-    virtual void setSize(const IntSize&) = 0;
+    virtual void setSize(const IntSize&) { }
 
     virtual void paint(GraphicsContext&, const FloatRect&) = 0;
 
@@ -164,9 +164,6 @@ public:
 
     virtual bool hasAvailableVideoFrame() const { return readyState() >= MediaPlayer::ReadyState::HaveCurrentData; }
 
-    virtual bool canLoadPoster() const { return false; }
-    virtual void setPoster(const String&) { }
-
 #if USE(NATIVE_FULLSCREEN_VIDEO)
     virtual void enterFullscreen() { }
     virtual void exitFullscreen() { }
index a7df43f..7707280 100644 (file)
@@ -572,10 +572,6 @@ void MediaPlayerPrivateAVFoundation::updateStates()
     setReadyState(newReadyState);
 }
 
-void MediaPlayerPrivateAVFoundation::setSize(const IntSize&) 
-{ 
-}
-
 void MediaPlayerPrivateAVFoundation::setVisible(bool visible)
 {
     if (m_visible == visible)
@@ -685,11 +681,6 @@ void MediaPlayerPrivateAVFoundation::invalidateCachedDuration()
     
 }
 
-void MediaPlayerPrivateAVFoundation::repaint()
-{
-    m_player->repaint();
-}
-
 MediaPlayer::MovieLoadType MediaPlayerPrivateAVFoundation::movieLoadType() const
 {
     if (!metaDataAvailable() || assetStatus() == MediaPlayerAVAssetStatusUnknown)
index 6a20a2f..c156508 100644 (file)
@@ -53,7 +53,6 @@ class MediaPlayerPrivateAVFoundation : public CanMakeWeakPtr<MediaPlayerPrivateA
 #endif
 {
 public:
-    virtual void repaint();
     virtual void metadataLoaded();
     virtual void playabilityKnown();
     virtual void rateChanged();
@@ -187,14 +186,12 @@ protected:
     bool paused() const override;
     void setVolume(float) override = 0;
     bool hasClosedCaptions() const override { return m_cachedHasCaptions; }
-    void setClosedCaptionsVisible(bool) override = 0;
     MediaPlayer::NetworkState networkState() const override { return m_networkState; }
     MediaPlayer::ReadyState readyState() const override { return m_readyState; }
     MediaTime maxMediaTimeSeekable() const override;
     MediaTime minMediaTimeSeekable() const override;
     std::unique_ptr<PlatformTimeRanges> buffered() const override;
     bool didLoadingProgress() const override;
-    void setSize(const IntSize&) override;
     void paint(GraphicsContext&, const FloatRect&) override = 0;
     void paintCurrentFrameInContext(GraphicsContext&, const FloatRect&) override = 0;
     void setPreload(MediaPlayer::Preload) override;
index 11f9461..70a5d14 100644 (file)
@@ -74,7 +74,7 @@ private:
     virtual void platformPause();
     MediaTime currentMediaTime() const override;
     virtual void setVolume(float);
-    virtual void setClosedCaptionsVisible(bool);
+    void setClosedCaptionsVisible(bool) override;
     virtual void paint(GraphicsContext&, const FloatRect&);
     virtual void paintCurrentFrameInContext(GraphicsContext&, const FloatRect&);
     virtual PlatformLayer* platformLayer() const;
index 28fd62e..62f9e50 100644 (file)
@@ -177,7 +177,6 @@ private:
     bool platformPaused() const override;
     void setVolume(float) override;
     void setMuted(bool) override;
-    void setClosedCaptionsVisible(bool) override;
     void paint(GraphicsContext&, const FloatRect&) override;
     void paintCurrentFrameInContext(GraphicsContext&, const FloatRect&) override;
     PlatformLayer* platformLayer() const override;
index ad62574..d944592 100644 (file)
@@ -1339,16 +1339,6 @@ void MediaPlayerPrivateAVFoundationObjC::setMuted(bool muted)
     [m_avPlayer.get() setMuted:m_muted];
 }
 
-void MediaPlayerPrivateAVFoundationObjC::setClosedCaptionsVisible(bool closedCaptionsVisible)
-{
-    UNUSED_PARAM(closedCaptionsVisible);
-
-    if (!metaDataAvailable())
-        return;
-
-    ALWAYS_LOG(LOGIDENTIFIER, closedCaptionsVisible);
-}
-
 void MediaPlayerPrivateAVFoundationObjC::setRateDouble(double rate)
 {
     m_requestedRate = rate;
index 13abcaa..531409b 100644 (file)
@@ -218,8 +218,6 @@ private:
 
     bool didLoadingProgress() const override;
 
-    void setSize(const IntSize&) override;
-
     NativeImagePtr nativeImageForCurrentTime() override;
     bool updateLastPixelBuffer();
     bool updateLastImage();
index bacbf0e..bcdb38a 100644 (file)
@@ -588,11 +588,6 @@ bool MediaPlayerPrivateMediaSourceAVFObjC::didLoadingProgress() const
     return loadingProgressed;
 }
 
-void MediaPlayerPrivateMediaSourceAVFObjC::setSize(const IntSize&)
-{
-    // No-op.
-}
-
 NativeImagePtr MediaPlayerPrivateMediaSourceAVFObjC::nativeImageForCurrentTime()
 {
     updateLastImage();
index fe69fac..bc5f391 100644 (file)
@@ -142,8 +142,6 @@ private:
 
     bool didLoadingProgress() const override { return m_playing; }
 
-    void setSize(const IntSize&) override { /* No-op */ }
-
     void flushRenderers();
 
     using PendingSampleQueue = Deque<Ref<MediaSample>>;
index 3615d9d..a7a535b 100644 (file)
@@ -1,3 +1,24 @@
+2019-12-18  Eric Carlson  <eric.carlson@apple.com>
+
+        Remove unused MediaPlayer methods
+        https://bugs.webkit.org/show_bug.cgi?id=205341
+        <rdar://problem/58006776>
+
+        Reviewed by Jer Noble.
+
+        * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
+        (WebKit::RemoteMediaPlayerProxy::mediaPlayerSawUnsupportedTracks): Deleted.
+        (WebKit::RemoteMediaPlayerProxy::mediaPlayerRepaint): Deleted.
+        (WebKit::RemoteMediaPlayerProxy::mediaPlayerAcceleratedCompositingEnabled): Deleted.
+        (WebKit::RemoteMediaPlayerProxy::mediaPlayerSetSize): Deleted.
+        (WebKit::RemoteMediaPlayerProxy::mediaPlayerIsPaused const): Deleted.
+        (WebKit::RemoteMediaPlayerProxy::mediaPlayerIsLooping const): Deleted.
+        * GPUProcess/media/RemoteMediaPlayerProxy.h:
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+        (WebKit::MediaPlayerPrivateRemote::canLoadPoster const): Deleted.
+        (WebKit::MediaPlayerPrivateRemote::setPoster): Deleted.
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.h:
+
 2019-12-18  Simon Fraser  <simon.fraser@apple.com>
 
         Move m_exposedContentRect into the DelegatedScrollingGeometry optional
index b4eac7a..26da3b9 100644 (file)
@@ -159,21 +159,11 @@ void RemoteMediaPlayerProxy::mediaPlayerPlaybackStateChanged()
     notImplemented();
 }
 
-void RemoteMediaPlayerProxy::mediaPlayerSawUnsupportedTracks()
-{
-    notImplemented();
-}
-
 void RemoteMediaPlayerProxy::mediaPlayerResourceNotSupported()
 {
     notImplemented();
 }
 
-void RemoteMediaPlayerProxy::mediaPlayerRepaint()
-{
-    notImplemented();
-}
-
 void RemoteMediaPlayerProxy::mediaPlayerSizeChanged()
 {
     notImplemented();
@@ -206,12 +196,6 @@ void RemoteMediaPlayerProxy::mediaPlayerRenderingModeChanged()
     notImplemented();
 }
 
-bool RemoteMediaPlayerProxy::mediaPlayerAcceleratedCompositingEnabled()
-{
-    notImplemented();
-    return false;
-}
-
 void RemoteMediaPlayerProxy::mediaPlayerActiveSourceBuffersChanged()
 {
     notImplemented();
@@ -305,11 +289,6 @@ float RemoteMediaPlayerProxy::mediaPlayerContentsScale() const
     return 1;
 }
 
-void RemoteMediaPlayerProxy::mediaPlayerSetSize(const IntSize&)
-{
-    notImplemented();
-}
-
 void RemoteMediaPlayerProxy::mediaPlayerPause()
 {
     notImplemented();
@@ -326,18 +305,6 @@ bool RemoteMediaPlayerProxy::mediaPlayerPlatformVolumeConfigurationRequired() co
     return false;
 }
 
-bool RemoteMediaPlayerProxy::mediaPlayerIsPaused() const
-{
-    notImplemented();
-    return true;
-}
-
-bool RemoteMediaPlayerProxy::mediaPlayerIsLooping() const
-{
-    notImplemented();
-    return false;
-}
-
 CachedResourceLoader* RemoteMediaPlayerProxy::mediaPlayerCachedResourceLoader()
 {
     notImplemented();
index 3d766c4..a441b3c 100644 (file)
@@ -84,16 +84,13 @@ private:
 
     // Not implemented
     void mediaPlayerPlaybackStateChanged() final;
-    void mediaPlayerSawUnsupportedTracks() final;
     void mediaPlayerResourceNotSupported() final;
-    void mediaPlayerRepaint() final;
     void mediaPlayerSizeChanged() final;
     void mediaPlayerEngineUpdated() final;
     void mediaPlayerFirstVideoFrameAvailable() final;
     void mediaPlayerCharacteristicChanged() final;
     bool mediaPlayerRenderingCanBeAccelerated() final;
     void mediaPlayerRenderingModeChanged() final;
-    bool mediaPlayerAcceleratedCompositingEnabled() final;
     void mediaPlayerActiveSourceBuffersChanged() final;
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
@@ -118,12 +115,9 @@ private:
     bool mediaPlayerIsVideo() const final;
     LayoutRect mediaPlayerContentBoxRect() const final;
     float mediaPlayerContentsScale() const final;
-    void mediaPlayerSetSize(const IntSize&) final;
     void mediaPlayerPause() final;
     void mediaPlayerPlay() final;
     bool mediaPlayerPlatformVolumeConfigurationRequired() const final;
-    bool mediaPlayerIsPaused() const final;
-    bool mediaPlayerIsLooping() const final;
     CachedResourceLoader* mediaPlayerCachedResourceLoader() final;
     RefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader() final;
     bool doesHaveAttribute(const AtomString&, AtomString* = nullptr) const final;
index db902f6..a9b896b 100644 (file)
@@ -396,17 +396,6 @@ bool MediaPlayerPrivateRemote::hasAvailableVideoFrame() const
     return false;
 }
 
-bool MediaPlayerPrivateRemote::canLoadPoster() const
-{
-    notImplemented();
-    return false;
-}
-
-void MediaPlayerPrivateRemote::setPoster(const String&)
-{
-    notImplemented();
-}
-
 #if USE(NATIVE_FULLSCREEN_VIDEO)
 void MediaPlayerPrivateRemote::enterFullscreen()
 {
index ea0f301..5bc767c 100644 (file)
@@ -181,9 +181,6 @@ private:
 
     bool hasAvailableVideoFrame() const final;
 
-    bool canLoadPoster() const final;
-    void setPoster(const String&) final;
-
 #if USE(NATIVE_FULLSCREEN_VIDEO)
     void enterFullscreen() final;
     void exitFullscreen() final;