diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 21:04:06 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 21:04:06 +0000 |
| commit | 2f3abb9b6ca4e8018c43860578a6ac98578108d1 (patch) | |
| tree | a49d3b957de1ee6ee230eeab5afda1d3216a2ba5 /webkit | |
| parent | ffd2c4e939d27a4a50ffa75fb2c2fd9911f62675 (diff) | |
| download | chromium_src-2f3abb9b6ca4e8018c43860578a6ac98578108d1.zip chromium_src-2f3abb9b6ca4e8018c43860578a6ac98578108d1.tar.gz chromium_src-2f3abb9b6ca4e8018c43860578a6ac98578108d1.tar.bz2 | |
Change Deryptor::DecryptStatus and VideoDecoder::DecoderStatus to *::Status.
Previously this was not possible because it conflicts with a macro in x11. This has been fixed by acolwell@. Make this change now to be consistent with DemuxerStream::Status, AudioDecoder::Status, and SourceBufferStream::Status.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10825194
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/crypto/proxy_decryptor.cc | 2 | ||||
| -rw-r--r-- | webkit/media/crypto/proxy_decryptor.h | 2 | ||||
| -rw-r--r-- | webkit/media/crypto/proxy_decryptor_unittest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc index c71c6bd..203c146 100644 --- a/webkit/media/crypto/proxy_decryptor.cc +++ b/webkit/media/crypto/proxy_decryptor.cc @@ -243,7 +243,7 @@ void ProxyDecryptor::OnBufferDecrypted( const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy, const scoped_refptr<media::DecoderBuffer>& encrypted, const media::Decryptor::DecryptCB& decrypt_cb, - media::Decryptor::DecryptStatus status, + media::Decryptor::Status status, const scoped_refptr<media::DecoderBuffer>& decrypted) { if (status == media::Decryptor::kSuccess || status == media::Decryptor::kError) { diff --git a/webkit/media/crypto/proxy_decryptor.h b/webkit/media/crypto/proxy_decryptor.h index a4638af..cc590cc 100644 --- a/webkit/media/crypto/proxy_decryptor.h +++ b/webkit/media/crypto/proxy_decryptor.h @@ -75,7 +75,7 @@ class ProxyDecryptor : public media::Decryptor { const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy, const scoped_refptr<media::DecoderBuffer>& encrypted, const media::Decryptor::DecryptCB& decrypt_cb, - media::Decryptor::DecryptStatus status, + media::Decryptor::Status status, const scoped_refptr<media::DecoderBuffer>& decrypted); media::DecryptorClient* client_; diff --git a/webkit/media/crypto/proxy_decryptor_unittest.cc b/webkit/media/crypto/proxy_decryptor_unittest.cc index e4b23bc..097d48c 100644 --- a/webkit/media/crypto/proxy_decryptor_unittest.cc +++ b/webkit/media/crypto/proxy_decryptor_unittest.cc @@ -97,7 +97,7 @@ class ProxyDecryptorTest : public testing::Test { kFakeSessionId); } - MOCK_METHOD2(BufferDecrypted, void(Decryptor::DecryptStatus, + MOCK_METHOD2(BufferDecrypted, void(Decryptor::Status, const scoped_refptr<DecoderBuffer>&)); protected: |