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

Unified Diff: webkit/media/crypto/proxy_decryptor.cc

Issue 11106004: Allow null buffer resources to be returned through the PPB_ContentDecryptor_Private proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: webkit/media/crypto/proxy_decryptor.cc
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index 62c02f4e1025e2fdbf3cf82d3021823cb9525b7c..64d4a41a0b9ad32b6da66944ce34d5f1e1e6908c 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -170,7 +170,7 @@ void ProxyDecryptor::Decrypt(
decryptor = decryptor_.get();
}
if (!decryptor) {
- DVLOG(1) << "ProxyDecryptor::Decrypt(): decryptor not initialized.";
+ DVLOG(1) << "Decrypt(): decryptor not initialized.";
// TODO(xhwang): The same NeedKey may be fired here and multiple times in
// OnBufferDecrypted(). While the spec says only one NeedKey should be
@@ -183,6 +183,7 @@ void ProxyDecryptor::Decrypt(
}
void ProxyDecryptor::CancelDecrypt() {
+ DVLOG(1) << "CancelDecrypt()";
xhwang 2012/10/12 00:06:44 why this is level one?
ddorwin 2012/10/12 00:21:16 Because it is rarer and much more interesting than
DCHECK(decryption_message_loop_->BelongsToCurrentThread());
if (!pending_buffer_to_decrypt_) {
@@ -281,6 +282,7 @@ void ProxyDecryptor::OnNewKeyAdded() {
}
void ProxyDecryptor::DecryptPendingBuffer() {
+ DVLOG(3) << "DecryptPendingBuffer()";
DCHECK(decryption_message_loop_->BelongsToCurrentThread());
DCHECK(pending_buffer_to_decrypt_);
DCHECK(!is_waiting_for_decryptor_);
@@ -301,6 +303,7 @@ void ProxyDecryptor::OnBufferDecrypted(
return;
}
+ DVLOG(2) << "OnBufferDecrypted()";
xhwang 2012/10/12 00:06:44 why this is level 2?
ddorwin 2012/10/12 00:21:16 So we can get level 1 logging without getting spam
DCHECK(pending_buffer_to_decrypt_);
DCHECK(!pending_decrypt_cb_.is_null());
DCHECK(is_waiting_for_decryptor_);

Powered by Google App Engine
This is Rietveld 408576698