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

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

Issue 25195003: Prepare to move core/platform/text into blink_platform.dll (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-attempt upload 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/loader/ProgressTracker.cpp ('k') | Source/core/page/Navigator.cpp » ('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 16 matching lines...) Expand all
27 27
28 #include "core/loader/TextTrackLoader.h" 28 #include "core/loader/TextTrackLoader.h"
29 29
30 #include "FetchInitiatorTypeNames.h" 30 #include "FetchInitiatorTypeNames.h"
31 #include "core/dom/Document.h" 31 #include "core/dom/Document.h"
32 #include "core/fetch/CrossOriginAccessControl.h" 32 #include "core/fetch/CrossOriginAccessControl.h"
33 #include "core/fetch/FetchRequest.h" 33 #include "core/fetch/FetchRequest.h"
34 #include "core/fetch/ResourceFetcher.h" 34 #include "core/fetch/ResourceFetcher.h"
35 #include "core/fetch/TextTrackResource.h" 35 #include "core/fetch/TextTrackResource.h"
36 #include "core/html/track/WebVTTParser.h" 36 #include "core/html/track/WebVTTParser.h"
37 #include "core/platform/Logging.h" 37 #include "platform/Logging.h"
38 #include "platform/SharedBuffer.h" 38 #include "platform/SharedBuffer.h"
39 #include "weborigin/SecurityOrigin.h" 39 #include "weborigin/SecurityOrigin.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, ScriptExecutionC ontext* context) 43 TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, ScriptExecutionC ontext* context)
44 : m_client(client) 44 : m_client(client)
45 , m_scriptExecutionContext(context) 45 , m_scriptExecutionContext(context)
46 , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired) 46 , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired)
47 , m_state(Idle) 47 , m_state(Idle)
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 #if ENABLE(WEBVTT_REGIONS) 214 #if ENABLE(WEBVTT_REGIONS)
215 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegi ons) 215 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegi ons)
216 { 216 {
217 ASSERT(m_cueParser); 217 ASSERT(m_cueParser);
218 if (m_cueParser) 218 if (m_cueParser)
219 m_cueParser->getNewRegions(outputRegions); 219 m_cueParser->getNewRegions(outputRegions);
220 } 220 }
221 #endif 221 #endif
222 } 222 }
223 223
OLDNEW
« no previous file with comments | « Source/core/loader/ProgressTracker.cpp ('k') | Source/core/page/Navigator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698