diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 19:50:09 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 19:50:09 +0000 |
| commit | b3341733befdca5563123e90b65adbd92b97b2ad (patch) | |
| tree | 2821621c5dc84f07b3939ede66e7edbb6afaa982 /webkit/media | |
| parent | 48697d8a33d2b98f7401a3b1e657c86cf3dba981 (diff) | |
| download | chromium_src-b3341733befdca5563123e90b65adbd92b97b2ad.zip chromium_src-b3341733befdca5563123e90b65adbd92b97b2ad.tar.gz chromium_src-b3341733befdca5563123e90b65adbd92b97b2ad.tar.bz2 | |
Eliminate media::Buffer as a base class for media::DecoderBuffer and media::DataBuffer.
It was never a good idea in the first place.
Our usage is exclusively with DecoderBuffers or DataBuffers. There's never a case where we benefit from using Buffer as a base class aside from hiding GetWriteableData(), however it's not a compelling enough reason to keep Buffer around.
BUG=169614
TBR=dmichael
Review URL: https://codereview.chromium.org/11880008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/ppapi/clear_key_cdm.cc | 1 | ||||
| -rw-r--r-- | webkit/media/crypto/ppapi_decryptor.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc index 32f537b..53af6fd 100644 --- a/webkit/media/crypto/ppapi/clear_key_cdm.cc +++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/time.h" #include "media/base/decoder_buffer.h" +#include "media/base/decrypt_config.h" #include "webkit/media/crypto/ppapi/cdm_video_decoder.h" #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc index d9565f4..8013cef 100644 --- a/webkit/media/crypto/ppapi_decryptor.cc +++ b/webkit/media/crypto/ppapi_decryptor.cc @@ -13,6 +13,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "media/base/audio_decoder_config.h" +#include "media/base/data_buffer.h" #include "media/base/decoder_buffer.h" #include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" |