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

Side by Side Diff: Source/core/html/track/TextTrackCue.cpp

Issue 242113012: Make text track and cue wrapper objects dependent on their media element. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Consistently use a Node-returning owner() Created 6 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 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 17 matching lines...) Expand all
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "config.h" 32 #include "config.h"
33 #include "core/html/track/TextTrackCue.h" 33 #include "core/html/track/TextTrackCue.h"
34 34
35 #include "bindings/v8/ExceptionMessages.h" 35 #include "bindings/v8/ExceptionMessages.h"
36 #include "bindings/v8/ExceptionStatePlaceholder.h" 36 #include "bindings/v8/ExceptionStatePlaceholder.h"
37 #include "core/events/Event.h" 37 #include "core/events/Event.h"
38 #include "core/html/HTMLMediaElement.h"
acolwell GONE FROM CHROMIUM 2014/04/21 16:51:16 nit: Why do you need the HTMLMediaElement include?
sof 2014/04/21 18:35:01 No, redundant & removed; thanks (a leftover from a
38 #include "core/html/track/TextTrack.h" 39 #include "core/html/track/TextTrack.h"
39 #include "core/html/track/TextTrackCueList.h" 40 #include "core/html/track/TextTrackCueList.h"
40 41
41 namespace WebCore { 42 namespace WebCore {
42 43
43 static const int invalidCueIndex = -1; 44 static const int invalidCueIndex = -1;
44 45
45 bool TextTrackCue::isInfiniteOrNonNumber(double value, ExceptionState& exception State) 46 bool TextTrackCue::isInfiniteOrNonNumber(double value, ExceptionState& exception State)
46 { 47 {
47 if (!std::isfinite(value)) { 48 if (!std::isfinite(value)) {
(...skipping 28 matching lines...) Expand all
76 TextTrack* TextTrackCue::track() const 77 TextTrack* TextTrackCue::track() const
77 { 78 {
78 return m_track; 79 return m_track;
79 } 80 }
80 81
81 void TextTrackCue::setTrack(TextTrack* track) 82 void TextTrackCue::setTrack(TextTrack* track)
82 { 83 {
83 m_track = track; 84 m_track = track;
84 } 85 }
85 86
87 Node* TextTrackCue::owner() const
88 {
89 return m_track ? m_track->owner() : 0;
90 }
91
86 void TextTrackCue::setId(const AtomicString& id) 92 void TextTrackCue::setId(const AtomicString& id)
87 { 93 {
88 if (m_id == id) 94 if (m_id == id)
89 return; 95 return;
90 96
91 cueWillChange(); 97 cueWillChange();
92 m_id = id; 98 m_id = id;
93 cueDidChange(); 99 cueDidChange();
94 } 100 }
95 101
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 if (!active) 174 if (!active)
169 removeDisplayTree(); 175 removeDisplayTree();
170 } 176 }
171 177
172 const AtomicString& TextTrackCue::interfaceName() const 178 const AtomicString& TextTrackCue::interfaceName() const
173 { 179 {
174 return EventTargetNames::TextTrackCue; 180 return EventTargetNames::TextTrackCue;
175 } 181 }
176 182
177 } // namespace WebCore 183 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698