| 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
|
|
|