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

Side by Side Diff: content/renderer/media/crypto/ppapi_decryptor.cc

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/renderer/media/crypto/ppapi_decryptor.h" 5 #include "content/renderer/media/crypto/ppapi_decryptor.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 session_ready_cb_.Run(session_id); 358 session_ready_cb_.Run(session_id);
359 } 359 }
360 360
361 void PpapiDecryptor::OnSessionClosed(uint32 session_id) { 361 void PpapiDecryptor::OnSessionClosed(uint32 session_id) {
362 DCHECK(render_loop_proxy_->BelongsToCurrentThread()); 362 DCHECK(render_loop_proxy_->BelongsToCurrentThread());
363 session_closed_cb_.Run(session_id); 363 session_closed_cb_.Run(session_id);
364 } 364 }
365 365
366 void PpapiDecryptor::OnSessionError(uint32 session_id, 366 void PpapiDecryptor::OnSessionError(uint32 session_id,
367 media::MediaKeys::KeyError error_code, 367 media::MediaKeys::KeyError error_code,
368 int system_code) { 368 uint32 system_code) {
369 DCHECK(render_loop_proxy_->BelongsToCurrentThread()); 369 DCHECK(render_loop_proxy_->BelongsToCurrentThread());
370 session_error_cb_.Run(session_id, error_code, system_code); 370 session_error_cb_.Run(session_id, error_code, system_code);
371 } 371 }
372 372
373 void PpapiDecryptor::OnFatalPluginError() { 373 void PpapiDecryptor::OnFatalPluginError() {
374 DCHECK(render_loop_proxy_->BelongsToCurrentThread()); 374 DCHECK(render_loop_proxy_->BelongsToCurrentThread());
375 pepper_cdm_wrapper_.reset(); 375 pepper_cdm_wrapper_.reset();
376 } 376 }
377 377
378 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() { 378 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
379 DCHECK(render_loop_proxy_->BelongsToCurrentThread()); 379 DCHECK(render_loop_proxy_->BelongsToCurrentThread());
380 return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL; 380 return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
381 } 381 }
382 382
383 } // namespace content 383 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698