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

Side by Side Diff: Source/core/html/track/TextTrackCue.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/track/TextTrack.idl ('k') | Source/core/html/track/TextTrackCue.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 int cueIndex(); 126 int cueIndex();
127 void invalidateCueIndex(); 127 void invalidateCueIndex();
128 128
129 PassRefPtr<DocumentFragment> getCueAsHTML(); 129 PassRefPtr<DocumentFragment> getCueAsHTML();
130 PassRefPtr<DocumentFragment> createCueRenderingTree(); 130 PassRefPtr<DocumentFragment> createCueRenderingTree();
131 131
132 using EventTarget::dispatchEvent; 132 using EventTarget::dispatchEvent;
133 virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE; 133 virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE;
134 134
135 #if ENABLE(WEBVTT_REGIONS)
136 const String& regionId() const { return m_regionId; } 135 const String& regionId() const { return m_regionId; }
137 void setRegionId(const String&); 136 void setRegionId(const String&);
138 #endif 137 void notifyRegionWhenRemovingDisplayTree(bool);
139 138
140 bool isActive(); 139 bool isActive();
141 void setIsActive(bool); 140 void setIsActive(bool);
142 141
143 bool hasDisplayTree() const { return m_displayTree; } 142 bool hasDisplayTree() const { return m_displayTree; }
144 PassRefPtr<TextTrackCueBox> getDisplayTree(const IntSize& videoSize); 143 PassRefPtr<TextTrackCueBox> getDisplayTree(const IntSize& videoSize);
145 PassRefPtr<HTMLDivElement> element() const { return m_cueBackgroundBox; } 144 PassRefPtr<HTMLDivElement> element() const { return m_cueBackgroundBox; }
146 145
147 void updateDisplayTree(double); 146 void updateDisplayTree(double);
148 void removeDisplayTree(); 147 void removeDisplayTree();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 virtual void refEventTarget() OVERRIDE { ref(); } 221 virtual void refEventTarget() OVERRIDE { ref(); }
223 virtual void derefEventTarget() OVERRIDE { deref(); } 222 virtual void derefEventTarget() OVERRIDE { deref(); }
224 223
225 enum CueSetting { 224 enum CueSetting {
226 None, 225 None,
227 Vertical, 226 Vertical,
228 Line, 227 Line,
229 Position, 228 Position,
230 Size, 229 Size,
231 Align, 230 Align,
232 #if ENABLE(WEBVTT_REGIONS)
233 RegionId 231 RegionId
234 #endif
235 }; 232 };
236 CueSetting settingName(const String&); 233 CueSetting settingName(const String&);
237 234
238 String m_id; 235 String m_id;
239 double m_startTime; 236 double m_startTime;
240 double m_endTime; 237 double m_endTime;
241 String m_content; 238 String m_content;
242 String m_settings; 239 String m_settings;
243 int m_linePosition; 240 int m_linePosition;
244 int m_computedLinePosition; 241 int m_computedLinePosition;
(...skipping 17 matching lines...) Expand all
262 RefPtr<HTMLDivElement> m_cueBackgroundBox; 259 RefPtr<HTMLDivElement> m_cueBackgroundBox;
263 260
264 bool m_displayTreeShouldChange; 261 bool m_displayTreeShouldChange;
265 RefPtr<TextTrackCueBox> m_displayTree; 262 RefPtr<TextTrackCueBox> m_displayTree;
266 263
267 CSSValueID m_displayDirection; 264 CSSValueID m_displayDirection;
268 265
269 int m_displaySize; 266 int m_displaySize;
270 267
271 std::pair<float, float> m_displayPosition; 268 std::pair<float, float> m_displayPosition;
272 #if ENABLE(WEBVTT_REGIONS)
273 String m_regionId; 269 String m_regionId;
274 #endif 270 bool m_notifyRegion;
275 }; 271 };
276 272
277 } // namespace WebCore 273 } // namespace WebCore
278 274
279 #endif 275 #endif
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrack.idl ('k') | Source/core/html/track/TextTrackCue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698