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

Side by Side Diff: Source/platform/graphics/media/MediaPlayer.h

Issue 60083011: Remove InbandTextTrackPrivate/InbandTextTrackPrivateClient (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase on top of https://codereview.chromium.org/61763010/ 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 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
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #ifndef MediaPlayer_h 26 #ifndef MediaPlayer_h
27 #define MediaPlayer_h 27 #define MediaPlayer_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/graphics/GraphicsTypes3D.h" 30 #include "platform/graphics/GraphicsTypes3D.h"
31 #include "wtf/Forward.h" 31 #include "wtf/Forward.h"
32 #include "wtf/Noncopyable.h" 32 #include "wtf/Noncopyable.h"
33 33
34 namespace blink { class WebLayer; } 34 namespace blink {
35 class WebInbandTextTrack;
36 class WebLayer;
37 }
35 38
36 namespace WebCore { 39 namespace WebCore {
37 40
38 class AudioSourceProvider; 41 class AudioSourceProvider;
39 class GraphicsContext; 42 class GraphicsContext;
40 class GraphicsContext3D; 43 class GraphicsContext3D;
41 class InbandTextTrackPrivate;
42 class IntRect; 44 class IntRect;
43 class IntSize; 45 class IntSize;
44 class KURL; 46 class KURL;
45 class MediaPlayer; 47 class MediaPlayer;
46 class HTMLMediaSource; 48 class HTMLMediaSource;
47 class TimeRanges; 49 class TimeRanges;
48 50
49 class MediaPlayerClient { 51 class MediaPlayerClient {
50 public: 52 public:
51 enum CORSMode { Unspecified, Anonymous, UseCredentials }; 53 enum CORSMode { Unspecified, Anonymous, UseCredentials };
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 virtual bool mediaPlayerKeyNeeded(const String& /* keySystem */, const Strin g& /* sessionId */, const unsigned char* /* initData */, unsigned /* initDataLen gth */) = 0; 89 virtual bool mediaPlayerKeyNeeded(const String& /* keySystem */, const Strin g& /* sessionId */, const unsigned char* /* initData */, unsigned /* initDataLen gth */) = 0;
88 90
89 #if ENABLE(ENCRYPTED_MEDIA_V2) 91 #if ENABLE(ENCRYPTED_MEDIA_V2)
90 virtual bool mediaPlayerKeyNeeded(Uint8Array*) = 0; 92 virtual bool mediaPlayerKeyNeeded(Uint8Array*) = 0;
91 #endif 93 #endif
92 94
93 virtual CORSMode mediaPlayerCORSMode() const = 0; 95 virtual CORSMode mediaPlayerCORSMode() const = 0;
94 96
95 virtual void mediaPlayerScheduleLayerUpdate() = 0; 97 virtual void mediaPlayerScheduleLayerUpdate() = 0;
96 98
97 virtual void mediaPlayerDidAddTrack(PassRefPtr<InbandTextTrackPrivate>) = 0; 99 virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) = 0;
98 virtual void mediaPlayerDidRemoveTrack(PassRefPtr<InbandTextTrackPrivate>) = 0; 100 virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) = 0;
99 }; 101 };
100 102
101 typedef PassOwnPtr<MediaPlayer> (*CreateMediaEnginePlayer)(MediaPlayerClient*); 103 typedef PassOwnPtr<MediaPlayer> (*CreateMediaEnginePlayer)(MediaPlayerClient*);
102 104
103 class PLATFORM_EXPORT MediaPlayer { 105 class PLATFORM_EXPORT MediaPlayer {
104 WTF_MAKE_NONCOPYABLE(MediaPlayer); 106 WTF_MAKE_NONCOPYABLE(MediaPlayer);
105 public: 107 public:
106 static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*); 108 static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*);
107 static void setMediaEngineCreateFunction(CreateMediaEnginePlayer); 109 static void setMediaEngineCreateFunction(CreateMediaEnginePlayer);
108 110
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 191
190 enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported }; 192 enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported };
191 virtual MediaKeyException addKey(const String&, const unsigned char*, unsign ed, const unsigned char*, unsigned, const String&) = 0; 193 virtual MediaKeyException addKey(const String&, const unsigned char*, unsign ed, const unsigned char*, unsigned, const String&) = 0;
192 virtual MediaKeyException generateKeyRequest(const String&, const unsigned c har*, unsigned) = 0; 194 virtual MediaKeyException generateKeyRequest(const String&, const unsigned c har*, unsigned) = 0;
193 virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0 ; 195 virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0 ;
194 }; 196 };
195 197
196 } 198 }
197 199
198 #endif // MediaPlayer_h 200 #endif // MediaPlayer_h
OLDNEW
« no previous file with comments | « Source/platform/graphics/media/InbandTextTrackPrivateClient.h ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698