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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the DCHECK where init_data_type_ is set but NeedKey from decoder passes empty "type". Created 8 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 | Annotate | Revision Log
« no previous file with comments | « webkit/media/webmediaplayer_proxy.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 250
251 bool CanRotateView(); 251 bool CanRotateView();
252 void RotateView(WebKit::WebPlugin::RotationType type); 252 void RotateView(WebKit::WebPlugin::RotationType type);
253 253
254 void Graphics3DContextLost(); 254 void Graphics3DContextLost();
255 255
256 // Provides access to PPP_ContentDecryptor_Private. 256 // Provides access to PPP_ContentDecryptor_Private.
257 // TODO(tomfinegan): Move decryptor methods to delegate class. 257 // TODO(tomfinegan): Move decryptor methods to delegate class.
258 void set_decrypt_client(media::DecryptorClient* client); 258 void set_decrypt_client(media::DecryptorClient* client);
259 bool GenerateKeyRequest(const std::string& key_system, 259 bool GenerateKeyRequest(const std::string& key_system,
260 const std::string& type,
260 const std::string& init_data); 261 const std::string& init_data);
261 bool AddKey(const std::string& session_id, 262 bool AddKey(const std::string& session_id,
262 const std::string& key, 263 const std::string& key,
263 const std::string& init_data); 264 const std::string& init_data);
264 bool CancelKeyRequest(const std::string& session_id); 265 bool CancelKeyRequest(const std::string& session_id);
265 bool Decrypt(media::Decryptor::StreamType stream_type, 266 bool Decrypt(media::Decryptor::StreamType stream_type,
266 const scoped_refptr<media::DecoderBuffer>& encrypted_buffer, 267 const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
267 const media::Decryptor::DecryptCB& decrypt_cb); 268 const media::Decryptor::DecryptCB& decrypt_cb);
268 bool CancelDecrypt(media::Decryptor::StreamType stream_type); 269 bool CancelDecrypt(media::Decryptor::StreamType stream_type);
269 bool InitializeAudioDecoder( 270 bool InitializeAudioDecoder(
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 uint32_t pending_video_decode_request_id_; 819 uint32_t pending_video_decode_request_id_;
819 media::Decryptor::VideoDecodeCB pending_video_decode_cb_; 820 media::Decryptor::VideoDecodeCB pending_video_decode_cb_;
820 821
821 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 822 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
822 }; 823 };
823 824
824 } // namespace ppapi 825 } // namespace ppapi
825 } // namespace webkit 826 } // namespace webkit
826 827
827 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 828 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_proxy.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698