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

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

Issue 52563002: Remove TextTrackResource (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@dataReceived
Patch Set: simplify 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
« no previous file with comments | « Source/core/fetch/TextTrackResource.cpp ('k') | Source/core/loader/TextTrackLoader.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 10 matching lines...) Expand all
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef TextTrackLoader_h 26 #ifndef TextTrackLoader_h
27 #define TextTrackLoader_h 27 #define TextTrackLoader_h
28 28
29 #include "core/fetch/RawResource.h" 29 #include "core/fetch/RawResource.h"
30 #include "core/fetch/ResourcePtr.h" 30 #include "core/fetch/ResourcePtr.h"
31 #include "core/fetch/TextTrackResource.h"
32 #include "core/html/track/WebVTTParser.h" 31 #include "core/html/track/WebVTTParser.h"
33 #include "platform/Timer.h" 32 #include "platform/Timer.h"
34 #include "wtf/OwnPtr.h" 33 #include "wtf/OwnPtr.h"
35 34
36 namespace WebCore { 35 namespace WebCore {
37 36
38 class Document; 37 class Document;
39 class TextTrackLoader; 38 class TextTrackLoader;
40 39
41 class TextTrackLoaderClient { 40 class TextTrackLoaderClient {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 virtual void newRegionsParsed() OVERRIDE; 77 virtual void newRegionsParsed() OVERRIDE;
79 virtual void fileFailedToParse() OVERRIDE; 78 virtual void fileFailedToParse() OVERRIDE;
80 79
81 TextTrackLoader(TextTrackLoaderClient*, Document&); 80 TextTrackLoader(TextTrackLoaderClient*, Document&);
82 81
83 void cueLoadTimerFired(Timer<TextTrackLoader>*); 82 void cueLoadTimerFired(Timer<TextTrackLoader>*);
84 void corsPolicyPreventedLoad(); 83 void corsPolicyPreventedLoad();
85 84
86 TextTrackLoaderClient* m_client; 85 TextTrackLoaderClient* m_client;
87 OwnPtr<WebVTTParser> m_cueParser; 86 OwnPtr<WebVTTParser> m_cueParser;
88 ResourcePtr<TextTrackResource> m_resource; 87 ResourcePtr<RawResource> m_resource;
89 // FIXME: Remove this pointer and get the Document from m_client. 88 // FIXME: Remove this pointer and get the Document from m_client.
90 Document& m_document; 89 Document& m_document;
91 Timer<TextTrackLoader> m_cueLoadTimer; 90 Timer<TextTrackLoader> m_cueLoadTimer;
92 String m_crossOriginMode; 91 String m_crossOriginMode;
93 State m_state; 92 State m_state;
94 bool m_newCuesAvailable; 93 bool m_newCuesAvailable;
95 }; 94 };
96 95
97 } // namespace WebCore 96 } // namespace WebCore
98 97
99 #endif 98 #endif
OLDNEW
« no previous file with comments | « Source/core/fetch/TextTrackResource.cpp ('k') | Source/core/loader/TextTrackLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698