Chromium Code Reviews| Index: Source/WebKit/chromium/public/WebInbandTextTrack.h |
| diff --git a/Source/WebKit/chromium/public/WebMediaSourceClient.h b/Source/WebKit/chromium/public/WebInbandTextTrack.h |
| similarity index 66% |
| copy from Source/WebKit/chromium/public/WebMediaSourceClient.h |
| copy to Source/WebKit/chromium/public/WebInbandTextTrack.h |
| index 76c4219cd65ba929a10aaf60ed04ec345a7c9f60..3a34fde203464eb6e59daadb9565c36d6ff967e0 100644 |
| --- a/Source/WebKit/chromium/public/WebMediaSourceClient.h |
| +++ b/Source/WebKit/chromium/public/WebInbandTextTrack.h |
| @@ -28,36 +28,36 @@ |
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#ifndef WebMediaSourceClient_h |
| -#define WebMediaSourceClient_h |
| - |
| -#include "../../../Platform/chromium/public/WebString.h" |
| -#include "WebTimeRange.h" |
| +#ifndef WebInbandTextTrack_h |
| +#define WebInbandTextTrack_h |
| namespace WebKit { |
| -class WebSourceBuffer; |
| +class WebString; |
| +class WebInbandTextTrackClient; |
| + |
| +class WebInbandTextTrack { |
| + public: |
| + virtual ~WebInbandTextTrack() {} |
| + |
| + virtual void setClient(WebInbandTextTrackClient* client) = 0; |
| + virtual WebInbandTextTrackClient* client() = 0; |
| -class WebMediaSourceClient { |
| -public: |
| - enum AddStatus { |
| - AddStatusOk, |
| - AddStatusNotSupported, |
| - AddStatusReachedIdLimit |
| - }; |
| + enum Mode { Disabled, Hidden, Showing }; |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
nit: Move this enum and the Kind one up above func
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
|
| + virtual void setMode(Mode mode) = 0; |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
nit: s/mode// . Blink doesn't specify parameter na
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
|
| + virtual Mode mode() const = 0; |
| - enum EndOfStreamStatus { |
| - EndOfStreamStatusNoError, |
| - EndOfStreamStatusNetworkError, |
| - EndOfStreamStatusDecodeError, |
| - }; |
| + // TODO(matthewjheaney): Is this enum type necessary? |
| + // Can we use TextKind in pipeline_status.h? |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
Yes this enum is necessary. Blink cannot have any
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
|
| + enum Kind { Subtitles, Captions, Descriptions, Chapters, Metadata, None }; |
| + virtual Kind kind() const = 0; |
| + virtual bool isClosedCaptions() const = 0; |
| - virtual ~WebMediaSourceClient() { } |
| + virtual WebString label() const = 0; |
| + virtual WebString language() const = 0; |
| + virtual bool isDefault() const = 0; |
| - virtual AddStatus addSourceBuffer(const WebString& type, const WebVector<WebString>& codecs, WebSourceBuffer**) = 0; |
| - virtual double duration() = 0; |
| - virtual void setDuration(double) = 0; |
| - virtual void endOfStream(EndOfStreamStatus) = 0; |
| + virtual int textTrackIndex() const = 0; |
| }; |
| } // namespace WebKit |