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

Unified Diff: Source/core/html/track/TextTrackRegion.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: Rebased 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
« no previous file with comments | « Source/core/html/track/TextTrackCue.idl ('k') | Source/core/html/track/TextTrackRegion.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/track/TextTrackRegion.h
diff --git a/Source/core/html/track/TextTrackRegion.h b/Source/core/html/track/TextTrackRegion.h
index 5760063252c793bc538df649a86a903eccd3d8ec..fbff66a114510f3e1c685ed38a1e120bd7ea72d9 100644
--- a/Source/core/html/track/TextTrackRegion.h
+++ b/Source/core/html/track/TextTrackRegion.h
@@ -31,8 +31,6 @@
#ifndef TextTrackRegion_h
#define TextTrackRegion_h
-#if ENABLE(WEBVTT_REGIONS)
-
#include "core/dom/ContextLifecycleObserver.h"
#include "core/dom/Document.h"
#include "core/html/track/TextTrack.h"
@@ -97,7 +95,7 @@ public:
private:
TextTrackRegion(ExecutionContext*);
- Document* ownerDocument() { return toDocument(m_executionContext); }
+ Document* ownerDocument() { return toDocument(executionContext()); }
void prepareRegionDisplayTree();
@@ -115,9 +113,7 @@ private:
ViewportAnchor,
Scroll
};
-
RegionSetting getSettingFromString(const String&);
-
void parseSettingValue(RegionSetting, const String&);
void parseSetting(const String&, unsigned*);
@@ -127,20 +123,16 @@ private:
String m_id;
String m_settings;
-
double m_width;
unsigned m_heightInLines;
-
FloatPoint m_regionAnchor;
FloatPoint m_viewportAnchor;
-
bool m_scroll;
- RefPtr<HTMLDivElement> m_regionDisplayTree;
-
// The cue container is the container that is scrolled up to obtain the
// effect of scrolling cues when this is enabled for the regions.
RefPtr<HTMLDivElement> m_cueContainer;
+ RefPtr<HTMLDivElement> m_regionDisplayTree;
// The member variable track can be a raw pointer as it will never
// reference a destroyed TextTrack, as this member variable
@@ -160,6 +152,4 @@ private:
};
} // namespace WebCore
-
-#endif
#endif
« no previous file with comments | « Source/core/html/track/TextTrackCue.idl ('k') | Source/core/html/track/TextTrackRegion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698