| Index: Source/core/html/track/LoadableTextTrack.h
|
| diff --git a/Source/core/html/track/LoadableTextTrack.h b/Source/core/html/track/LoadableTextTrack.h
|
| index c9490182295dcddd57d68cb87e738fdb0c8fd1d5..e1468e9817f1b2b8a57fe31a7cc5a15ce3eafd03 100644
|
| --- a/Source/core/html/track/LoadableTextTrack.h
|
| +++ b/Source/core/html/track/LoadableTextTrack.h
|
| @@ -27,16 +27,14 @@
|
| #define LoadableTextTrack_h
|
|
|
| #include "core/html/track/TextTrack.h"
|
| -#include "core/loader/TextTrackLoader.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/PassRefPtr.h"
|
|
|
| namespace blink {
|
|
|
| class HTMLTrackElement;
|
| -class LoadableTextTrack;
|
|
|
| -class LoadableTextTrack final : public TextTrack, private TextTrackLoaderClient {
|
| +class LoadableTextTrack final : public TextTrack {
|
| public:
|
| static PassRefPtrWillBeRawPtr<LoadableTextTrack> create(HTMLTrackElement* track)
|
| {
|
| @@ -44,11 +42,12 @@ public:
|
| }
|
| virtual ~LoadableTextTrack();
|
|
|
| - void scheduleLoad(const KURL&);
|
| -
|
| // TextTrack method.
|
| virtual void setMode(const AtomicString&) override;
|
|
|
| + void addRegions(const WillBeHeapVector<RefPtrWillBeMember<VTTRegion>>&);
|
| + using TextTrack::addListOfCues;
|
| +
|
| size_t trackElementIndex();
|
| HTMLTrackElement* trackElement() { return m_trackElement; }
|
| #if !ENABLE(OILPAN)
|
| @@ -60,20 +59,11 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - // TextTrackLoaderClient
|
| - virtual void newCuesAvailable(TextTrackLoader*) override;
|
| - virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) override;
|
| - virtual void newRegionsAvailable(TextTrackLoader*) override;
|
| -
|
| explicit LoadableTextTrack(HTMLTrackElement*);
|
|
|
| - void loadTimerFired(Timer<LoadableTextTrack>*);
|
| -
|
| RawPtrWillBeMember<HTMLTrackElement> m_trackElement;
|
| - Timer<LoadableTextTrack> m_loadTimer;
|
| - OwnPtrWillBeMember<TextTrackLoader> m_loader;
|
| - KURL m_url;
|
| };
|
| +
|
| } // namespace blink
|
|
|
| -#endif
|
| +#endif // LoadableTextTrack_h
|
|
|