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

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

Issue 55653003: Rename TextTrackRegion/TextTrackRegionList to VTTRegion/VTTRegionList (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: update test expectations Created 7 years, 1 month 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
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | Source/core/html/track/TextTrack.h » ('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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/html/track/LoadableTextTrack.h" 27 #include "core/html/track/LoadableTextTrack.h"
28 28
29 #include "core/html/HTMLTrackElement.h" 29 #include "core/html/HTMLTrackElement.h"
30 #include "core/html/track/TextTrackCueList.h" 30 #include "core/html/track/TextTrackCueList.h"
31 #include "core/html/track/TextTrackRegionList.h" 31 #include "core/html/track/VTTRegionList.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track, const String& kind , const String& label, const String& language) 35 LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track, const String& kind , const String& label, const String& language)
36 : TextTrack(track->document(), track, kind, label, language, TrackElement) 36 : TextTrack(track->document(), track, kind, label, language, TrackElement)
37 , m_trackElement(track) 37 , m_trackElement(track)
38 , m_loadTimer(this, &LoadableTextTrack::loadTimerFired) 38 , m_loadTimer(this, &LoadableTextTrack::loadTimerFired)
39 , m_isDefault(false) 39 , m_isDefault(false)
40 { 40 {
41 } 41 }
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 if (!m_trackElement) 119 if (!m_trackElement)
120 return; 120 return;
121 121
122 m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success); 122 m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
123 } 123 }
124 124
125 void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader) 125 void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader)
126 { 126 {
127 ASSERT_UNUSED(loader, m_loader == loader); 127 ASSERT_UNUSED(loader, m_loader == loader);
128 128
129 Vector<RefPtr<TextTrackRegion> > newRegions; 129 Vector<RefPtr<VTTRegion> > newRegions;
130 m_loader->getNewRegions(newRegions); 130 m_loader->getNewRegions(newRegions);
131 131
132 for (size_t i = 0; i < newRegions.size(); ++i) { 132 for (size_t i = 0; i < newRegions.size(); ++i) {
133 newRegions[i]->setTrack(this); 133 newRegions[i]->setTrack(this);
134 regions()->add(newRegions[i]); 134 regions()->add(newRegions[i]);
135 } 135 }
136 } 136 }
137 137
138 size_t LoadableTextTrack::trackElementIndex() 138 size_t LoadableTextTrack::trackElementIndex()
139 { 139 {
140 ASSERT(m_trackElement); 140 ASSERT(m_trackElement);
141 ASSERT(m_trackElement->parentNode()); 141 ASSERT(m_trackElement->parentNode());
142 142
143 size_t index = 0; 143 size_t index = 0;
144 for (Node* node = m_trackElement->parentNode()->firstChild(); node; node = n ode->nextSibling()) { 144 for (Node* node = m_trackElement->parentNode()->firstChild(); node; node = n ode->nextSibling()) {
145 if (!node->hasTagName(trackTag) || !node->parentNode()) 145 if (!node->hasTagName(trackTag) || !node->parentNode())
146 continue; 146 continue;
147 if (node == m_trackElement) 147 if (node == m_trackElement)
148 return index; 148 return index;
149 ++index; 149 ++index;
150 } 150 }
151 ASSERT_NOT_REACHED(); 151 ASSERT_NOT_REACHED();
152 152
153 return 0; 153 return 0;
154 } 154 }
155 155
156 } // namespace WebCore 156 } // namespace WebCore
157 157
OLDNEW
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | Source/core/html/track/TextTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698