Media Galleries API: Audio/Video attached pictures support.

chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.cc

 // Copyright 2014 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 "chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h"
 
 #include "chrome/browser/extensions/blob_reader.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/utility_process_host.h"
 
 using content::BrowserThread;
 
 namespace metadata {
 
-SafeMediaMetadataParser::SafeMediaMetadataParser(Profile* profile,
-                                                 const std::string& blob_uuid,
-                                                 int64 blob_size,
-                                                 const std::string& mime_type)
+SafeMediaMetadataParser::SafeMediaMetadataParser(
+    Profile* profile, const std::string& blob_uuid, int64 blob_size,
+    const std::string& mime_type, bool get_attached_images)
     : profile_(profile),
       blob_uuid_(blob_uuid),
       blob_size_(blob_size),
       mime_type_(mime_type),
+      get_attached_images_(get_attached_images),
       parser_state_(INITIAL_STATE) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 void SafeMediaMetadataParser::Start(const DoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&SafeMediaMetadataParser::StartWorkOnIOThread, this,
                  callback));
 }
 
 SafeMediaMetadataParser::~SafeMediaMetadataParser() {
 }
 
 void SafeMediaMetadataParser::StartWorkOnIOThread(
     const DoneCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK_EQ(INITIAL_STATE, parser_state_);
   DCHECK(!callback.is_null());
 
   callback_ = callback;
 
   utility_process_host_ = content::UtilityProcessHost::Create(
       this, base::MessageLoopProxy::current())->AsWeakPtr();
 
   utility_process_host_->Send(
-      new ChromeUtilityMsg_ParseMediaMetadata(mime_type_, blob_size_));
+      new ChromeUtilityMsg_ParseMediaMetadata(mime_type_, blob_size_,
+                                              get_attached_images_));
 
   parser_state_ = STARTED_PARSING_STATE;
 }
 
 void SafeMediaMetadataParser::OnParseMediaMetadataFinished(
-    bool parse_success, const base::DictionaryValue& metadata_dictionary) {
+    bool parse_success, const base::DictionaryValue& metadata_dictionary,
+    const std::vector<AttachedImage>& attached_images) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!callback_.is_null());
 
   if (parser_state_ != STARTED_PARSING_STATE)
     return;
 
+  // We need to make a scoped copy of this vector since it will be destroyed

[tommycli, 2014/05/07 21:39:05]

I tried to eliminate all the copies, but could not eliminate this one. The IPC
message was const, so I could not do a data-move.

+  // at the end of the IPC message handler.
+  scoped_ptr<std::vector<metadata::AttachedImage>> attached_images_scoped =
+      make_scoped_ptr(new std::vector<metadata::AttachedImage>(
+          attached_images));
+
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(callback_, parse_success,
-                 base::Owned(metadata_dictionary.DeepCopy())));
+                 base::Passed(make_scoped_ptr(metadata_dictionary.DeepCopy())),
+                 base::Passed(&attached_images_scoped)));
   parser_state_ = FINISHED_PARSING_STATE;
 }
 
 void SafeMediaMetadataParser::OnUtilityProcessRequestBlobBytes(
     int64 request_id, int64 byte_start, int64 length) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&SafeMediaMetadataParser::StartBlobReaderOnUIThread, this,
@@ skipping 31 matching lines @@
       request_id, *data));
 }
 
 void SafeMediaMetadataParser::OnProcessCrashed(int exit_code) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!callback_.is_null());
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
-      base::Bind(callback_, false, base::Owned(new base::DictionaryValue)));
+      base::Bind(callback_, false,
+                 base::Passed(scoped_ptr<base::DictionaryValue>()),
+                 base::Passed(scoped_ptr<std::vector<AttachedImage>>())));
   parser_state_ = FINISHED_PARSING_STATE;
 }
 
 bool SafeMediaMetadataParser::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SafeMediaMetadataParser, message)
     IPC_MESSAGE_HANDLER(
         ChromeUtilityHostMsg_ParseMediaMetadata_Finished,
         OnParseMediaMetadataFinished)
     IPC_MESSAGE_HANDLER(
         ChromeUtilityHostMsg_RequestBlobBytes,
         OnUtilityProcessRequestBlobBytes)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 }  // namespace metadata