Attachment 357606 Details for Bug 192827 – Patch

[patch] Patch

bug-192827-20181218224046.patch (text/plain), 6.93 KB, created by Alicia Boya García on 2018-12-18 13:40:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alicia Boya García

Created: 2018-12-18 13:40:47 PST

Size: 6.93 KB

patch

obsolete

>Subversion Revision: 239348
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ed2bf50326f9867766a2a3aab1ef8a4a8ba1cc4d..7ff283be5684b759ef1c3ad93ec80954d34f19f3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,44 @@
>+2018-12-18  Alicia Boya GarcÃa  <aboya@igalia.com>
>+
>+        [MSE] Remove dead code: sourceBufferPrivateSeekToTime()
>+        https://bugs.webkit.org/show_bug.cgi?id=192827
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch makes two dead code removal changes in
>+        SourceBufferPrivateClient:
>+
>+        First, sourceBufferPrivateFastSeekTimeForMediaTime() is made pure
>+        virtual in SourceBufferPrivateClient. Since SourceBufferPrivateClient
>+        is only inherited by SourceBuffer, it makes no sense to have default
>+        implementations there (they will never be used), moreso it being a
>+        client interface.
>+
>+        Second, sourceBufferPrivateSeekToTime() is removed entirely. It used
>+        to had an empty implementation, which SourceBuffer did not overwrite,
>+        therefore making any calls to it useless.
>+
>+        All calls to sourceBufferPrivateSeekToTime() have been removed:
>+
>+        SourceBufferPrivateAVFObjC::seekToTime(), which was also dead code
>+        itself, used to call this method. This patch deletes it completely.
>+
>+        MockSourceBufferPrivate::seekToTime(), which only called this empty
>+        method, has also been removed along with its only usage in
>+        MockMediaSourcePrivate::seekToTime().
>+
>+        * platform/graphics/SourceBufferPrivateClient.h:
>+        (WebCore::SourceBufferPrivateClient::sourceBufferPrivateFastSeekTimeForMediaTime): Deleted.
>+        (WebCore::SourceBufferPrivateClient::sourceBufferPrivateSeekToTime): Deleted.
>+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
>+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
>+        (WebCore::SourceBufferPrivateAVFObjC::seekToTime): Deleted.
>+        * platform/mock/mediasource/MockMediaSourcePrivate.cpp:
>+        (WebCore::MockMediaSourcePrivate::seekToTime):
>+        * platform/mock/mediasource/MockSourceBufferPrivate.cpp:
>+        (WebCore::MockSourceBufferPrivate::seekToTime): Deleted.
>+        * platform/mock/mediasource/MockSourceBufferPrivate.h:
>+
> 2018-12-17  Alicia Boya GarcÃa  <aboya@igalia.com>
> 
>         [MSE] Remove unused method: stopAskingForMoreSamples()
>diff --git a/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h b/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h
>index 11e9a27c53250296dabde1ada7f47e88e53882a5..0b6adbeeca414160804d21b9d7a29c2aa83a0878 100644
>--- a/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h
>+++ b/Source/WebCore/platform/graphics/SourceBufferPrivateClient.h
>@@ -71,8 +71,7 @@ public:
>     virtual void sourceBufferPrivateReenqueSamples(const AtomicString& trackID) = 0;
>     virtual void sourceBufferPrivateDidBecomeReadyForMoreSamples(const AtomicString& trackID) = 0;
> 
>-    virtual MediaTime sourceBufferPrivateFastSeekTimeForMediaTime(const MediaTime& time, const MediaTime&, const MediaTime&) { return time; }
>-    virtual void sourceBufferPrivateSeekToTime(const MediaTime&) { };
>+    virtual MediaTime sourceBufferPrivateFastSeekTimeForMediaTime(const MediaTime&, const MediaTime&, const MediaTime&) = 0;
> 
>     enum AppendResult { AppendSucceeded, ReadStreamFailed, ParsingFailed };
>     virtual void sourceBufferPrivateAppendComplete(AppendResult) = 0;
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
>index 8300dc3b6e39e8cab145aeba2176e9811dfc9871..2080cf7f121c8425ca4a7e4ea088c658573482d3 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
>@@ -102,7 +102,6 @@ public:
>     void trackDidChangeEnabled(AudioTrackPrivateMediaSourceAVFObjC*);
> 
>     void willSeek();
>-    void seekToTime(const MediaTime&);
>     MediaTime fastSeekTimeForMediaTime(const MediaTime&, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold);
>     FloatSize naturalSize();
> 
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
>index a99feb7f653c99116d0f339ec3775fc20cef0bed..c21c5d25d072253b51df98797093d693cd1823ea 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
>@@ -1171,12 +1171,6 @@ void SourceBufferPrivateAVFObjC::willSeek()
>     flush();
> }
> 
>-void SourceBufferPrivateAVFObjC::seekToTime(const MediaTime& time)
>-{
>-    if (m_client)
>-        m_client->sourceBufferPrivateSeekToTime(time);
>-}
>-
> FloatSize SourceBufferPrivateAVFObjC::naturalSize()
> {
>     return m_cachedSize.value_or(FloatSize());
>diff --git a/Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.cpp b/Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.cpp
>index abc3ba574e5512882cdad5cf19b0773f2d5092af..ec15367d585276bfcde677a62fc2644eaf049984 100644
>--- a/Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.cpp
>+++ b/Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.cpp
>@@ -165,9 +165,6 @@ MediaTime MockMediaSourcePrivate::seekToTime(const MediaTime& targetTime, const
>             seekTime = sourceSeekTime;
>     }
> 
>-    for (auto& buffer : m_activeSourceBuffers)
>-        buffer->seekToTime(seekTime);
>-
>     return seekTime;
> }
> 
>diff --git a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
>index 2a8b24bd2f921e1c1f350022277a83387ec37afe..1be1ae57be1e91092fe661ae2367290410afcc3d 100644
>--- a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
>+++ b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp
>@@ -289,12 +289,6 @@ MediaTime MockSourceBufferPrivate::fastSeekTimeForMediaTime(const MediaTime& tim
>     return time;
> }
> 
>-void MockSourceBufferPrivate::seekToTime(const MediaTime& time)
>-{
>-    if (m_client)
>-        m_client->sourceBufferPrivateSeekToTime(time);
>-}
>-
> }
> 
> #endif
>diff --git a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h
>index b3f8af42a2f42aeb9edece6ab33b5e87a5272529..a264fb5e07d496a709622c0bfcf139ff895f047f 100644
>--- a/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h
>+++ b/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h
>@@ -49,7 +49,6 @@ public:
>     bool hasVideo() const;
>     bool hasAudio() const;
> 
>-    void seekToTime(const MediaTime&);
>     MediaTime fastSeekTimeForMediaTime(const MediaTime&, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold);
> 
> private:

Actions: View | Formatted Diff | Diff

Attachments on bug 192827: 357604 | 357606