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

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

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/LoadableTextTrack.h ('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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
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
28 #include "core/html/track/LoadableTextTrack.h" 27 #include "core/html/track/LoadableTextTrack.h"
29 28
30 #include "core/html/HTMLTrackElement.h" 29 #include "core/html/HTMLTrackElement.h"
31 #include "core/html/track/TextTrackCueList.h" 30 #include "core/html/track/TextTrackCueList.h"
32 #include "core/html/track/TextTrackRegionList.h" 31 #include "core/html/track/TextTrackRegionList.h"
33 32
34 namespace WebCore { 33 namespace WebCore {
35 34
36 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)
37 : TextTrack(&track->document(), track, kind, label, language, TrackElement) 36 : TextTrack(&track->document(), track, kind, label, language, TrackElement)
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool loadin gFailed) 120 void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool loadin gFailed)
122 { 121 {
123 ASSERT_UNUSED(loader, m_loader == loader); 122 ASSERT_UNUSED(loader, m_loader == loader);
124 123
125 if (!m_trackElement) 124 if (!m_trackElement)
126 return; 125 return;
127 126
128 m_trackElement->didCompleteLoad(this, loadingFailed ? HTMLTrackElement::Fail ure : HTMLTrackElement::Success); 127 m_trackElement->didCompleteLoad(this, loadingFailed ? HTMLTrackElement::Fail ure : HTMLTrackElement::Success);
129 } 128 }
130 129
131 #if ENABLE(WEBVTT_REGIONS)
132 void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader) 130 void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader)
133 { 131 {
134 ASSERT_UNUSED(loader, m_loader == loader); 132 ASSERT_UNUSED(loader, m_loader == loader);
135 133
136 Vector<RefPtr<TextTrackRegion> > newRegions; 134 Vector<RefPtr<TextTrackRegion> > newRegions;
137 m_loader->getNewRegions(newRegions); 135 m_loader->getNewRegions(newRegions);
138 136
139 for (size_t i = 0; i < newRegions.size(); ++i) { 137 for (size_t i = 0; i < newRegions.size(); ++i) {
140 newRegions[i]->setTrack(this); 138 newRegions[i]->setTrack(this);
141 regionList()->add(newRegions[i]); 139 regions()->add(newRegions[i]);
142 } 140 }
143 } 141 }
144 #endif
145 142
146 size_t LoadableTextTrack::trackElementIndex() 143 size_t LoadableTextTrack::trackElementIndex()
147 { 144 {
148 ASSERT(m_trackElement); 145 ASSERT(m_trackElement);
149 ASSERT(m_trackElement->parentNode()); 146 ASSERT(m_trackElement->parentNode());
150 147
151 size_t index = 0; 148 size_t index = 0;
152 for (Node* node = m_trackElement->parentNode()->firstChild(); node; node = n ode->nextSibling()) { 149 for (Node* node = m_trackElement->parentNode()->firstChild(); node; node = n ode->nextSibling()) {
153 if (!node->hasTagName(trackTag) || !node->parentNode()) 150 if (!node->hasTagName(trackTag) || !node->parentNode())
154 continue; 151 continue;
155 if (node == m_trackElement) 152 if (node == m_trackElement)
156 return index; 153 return index;
157 ++index; 154 ++index;
158 } 155 }
159 ASSERT_NOT_REACHED(); 156 ASSERT_NOT_REACHED();
160 157
161 return 0; 158 return 0;
162 } 159 }
163 160
164 } // namespace WebCore 161 } // namespace WebCore
165 162
OLDNEW
« no previous file with comments | « Source/core/html/track/LoadableTextTrack.h ('k') | Source/core/html/track/TextTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698