Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4.

webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
@@ skipping 30 matching lines @@
 
   for (int i = 0; i < rows; ++i) {
     const int source_offset = i * source_stride;
     const int target_offset = i * target_stride;
     memcpy(target + target_offset,
            source + source_offset,
            copy_bytes_per_row);
   }
 }
 
-LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Allocator* allocator)
+LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Host* host)
     : is_initialized_(false),
-      allocator_(allocator),
+      host_(host),
       vpx_codec_(NULL),
       vpx_image_(NULL) {
 }
 
 LibvpxCdmVideoDecoder::~LibvpxCdmVideoDecoder() {
   Deinitialize();
 }
 
 bool LibvpxCdmVideoDecoder::Initialize(const cdm::VideoDecoderConfig& config) {
   DVLOG(1) << "Initialize()";
@@ skipping 102 matching lines @@
   DCHECK_EQ(vpx_image_->fmt, VPX_IMG_FMT_I420);
   DCHECK_EQ(vpx_image_->d_w % 2, 0U);
   DCHECK_EQ(vpx_image_->d_h % 2, 0U);
 
 #if defined(USE_COPYPLANE_WITH_LIBVPX)
   const int y_size = vpx_image_->d_w * vpx_image_->d_h;
   const int uv_size = y_size / 2;
   const int space_required = y_size + (uv_size * 2);
 
   DCHECK(!cdm_video_frame->FrameBuffer());
-  cdm_video_frame->SetFrameBuffer(allocator_->Allocate(space_required));
+  cdm_video_frame->SetFrameBuffer(host_->Allocate(space_required));
   if (!cdm_video_frame->FrameBuffer()) {
-    LOG(ERROR) << "CopyVpxImageTo() cdm::Allocator::Allocate failed.";
+    LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
     return false;
   }
   cdm_video_frame->FrameBuffer()->SetSize(space_required);
 
   CopyPlane(vpx_image_->planes[VPX_PLANE_Y],
             vpx_image_->stride[VPX_PLANE_Y],
             vpx_image_->d_w,
             vpx_image_->d_h,
             vpx_image_->d_w,
             cdm_video_frame->FrameBuffer()->Data());
@@ skipping 30 matching lines @@
   cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane, uv_stride);
   cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane, uv_stride);
 #else
   const int y_size = vpx_image_->stride[VPX_PLANE_Y] * vpx_image_->d_h;
   const int uv_rows = vpx_image_->d_h / 2;
   const int u_size = vpx_image_->stride[VPX_PLANE_U] * uv_rows;
   const int v_size = vpx_image_->stride[VPX_PLANE_V] * uv_rows;
   const int space_required = y_size + u_size + v_size;
 
   DCHECK(!cdm_video_frame->FrameBuffer());
-  cdm_video_frame->SetFrameBuffer(allocator_->Allocate(space_required));
+  cdm_video_frame->SetFrameBuffer(host_->Allocate(space_required));
   if (!cdm_video_frame->FrameBuffer()) {
-    LOG(ERROR) << "CopyVpxImageTo() cdm::Allocator::Allocate failed.";
+    LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
     return false;
   }
   cdm_video_frame->FrameBuffer()->SetSize(space_required);
 
   memcpy(cdm_video_frame->FrameBuffer()->Data(),
          vpx_image_->planes[VPX_PLANE_Y],
          y_size);
   memcpy(cdm_video_frame->FrameBuffer()->Data() + y_size,
          vpx_image_->planes[VPX_PLANE_U],
          u_size);
@@ skipping 18 matching lines @@
   cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane,
                               vpx_image_->stride[VPX_PLANE_U]);
   cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane,
                               vpx_image_->stride[VPX_PLANE_V]);
 #endif  // USE_COPYPLANE_WITH_LIBVPX
 
   return true;
 }
 
 }  // namespace webkit_media