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

Side by Side Diff: Source/core/loader/TextTrackLoader.cpp

Issue 63173020: Split VTTCue from TextTrackCue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/TextTrackLoader.h ('k') | no next file » | 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 LOG(Media, "TextTrackLoader::fileFailedToParse"); 163 LOG(Media, "TextTrackLoader::fileFailedToParse");
164 164
165 m_state = Failed; 165 m_state = Failed;
166 166
167 if (!m_cueLoadTimer.isActive()) 167 if (!m_cueLoadTimer.isActive())
168 m_cueLoadTimer.startOneShot(0); 168 m_cueLoadTimer.startOneShot(0);
169 169
170 cancelLoad(); 170 cancelLoad();
171 } 171 }
172 172
173 void TextTrackLoader::getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues) 173 void TextTrackLoader::getNewCues(Vector<RefPtr<VTTCue> >& outputCues)
174 { 174 {
175 ASSERT(m_cueParser); 175 ASSERT(m_cueParser);
176 if (m_cueParser) 176 if (m_cueParser)
177 m_cueParser->getNewCues(outputCues); 177 m_cueParser->getNewCues(outputCues);
178 } 178 }
179 179
180 void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions) 180 void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions)
181 { 181 {
182 ASSERT(m_cueParser); 182 ASSERT(m_cueParser);
183 if (m_cueParser) 183 if (m_cueParser)
184 m_cueParser->getNewRegions(outputRegions); 184 m_cueParser->getNewRegions(outputRegions);
185 } 185 }
186 186
187 } 187 }
OLDNEW
« no previous file with comments | « Source/core/loader/TextTrackLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698