| Index: third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
|
| diff --git a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
|
| index 6d173975ff2ef7cb5b9862ddeab0addbd457c9a9..e54e0eb4a1a5e758fadf04f9b35b1dfc055f90f7 100644
|
| --- a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
|
| +++ b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.h
|
| @@ -33,7 +33,6 @@
|
|
|
| #include "bindings/core/v8/ActiveScriptWrappable.h"
|
| #include "core/dom/ActiveDOMObject.h"
|
| -#include "core/fileapi/FileReaderLoaderClient.h"
|
| #include "modules/EventTargetModules.h"
|
| #include "modules/mediasource/TrackDefaultList.h"
|
| #include "platform/AsyncMethodRunner.h"
|
| @@ -48,10 +47,8 @@ class AudioTrackList;
|
| class DOMArrayBuffer;
|
| class DOMArrayBufferView;
|
| class ExceptionState;
|
| -class FileReaderLoader;
|
| class GenericEventQueue;
|
| class MediaSource;
|
| -class Stream;
|
| class TimeRanges;
|
| class VideoTrackList;
|
| class WebSourceBuffer;
|
| @@ -59,7 +56,6 @@ class WebSourceBuffer;
|
| class SourceBuffer final : public EventTargetWithInlineData,
|
| public ActiveScriptWrappable,
|
| public ActiveDOMObject,
|
| - public FileReaderLoaderClient,
|
| public WebSourceBufferClient {
|
| USING_GARBAGE_COLLECTED_MIXIN(SourceBuffer);
|
| DEFINE_WRAPPERTYPEINFO();
|
| @@ -83,8 +79,6 @@ class SourceBuffer final : public EventTargetWithInlineData,
|
| void setTimestampOffset(double, ExceptionState&);
|
| void appendBuffer(DOMArrayBuffer* data, ExceptionState&);
|
| void appendBuffer(DOMArrayBufferView* data, ExceptionState&);
|
| - void appendStream(Stream*, ExceptionState&);
|
| - void appendStream(Stream*, unsigned long long maxSize, ExceptionState&);
|
| void abort(ExceptionState&);
|
| void remove(double start, double end, ExceptionState&);
|
| double appendWindowStart() const;
|
| @@ -123,12 +117,6 @@ class SourceBuffer final : public EventTargetWithInlineData,
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - enum AppendStreamDoneAction {
|
| - NoError,
|
| - RunAppendErrorWithNoDecodeError,
|
| - RunAppendErrorWithDecodeError
|
| - };
|
| -
|
| enum AppendError { NoDecodeError, DecodeError };
|
|
|
| SourceBuffer(std::unique_ptr<WebSourceBuffer>,
|
| @@ -147,11 +135,6 @@ class SourceBuffer final : public EventTargetWithInlineData,
|
|
|
| void removeAsyncPart();
|
|
|
| - void appendStreamInternal(Stream*, ExceptionState&);
|
| - void appendStreamAsyncPart();
|
| - void appendStreamDone(AppendStreamDoneAction);
|
| - void clearAppendStreamState();
|
| -
|
| void cancelRemove();
|
| void abortIfUpdating();
|
|
|
| @@ -166,12 +149,6 @@ class SourceBuffer final : public EventTargetWithInlineData,
|
| const AtomicString& trackType,
|
| const AtomicString& byteStreamTrackID) const;
|
|
|
| - // FileReaderLoaderClient interface
|
| - void didStartLoading() override;
|
| - void didReceiveDataForClient(const char* data, unsigned dataLength) override;
|
| - void didFinishLoading() override;
|
| - void didFail(FileError::ErrorCode) override;
|
| -
|
| std::unique_ptr<WebSourceBuffer> m_webSourceBuffer;
|
| Member<MediaSource> m_source;
|
| Member<TrackDefaultList> m_trackDefaults;
|
| @@ -193,12 +170,6 @@ class SourceBuffer final : public EventTargetWithInlineData,
|
| double m_pendingRemoveStart;
|
| double m_pendingRemoveEnd;
|
| Member<AsyncMethodRunner<SourceBuffer>> m_removeAsyncPartRunner;
|
| -
|
| - bool m_streamMaxSizeValid;
|
| - unsigned long long m_streamMaxSize;
|
| - Member<AsyncMethodRunner<SourceBuffer>> m_appendStreamAsyncPartRunner;
|
| - Member<Stream> m_stream;
|
| - std::unique_ptr<FileReaderLoader> m_loader;
|
| };
|
|
|
| } // namespace blink
|
|
|