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

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

Issue 10928098: Return void from all PPP CDM API interface methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 void PrintEnd(); 246 void PrintEnd();
247 247
248 bool CanRotateView(); 248 bool CanRotateView();
249 void RotateView(WebKit::WebPlugin::RotationType type); 249 void RotateView(WebKit::WebPlugin::RotationType type);
250 250
251 void Graphics3DContextLost(); 251 void Graphics3DContextLost();
252 252
253 // Provides access to PPP_ContentDecryptor_Private. 253 // Provides access to PPP_ContentDecryptor_Private.
254 // TODO(tomfinegan): Move decryptor methods to delegate class. 254 // TODO(tomfinegan): Move decryptor methods to delegate class.
255 void set_decrypt_client(media::DecryptorClient* client); 255 void set_decrypt_client(media::DecryptorClient* client);
256 bool GenerateKeyRequest(const std::string& key_system, 256 void GenerateKeyRequest(const std::string& key_system,
257 const std::string& init_data); 257 const std::string& init_data);
258 bool AddKey(const std::string& session_id, 258 void AddKey(const std::string& session_id,
259 const std::string& key, 259 const std::string& key,
260 const std::string& init_data); 260 const std::string& init_data);
261 bool CancelKeyRequest(const std::string& session_id); 261 void CancelKeyRequest(const std::string& session_id);
262 bool Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted_buffer, 262 void Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
263 const media::Decryptor::DecryptCB& decrypt_cb); 263 const media::Decryptor::DecryptCB& decrypt_cb);
264 // TODO(xhwang): Update this when we need to support decrypt and decode. 264 // TODO(xhwang): Update this when we need to support decrypt and decode.
265 bool DecryptAndDecode( 265 void DecryptAndDecode(
266 const scoped_refptr<media::DecoderBuffer>& encrypted_buffer, 266 const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
267 const media::Decryptor::DecryptCB& decrypt_cb); 267 const media::Decryptor::DecryptCB& decrypt_cb);
268 268
269 // There are 2 implementations of the fullscreen interface 269 // There are 2 implementations of the fullscreen interface
270 // PPB_FlashFullscreen is used by Pepper Flash. 270 // PPB_FlashFullscreen is used by Pepper Flash.
271 // PPB_Fullscreen is intended for other applications including NaCl. 271 // PPB_Fullscreen is intended for other applications including NaCl.
272 // The two interface are mutually exclusive. 272 // The two interface are mutually exclusive.
273 273
274 // Implementation of PPB_FlashFullscreen. 274 // Implementation of PPB_FlashFullscreen.
275 275
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 typedef std::map<uint32_t, media::Decryptor::DecryptCB> DecryptionCBMap; 760 typedef std::map<uint32_t, media::Decryptor::DecryptCB> DecryptionCBMap;
761 DecryptionCBMap pending_decryption_cbs_; 761 DecryptionCBMap pending_decryption_cbs_;
762 762
763 DISALLOW_COPY_AND_ASSIGN(PluginInstance); 763 DISALLOW_COPY_AND_ASSIGN(PluginInstance);
764 }; 764 };
765 765
766 } // namespace ppapi 766 } // namespace ppapi
767 } // namespace webkit 767 } // namespace webkit
768 768
769 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ 769 #endif // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698