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

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

Issue 92763002: Rename addTrack and removeTrack functions to addTextTrack and removeTextTrack. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased to apply cleanly Created 6 years, 11 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
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/web/WebMediaPlayerClientImpl.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) 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 virtual void mediaPlayerKeyAdded(const String& /* keySystem */, const String & /* sessionId */) = 0; 92 virtual void mediaPlayerKeyAdded(const String& /* keySystem */, const String & /* sessionId */) = 0;
93 virtual void mediaPlayerKeyError(const String& /* keySystem */, const String & /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) = 0; 93 virtual void mediaPlayerKeyError(const String& /* keySystem */, const String & /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) = 0;
94 virtual void mediaPlayerKeyMessage(const String& /* keySystem */, const Stri ng& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLeng th */, const KURL& /* defaultURL */) = 0; 94 virtual void mediaPlayerKeyMessage(const String& /* keySystem */, const Stri ng& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLeng th */, const KURL& /* defaultURL */) = 0;
95 virtual bool mediaPlayerKeyNeeded(const String& /* contentType */, const uns igned char* /* initData */, unsigned /* initDataLength */) = 0; 95 virtual bool mediaPlayerKeyNeeded(const String& /* contentType */, const uns igned char* /* initData */, unsigned /* initDataLength */) = 0;
96 96
97 virtual CORSMode mediaPlayerCORSMode() const = 0; 97 virtual CORSMode mediaPlayerCORSMode() const = 0;
98 98
99 virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0; 99 virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0;
100 virtual void mediaPlayerSetOpaque(bool) = 0; 100 virtual void mediaPlayerSetOpaque(bool) = 0;
101 101
102 virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) = 0; 102 virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) = 0;
103 virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) = 0; 103 virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) = 0;
104 104
105 virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) = 0; 105 virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) = 0;
106 }; 106 };
107 107
108 typedef PassOwnPtr<MediaPlayer> (*CreateMediaEnginePlayer)(MediaPlayerClient*); 108 typedef PassOwnPtr<MediaPlayer> (*CreateMediaEnginePlayer)(MediaPlayerClient*);
109 109
110 class PLATFORM_EXPORT MediaPlayer { 110 class PLATFORM_EXPORT MediaPlayer {
111 WTF_MAKE_NONCOPYABLE(MediaPlayer); 111 WTF_MAKE_NONCOPYABLE(MediaPlayer);
112 public: 112 public:
113 static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*); 113 static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported, InvalidAccess }; 190 enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported, InvalidAccess };
191 virtual MediaKeyException addKey(const String&, const unsigned char*, unsign ed, const unsigned char*, unsigned, const String&) = 0; 191 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; 192 virtual MediaKeyException generateKeyRequest(const String&, const unsigned c har*, unsigned) = 0;
193 virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0 ; 193 virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0 ;
194 virtual void setContentDecryptionModule(blink::WebContentDecryptionModule*) = 0; 194 virtual void setContentDecryptionModule(blink::WebContentDecryptionModule*) = 0;
195 }; 195 };
196 196
197 } 197 }
198 198
199 #endif // MediaPlayer_h 199 #endif // MediaPlayer_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/web/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698