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

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

Issue 25798003: Enable WebVTT regions for runtime testing, updated tests and minor fixes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revert Logging Created 7 years, 2 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
Index: Source/core/html/track/TextTrack.h
diff --git a/Source/core/html/track/TextTrack.h b/Source/core/html/track/TextTrack.h
index c16b447273ad2274653e052eb89e21600d833ca2..31c95b87d03074594dd572e213ce39a995edd2bc 100644
--- a/Source/core/html/track/TextTrack.h
+++ b/Source/core/html/track/TextTrack.h
@@ -38,10 +38,8 @@ class HTMLMediaElement;
class TextTrack;
class TextTrackCue;
class TextTrackCueList;
-#if ENABLE(WEBVTT_REGIONS)
class TextTrackRegion;
class TextTrackRegionList;
-#endif
class TextTrackClient {
public:
@@ -102,11 +100,9 @@ public:
void removeCue(TextTrackCue*, ExceptionState&);
bool hasCue(TextTrackCue*);
-#if ENABLE(WEBVTT_REGIONS)
TextTrackRegionList* regions();
void addRegion(PassRefPtr<TextTrackRegion>);
void removeRegion(TextTrackRegion*, ExceptionState&);
-#endif
void cueWillChange(TextTrackCue*);
void cueDidChange(TextTrackCue*);
@@ -138,18 +134,14 @@ public:
protected:
TextTrack(ScriptExecutionContext*, TextTrackClient*, const AtomicString& kind, const AtomicString& label, const AtomicString& language, TextTrackType);
-#if ENABLE(WEBVTT_REGIONS)
TextTrackRegionList* regionList();
-#endif
RefPtr<TextTrackCueList> m_cues;
private:
-#if ENABLE(WEBVTT_REGIONS)
TextTrackRegionList* ensureTextTrackRegionList();
RefPtr<TextTrackRegionList> m_regions;
-#endif
TextTrackCueList* ensureTextTrackCueList();

Powered by Google App Engine
This is Rietveld 408576698