Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1076)

Unified Diff: Source/core/html/track/LoadableTextTrack.h

Issue 999773002: Move loading machinery out of LoadableTextTrack (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Comments; Use switch for same-url case. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLTrackElement.cpp ('k') | Source/core/html/track/LoadableTextTrack.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « Source/core/html/HTMLTrackElement.cpp ('k') | Source/core/html/track/LoadableTextTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698