CdmAdapter: Report size of the file read by CDM via FileIO.

media/cdm/ppapi/cdm_file_io_impl.cc

 // Copyright 2013 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 "media/cdm/ppapi/cdm_file_io_impl.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include "media/cdm/ppapi/cdm_logging.h"
@@ skipping 38 matching lines @@
 
 CdmFileIOImpl::ResourceTracker::ResourceTracker() {
   // Do nothing here since we lazy-initialize CdmFileIOImpl::file_lock_map_
   // in CdmFileIOImpl::AcquireFileLock().
 }
 
 CdmFileIOImpl::ResourceTracker::~ResourceTracker() {
   delete CdmFileIOImpl::file_lock_map_;
 }
 
-CdmFileIOImpl::CdmFileIOImpl(cdm::FileIOClient* client, PP_Instance pp_instance)
+CdmFileIOImpl::CdmFileIOImpl(
+    cdm::FileIOClient* client,
+    PP_Instance pp_instance,
+    const pp::CompletionCallback& file_read_cb)
     : state_(FILE_UNOPENED),
       client_(client),
       pp_instance_handle_(pp_instance),
       callback_factory_(this),
-      io_offset_(0) {
+      io_offset_(0),
+      file_read_cb_(file_read_cb) {
   PP_DCHECK(IsMainThread());
   PP_DCHECK(pp_instance);  // 0 indicates a "NULL handle".
 }
 
 CdmFileIOImpl::~CdmFileIOImpl() {
   PP_DCHECK(state_ == FILE_CLOSED);
 }
 
 // Call sequence: Open() -> OpenFileSystem() -> OpenFile() -> FILE_OPENED.
 void CdmFileIOImpl::Open(const char* file_name, uint32_t file_name_size) {
@@ skipping 256 matching lines @@
   io_buffer_.clear();
   io_offset_ = 0;
   // Clear |cumulative_read_buffer_| in case OnReadComplete() calls Read() or
   // Write().
   std::vector<char> local_buffer;
   std::swap(cumulative_read_buffer_, local_buffer);
 
   state_ = FILE_OPENED;
   const uint8_t* data = local_buffer.empty() ?
       NULL : reinterpret_cast<const uint8_t*>(&local_buffer[0]);
+
+  // Call this before OnReadComplete() so that we always have the latest file
+  // size before CDM fires errors.
+  file_read_cb_.Run(local_buffer.size());
+
   client_->OnReadComplete(
       cdm::FileIOClient::kSuccess, data, local_buffer.size());
 }
 
 void CdmFileIOImpl::SetLength(uint32_t length) {
   PP_DCHECK(state_ == WRITING_FILE);
 
   pp::CompletionCallback cb =
       callback_factory_.NewCallback(&CdmFileIOImpl::OnLengthSet);
   CHECK_PP_OK_COMPLETIONPENDING(file_io_.SetLength(length, cb), WRITE_ERROR);
@@ skipping 107 matching lines @@
 
 void CdmFileIOImpl::ReportClosingStateUMA(State state) {
 #if defined(OS_CHROMEOS)
   pp::UMAPrivate uma_interface(pp_instance_handle_);
   uma_interface.HistogramEnumeration(
       "Media.EME.CdmFileIO.ClosingState", state, STATE_MAX);
 #endif
 }
 
 }  // namespace media