| OLD | NEW |
| 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 191 #if ENABLE(WEBVTT_REGIONS) | 191 #if ENABLE(WEBVTT_REGIONS) |
| 192 void TextTrackLoader::newRegionsParsed() | 192 void TextTrackLoader::newRegionsParsed() |
| 193 { | 193 { |
| 194 m_client->newRegionsAvailable(this); | 194 m_client->newRegionsAvailable(this); |
| 195 } | 195 } |
| 196 #endif | 196 #endif |
| 197 | 197 |
| 198 void TextTrackLoader::fileFailedToParse() | 198 void TextTrackLoader::fileFailedToParse() |
| 199 { | 199 { |
| 200 LOG(Media, "TextTrackLoader::fileFailedToParse"); | 200 LOG_INFO(Media, "TextTrackLoader::fileFailedToParse"); |
| 201 | 201 |
| 202 m_state = Failed; | 202 m_state = Failed; |
| 203 | 203 |
| 204 if (!m_cueLoadTimer.isActive()) | 204 if (!m_cueLoadTimer.isActive()) |
| 205 m_cueLoadTimer.startOneShot(0); | 205 m_cueLoadTimer.startOneShot(0); |
| 206 | 206 |
| 207 cancelLoad(); | 207 cancelLoad(); |
| 208 } | 208 } |
| 209 | 209 |
| 210 void TextTrackLoader::getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues) | 210 void TextTrackLoader::getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues) |
| 211 { | 211 { |
| 212 ASSERT(m_cueParser); | 212 ASSERT(m_cueParser); |
| 213 if (m_cueParser) | 213 if (m_cueParser) |
| 214 m_cueParser->getNewCues(outputCues); | 214 m_cueParser->getNewCues(outputCues); |
| 215 } | 215 } |
| 216 | 216 |
| 217 #if ENABLE(WEBVTT_REGIONS) | 217 #if ENABLE(WEBVTT_REGIONS) |
| 218 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegi
ons) | 218 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegi
ons) |
| 219 { | 219 { |
| 220 ASSERT(m_cueParser); | 220 ASSERT(m_cueParser); |
| 221 if (m_cueParser) | 221 if (m_cueParser) |
| 222 m_cueParser->getNewRegions(outputRegions); | 222 m_cueParser->getNewRegions(outputRegions); |
| 223 } | 223 } |
| 224 #endif | 224 #endif |
| 225 } | 225 } |
| 226 | 226 |
| 227 #endif | 227 #endif |
| OLD | NEW |