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

Side by Side Diff: Source/core/html/track/InbandTextTrack.h

Issue 244493002: Oilpan: add transition types to track interface objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Explicitly dispose of TextTrackList + fix handling of {Inband,Loadable}TextTrack Created 6 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2012, 2013 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
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 #ifndef InbandTextTrack_h 26 #ifndef InbandTextTrack_h
27 #define InbandTextTrack_h 27 #define InbandTextTrack_h
28 28
29 #include "core/html/track/TextTrack.h" 29 #include "core/html/track/TextTrack.h"
30 #include "platform/heap/Handle.h"
30 #include "public/platform/WebInbandTextTrackClient.h" 31 #include "public/platform/WebInbandTextTrackClient.h"
31 #include "wtf/RefPtr.h" 32 #include "wtf/RefPtr.h"
32 33
33 namespace blink { 34 namespace blink {
34 class WebInbandTextTrack; 35 class WebInbandTextTrack;
35 class WebString; 36 class WebString;
36 } 37 }
37 38
38 namespace WebCore { 39 namespace WebCore {
39 40
40 class Document; 41 class Document;
41 class MediaPlayer; 42 class MediaPlayer;
42 class TextTrackCue; 43 class TextTrackCue;
43 44
44 class InbandTextTrack FINAL : public TextTrack, public blink::WebInbandTextTrack Client { 45 class InbandTextTrack FINAL : public TextTrack, public blink::WebInbandTextTrack Client {
45 public: 46 public:
46 static PassRefPtr<InbandTextTrack> create(Document&, blink::WebInbandTextTra ck*); 47 static PassRefPtrWillBeRawPtr<InbandTextTrack> create(Document&, blink::WebI nbandTextTrack*);
47 virtual ~InbandTextTrack(); 48 virtual ~InbandTextTrack();
48 49
49 size_t inbandTrackIndex(); 50 size_t inbandTrackIndex();
50 virtual void setTrackList(TextTrackList*) OVERRIDE FINAL; 51 virtual void setTrackList(TextTrackList*) OVERRIDE FINAL;
51 52
52 private: 53 private:
53 InbandTextTrack(Document&, blink::WebInbandTextTrack*); 54 InbandTextTrack(Document&, blink::WebInbandTextTrack*);
54 55
55 virtual void addWebVTTCue(double, double, const blink::WebString&, const bli nk::WebString&, const blink::WebString&) OVERRIDE; 56 virtual void addWebVTTCue(double, double, const blink::WebString&, const bli nk::WebString&, const blink::WebString&) OVERRIDE;
56 57
57 blink::WebInbandTextTrack* m_webTrack; 58 blink::WebInbandTextTrack* m_webTrack;
58 }; 59 };
59 60
60 } // namespace WebCore 61 } // namespace WebCore
61 62
62 #endif 63 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698