| 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 |
| 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 | 27 |
| 28 #include "core/loader/TextTrackLoader.h" | 28 #include "core/loader/TextTrackLoader.h" |
| 29 | 29 |
| 30 #include "CachedResourceLoader.h" | |
| 31 #include "CachedResourceRequest.h" | |
| 32 #include "CachedTextTrack.h" | |
| 33 #include "Document.h" | 30 #include "Document.h" |
| 34 #include "ScriptCallStack.h" | 31 #include "ScriptCallStack.h" |
| 35 #include "SecurityOrigin.h" | 32 #include "SecurityOrigin.h" |
| 36 #include "WebVTTParser.h" | 33 #include "WebVTTParser.h" |
| 37 #include "core/loader/CrossOriginAccessControl.h" | 34 #include "core/loader/CrossOriginAccessControl.h" |
| 35 #include "core/loader/cache/CachedResourceLoader.h" |
| 36 #include "core/loader/cache/CachedResourceRequest.h" |
| 37 #include "core/loader/cache/CachedTextTrack.h" |
| 38 #include "core/platform/Logging.h" | 38 #include "core/platform/Logging.h" |
| 39 #include "core/platform/SharedBuffer.h" | 39 #include "core/platform/SharedBuffer.h" |
| 40 #include "core/platform/network/ResourceHandle.h" | 40 #include "core/platform/network/ResourceHandle.h" |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, ScriptExecutionC
ontext* context) | 44 TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, ScriptExecutionC
ontext* context) |
| 45 : m_client(client) | 45 : m_client(client) |
| 46 , m_scriptExecutionContext(context) | 46 , m_scriptExecutionContext(context) |
| 47 , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired) | 47 , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired) |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 #if ENABLE(WEBVTT_REGIONS) | 215 #if ENABLE(WEBVTT_REGIONS) |
| 216 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegi
ons) | 216 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegi
ons) |
| 217 { | 217 { |
| 218 ASSERT(m_cueParser); | 218 ASSERT(m_cueParser); |
| 219 if (m_cueParser) | 219 if (m_cueParser) |
| 220 m_cueParser->getNewRegions(outputRegions); | 220 m_cueParser->getNewRegions(outputRegions); |
| 221 } | 221 } |
| 222 #endif | 222 #endif |
| 223 } | 223 } |
| 224 | 224 |
| OLD | NEW |