Add API to construct new vector interchange MIME data type.

content/renderer/web_intents_host.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 "content/renderer/web_intents_host.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/intents_messages.h"
+#include "content/public/renderer/v8_value_converter.h"
 #include "content/renderer/render_view_impl.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlob.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDeliveredIntentClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 133 matching lines @@
     v8::Local<v8::String> dataV8 = v8::String::New(
         reinterpret_cast<const uint16_t*>(intent_->unserialized_data.data()),
         static_cast<int>(intent_->unserialized_data.length()));
     WebSerializedScriptValue serialized_data =
         WebSerializedScriptValue::serialize(dataV8);
 
     web_intent = WebIntent::create(intent_->action, intent_->type,
                                    serialized_data.toString(),
                                    extras_keys, extras_values);
   } else if (intent_->data_type == webkit_glue::WebIntentData::BLOB) {
-    DCHECK(intent_->data_type == webkit_glue::WebIntentData::BLOB);
     web_blob_ = WebBlob::createFromFile(
         WebString::fromUTF8(intent_->blob_file.AsUTF8Unsafe()),
         intent_->blob_length);
     WebSerializedScriptValue serialized_data =
         WebSerializedScriptValue::serialize(web_blob_.toV8Value());
     web_intent = WebIntent::create(intent_->action, intent_->type,
                                    serialized_data.toString(),
                                    extras_keys, extras_values);
   } else if (intent_->data_type == webkit_glue::WebIntentData::FILESYSTEM) {
     const GURL origin = GURL(frame->document().securityOrigin().toString());
     const GURL root_url =
         fileapi::GetFileSystemRootURI(origin, fileapi::kFileSystemTypeIsolated);
     const std::string url = base::StringPrintf(
         "%s%s/%s/",
         root_url.spec().c_str(),
         intent_->filesystem_id.c_str(),
         intent_->root_name.c_str());
     // TODO(kmadhusu): This is a temporary hack to create a serializable file
     // system. Once we have a better way to create a serializable file system,
     // remove this hack.
     v8::Handle<v8::Value> filesystem_V8 = frame->createSerializableFileSystem(
         WebKit::WebFileSystem::TypeIsolated,
         WebKit::WebString::fromUTF8(intent_->root_name),
         WebKit::WebString::fromUTF8(url));
     WebSerializedScriptValue serialized_data =
         WebSerializedScriptValue::serialize(filesystem_V8);
     web_intent = WebIntent::create(intent_->action, intent_->type,
                                    serialized_data.toString(),
                                    extras_keys, extras_values);
+  } else if (intent_->data_type == webkit_glue::WebIntentData::MIME_TYPE) {
+    // Do stuffs.

[groby-ooo-7-16, 2012/10/05 17:56:35]

You're fixing that comment, right? ;)

[Greg Billock, 2012/10/05 22:03:26]

:-)

On 2012/10/05 17:56:35, groby wrote:

+    scoped_ptr<content::V8ValueConverter> converter(
+        content::V8ValueConverter::create());
+    v8::Handle<v8::Array> dataV8 = v8::Array::New(intent_->mime_data.GetSize());
+    size_t j;
+    for (j = 0; j < intent_->mime_data.GetSize(); ++j) {
+      const DictionaryValue* val;
+      if (!intent_->mime_data.GetDictionary(j, &val)) continue;
+      v8::Handle<v8::Value> data_point_value =
+          converter->ToV8Value(val, ctx);
+      if (!data_point_value->IsObject()) continue;
+      v8::Handle<v8::Object> data_point = data_point_value->ToObject();
+      if (j == 0 && !intent_->blob_file.empty()) {

[groby-ooo-7-16, 2012/10/05 17:56:35]

This seems odd in here. Can we actually have blob data _and_ mime_data.GetSize()
> 1?

[Greg Billock, 2012/10/05 22:03:26]

Yes. It's just a struct. I'm not sure how else to do this for, say, RSS. We
can't put the blob into the ListValue itself, it won't fit. Any better ideas?

On 2012/10/05 17:56:35, groby wrote:

+        // If we are carrying blob data, convert it to v8 format
+        // and set it to the "blob" property of |data_point|.
+        web_blob_ = WebBlob::createFromFile(
+            WebString::fromUTF8(intent_->blob_file.AsUTF8Unsafe()),
+            intent_->blob_length);
+        v8::Local<v8::String> blob_v8_key = v8::String::New("blob", 4);
+        data_point->Set(blob_v8_key, web_blob_.toV8Value());
+      }
+      dataV8->Set(j, data_point);
+    }
+
+    WebSerializedScriptValue serialized_data =
+        WebSerializedScriptValue::serialize(dataV8);
+    web_intent = WebIntent::create(intent_->action, intent_->type,

[groby-ooo-7-16, 2012/10/05 17:56:35]

Can we take the last two lines out of all the separate branches?

(I'd also feel more comfortable if the conversion routines were separate helpers
that just returned a web_intent -> much better testability)

[Greg Billock, 2012/10/05 22:03:26]

Good point. Will do.

On 2012/10/05 17:56:35, groby wrote:

+                                   serialized_data.toString(),
+                                   extras_keys, extras_values);
   } else {
     NOTREACHED();
   }
 
   if (!web_intent.action().isEmpty())
     frame->deliverIntent(web_intent, NULL, delivered_intent_client_.get());
 }