| OLD | NEW |
| 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 12 matching lines...) Expand all Loading... |
| 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/ResourceOwner.h" | 30 #include "core/fetch/ResourceOwner.h" |
| 31 #include "core/html/track/vtt/VTTParser.h" | 31 #include "core/html/track/vtt/VTTParser.h" |
| 32 #include "platform/Timer.h" | 32 #include "platform/Timer.h" |
| 33 #include "platform/heap/Handle.h" |
| 33 #include "wtf/OwnPtr.h" | 34 #include "wtf/OwnPtr.h" |
| 34 | 35 |
| 35 namespace WebCore { | 36 namespace WebCore { |
| 36 | 37 |
| 37 class Document; | 38 class Document; |
| 38 class TextTrackLoader; | 39 class TextTrackLoader; |
| 39 | 40 |
| 40 class TextTrackLoaderClient : public ResourceOwner<RawResource> { | 41 class TextTrackLoaderClient : public ResourceOwner<RawResource> { |
| 41 public: | 42 public: |
| 42 virtual ~TextTrackLoaderClient() { } | 43 virtual ~TextTrackLoaderClient() { } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 55 return adoptPtr(new TextTrackLoader(client, document)); | 56 return adoptPtr(new TextTrackLoader(client, document)); |
| 56 } | 57 } |
| 57 virtual ~TextTrackLoader(); | 58 virtual ~TextTrackLoader(); |
| 58 | 59 |
| 59 bool load(const KURL&, const AtomicString& crossOriginMode); | 60 bool load(const KURL&, const AtomicString& crossOriginMode); |
| 60 void cancelLoad(); | 61 void cancelLoad(); |
| 61 | 62 |
| 62 enum State { Idle, Loading, Finished, Failed }; | 63 enum State { Idle, Loading, Finished, Failed }; |
| 63 State loadState() { return m_state; } | 64 State loadState() { return m_state; } |
| 64 | 65 |
| 65 void getNewCues(Vector<RefPtr<VTTCue> >& outputCues); | 66 void getNewCues(WillBeHeapVector<RefPtrWillBeMember<VTTCue> >& outputCues); |
| 66 void getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions); | 67 void getNewRegions(WillBeHeapVector<RefPtrWillBeMember<VTTRegion> >& outputR
egions); |
| 67 private: | 68 private: |
| 68 | 69 |
| 69 // RawResourceClient | 70 // RawResourceClient |
| 70 virtual void dataReceived(Resource*, const char* data, int length) OVERRIDE; | 71 virtual void dataReceived(Resource*, const char* data, int length) OVERRIDE; |
| 71 virtual void notifyFinished(Resource*) OVERRIDE; | 72 virtual void notifyFinished(Resource*) OVERRIDE; |
| 72 | 73 |
| 73 // VTTParserClient | 74 // VTTParserClient |
| 74 virtual void newCuesParsed() OVERRIDE; | 75 virtual void newCuesParsed() OVERRIDE; |
| 75 virtual void newRegionsParsed() OVERRIDE; | 76 virtual void newRegionsParsed() OVERRIDE; |
| 76 virtual void fileFailedToParse() OVERRIDE; | 77 virtual void fileFailedToParse() OVERRIDE; |
| 77 | 78 |
| 78 TextTrackLoader(TextTrackLoaderClient&, Document&); | 79 TextTrackLoader(TextTrackLoaderClient&, Document&); |
| 79 | 80 |
| 80 void cueLoadTimerFired(Timer<TextTrackLoader>*); | 81 void cueLoadTimerFired(Timer<TextTrackLoader>*); |
| 81 void corsPolicyPreventedLoad(SecurityOrigin*, const KURL&); | 82 void corsPolicyPreventedLoad(SecurityOrigin*, const KURL&); |
| 82 | 83 |
| 83 TextTrackLoaderClient& m_client; | 84 TextTrackLoaderClient& m_client; |
| 84 OwnPtr<VTTParser> m_cueParser; | 85 OwnPtrWillBePersistent<VTTParser> m_cueParser; |
| 85 // FIXME: Remove this pointer and get the Document from m_client. | 86 // FIXME: Remove this pointer and get the Document from m_client. |
| 86 Document& m_document; | 87 Document& m_document; |
| 87 Timer<TextTrackLoader> m_cueLoadTimer; | 88 Timer<TextTrackLoader> m_cueLoadTimer; |
| 88 State m_state; | 89 State m_state; |
| 89 bool m_newCuesAvailable; | 90 bool m_newCuesAvailable; |
| 90 }; | 91 }; |
| 91 | 92 |
| 92 } // namespace WebCore | 93 } // namespace WebCore |
| 93 | 94 |
| 94 #endif | 95 #endif |
| OLD | NEW |