Title: [277372] trunk/Source
Revision
277372
Author
[email protected]
Date
2021-05-12 09:59:44 -0700 (Wed, 12 May 2021)

Log Message

Implement TextTrackPrivateRemote::inBandMetadataTrackDispatchType()
https://bugs.webkit.org/show_bug.cgi?id=225674

Reviewed by Eric Carlson.

Source/WebCore:

Remove an unused function in `InbandTextTrackPrivate`.

* platform/graphics/InbandTextTrackPrivate.h:
(WebCore::InbandTextTrackPrivate::textTrackIndex const): Deleted.

Source/WebKit:

This patch ensures that `InbandTextTrack::inBandMetadataTrackDispatchType()`
behaviors the same no matter "Media in GPU Process" is enabled or not.

* GPUProcess/media/RemoteTextTrackProxy.cpp:
(WebKit::RemoteTextTrackProxy::configuration):
* WebProcess/GPU/media/TextTrackPrivateRemote.cpp:
(WebKit::TextTrackPrivateRemote::updateConfiguration):
* WebProcess/GPU/media/TextTrackPrivateRemote.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (277371 => 277372)


--- trunk/Source/WebCore/ChangeLog	2021-05-12 15:59:48 UTC (rev 277371)
+++ trunk/Source/WebCore/ChangeLog	2021-05-12 16:59:44 UTC (rev 277372)
@@ -1,3 +1,15 @@
+2021-05-12  Peng Liu  <[email protected]>
+
+        Implement TextTrackPrivateRemote::inBandMetadataTrackDispatchType()
+        https://bugs.webkit.org/show_bug.cgi?id=225674
+
+        Reviewed by Eric Carlson.
+
+        Remove an unused function in `InbandTextTrackPrivate`.
+
+        * platform/graphics/InbandTextTrackPrivate.h:
+        (WebCore::InbandTextTrackPrivate::textTrackIndex const): Deleted.
+
 2021-05-12  Sergio Villar Senin  <[email protected]>
 
         [css-flexbox] Do not use margins when computing aspect ratio cross sizes

Modified: trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h (277371 => 277372)


--- trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h	2021-05-12 15:59:48 UTC (rev 277371)
+++ trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h	2021-05-12 16:59:44 UTC (rev 277372)
@@ -74,8 +74,6 @@
     AtomString id() const override { return emptyAtom(); }
     virtual AtomString inBandMetadataTrackDispatchType() const { return emptyAtom(); }
 
-    virtual int textTrackIndex() const { return 0; }
-
     virtual CueFormat cueFormat() const { return m_format; }
 
 #if !RELEASE_LOG_DISABLED

Modified: trunk/Source/WebKit/ChangeLog (277371 => 277372)


--- trunk/Source/WebKit/ChangeLog	2021-05-12 15:59:48 UTC (rev 277371)
+++ trunk/Source/WebKit/ChangeLog	2021-05-12 16:59:44 UTC (rev 277372)
@@ -1,3 +1,19 @@
+2021-05-12  Peng Liu  <[email protected]>
+
+        Implement TextTrackPrivateRemote::inBandMetadataTrackDispatchType()
+        https://bugs.webkit.org/show_bug.cgi?id=225674
+
+        Reviewed by Eric Carlson.
+
+        This patch ensures that `InbandTextTrack::inBandMetadataTrackDispatchType()`
+        behaviors the same no matter "Media in GPU Process" is enabled or not.
+
+        * GPUProcess/media/RemoteTextTrackProxy.cpp:
+        (WebKit::RemoteTextTrackProxy::configuration):
+        * WebProcess/GPU/media/TextTrackPrivateRemote.cpp:
+        (WebKit::TextTrackPrivateRemote::updateConfiguration):
+        * WebProcess/GPU/media/TextTrackPrivateRemote.h:
+
 2021-05-12  Youenn Fablet  <[email protected]>
 
         Introduce an internal unit to render audio MediaStreamTrack(s)

Modified: trunk/Source/WebKit/GPUProcess/media/RemoteTextTrackProxy.cpp (277371 => 277372)


--- trunk/Source/WebKit/GPUProcess/media/RemoteTextTrackProxy.cpp	2021-05-12 15:59:48 UTC (rev 277371)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteTextTrackProxy.cpp	2021-05-12 16:59:44 UTC (rev 277372)
@@ -65,6 +65,7 @@
     configuration->label = m_trackPrivate->label();
     configuration->language = m_trackPrivate->language();
     configuration->trackIndex = m_trackPrivate->trackIndex();
+    configuration->inBandMetadataTrackDispatchType = m_trackPrivate->inBandMetadataTrackDispatchType();
     configuration->startTimeVariance = m_trackPrivate->startTimeVariance();
 
     configuration->cueFormat = m_trackPrivate->cueFormat();

Modified: trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.cpp (277371 => 277372)


--- trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.cpp	2021-05-12 15:59:48 UTC (rev 277371)
+++ trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.cpp	2021-05-12 16:59:44 UTC (rev 277372)
@@ -81,6 +81,7 @@
     }
 
     m_trackIndex = configuration.trackIndex;
+    m_inBandMetadataTrackDispatchType = configuration.inBandMetadataTrackDispatchType;
     m_startTimeVariance = configuration.startTimeVariance;
 
     m_format = configuration.cueFormat;

Modified: trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.h (277371 => 277372)


--- trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.h	2021-05-12 15:59:48 UTC (rev 277371)
+++ trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.h	2021-05-12 16:59:44 UTC (rev 277372)
@@ -78,6 +78,7 @@
     AtomString label() const final { return m_label; }
     AtomString language() const final { return m_language; }
     int trackIndex() const final { return m_trackIndex; }
+    AtomString inBandMetadataTrackDispatchType() const final { return m_inBandMetadataTrackDispatchType; }
 
     using TextTrackCueFormat = WebCore::InbandTextTrackPrivate::CueFormat;
     TextTrackCueFormat cueFormat() const final { return m_format; }
@@ -104,6 +105,7 @@
     AtomString m_label;
     AtomString m_language;
     int m_trackIndex { -1 };
+    AtomString m_inBandMetadataTrackDispatchType;
     MediaTime m_startTimeVariance { MediaTime::zeroTime() };
     WebCore::MediaPlayerIdentifier m_playerIdentifier;
     TrackPrivateRemoteIdentifier m_identifier;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to