Pass content-type resources to web intents. Goes through download, then invokes the p…

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 "content/common/intents_messages.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/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 #include "v8/include/v8.h"
 #include "webkit/glue/cpp_bound_class.h"
 
 using WebKit::WebBindings;
+using WebKit::WebBlob;
 using WebKit::WebCString;
 using WebKit::WebFrame;
 using WebKit::WebIntentRequest;
 using WebKit::WebString;
 using WebKit::WebSerializedScriptValue;
 
 // This class encapsulates the API the Intent object will expose to Javascript.
 // It is made available to the Javascript runtime in the service page using
 // NPAPI methods as with plugin/Javascript interaction objects and other
 // browser-provided Javascript API objects on |window|.
 class WebIntentsHost::BoundDeliveredIntent : public CppBoundClass {
  public:
-  BoundDeliveredIntent(const string16& action,
-                       const string16& type,
-                       const string16& data,
+  BoundDeliveredIntent(const webkit_glue::WebIntentData& intent,
                        WebIntentsHost* parent,
                        WebFrame* frame) {
-    action_ = WebString(action).utf8();
-    type_ = WebString(type).utf8();
+    action_ = WebString(intent.action).utf8();
+    type_ = WebString(intent.type).utf8();
     parent_ = parent;
 
     v8::HandleScope scope;
     v8::Local<v8::Context> ctx = frame->mainWorldScriptContext();
     v8::Context::Scope cscope(ctx);
-    WebSerializedScriptValue ssv =
-        WebSerializedScriptValue::fromString(WebString(data));
-    // TODO(gbillock): use an exception handler instead? Need to
-    // pass back error state to caller? This is a pretty unexpected
-    // internal error...
-    CHECK(!ssv.isNull());
-    v8::Local<v8::Value> data_obj =
-        v8::Local<v8::Value>::New(ssv.deserialize());
+    v8::Local<v8::Value> data_obj;
+
+    if (intent.data_type == webkit_glue::WebIntentData::SERIALIZED) {
+      WebSerializedScriptValue ssv =
+          WebSerializedScriptValue::fromString(WebString(intent.data));
+      // TODO(gbillock): use an exception handler instead? Need to
+      // pass back error state to caller? This is a pretty unexpected
+      // internal error...
+      CHECK(!ssv.isNull());
+      data_obj = v8::Local<v8::Value>::New(ssv.deserialize());
+    } else if (intent.data_type == webkit_glue::WebIntentData::UNSERIALIZED) {
+      data_obj = v8::String::New(intent.unserialized_data.data(),
+                                 intent.unserialized_data.length());
+    } else {
+      CHECK(intent.data_type == webkit_glue::WebIntentData::BLOB);
+      WebBlob web_blob = WebBlob::createFromFile(intent.blob_url,

[michaeln, 2012/03/12 21:16:12]

i think this method is expecting a full file path as input, not a url

[Greg Billock, 2012/03/13 17:56:10]

Yeah, this was essentially because I didn't know what to pass exactly. Now I
know the right interface I'll switch this to the right naming.

I split off the internal dispatcher and some other changes from here, so I'm
going to get those committed and then merge this. I'll get the discussion going
in parallel about exactly what to do with requirements.

+                                                 intent.blob_length);
+      data_obj = v8::Local<v8::Value>::New(web_blob.toV8Value());
+    }
 
     data_val_.reset(new CppVariant);
     WebBindings::toNPVariant(data_obj, frame->windowObject(), data_val_.get());
 
     BindGetterCallback("action", base::Bind(&BoundDeliveredIntent::getAction,
                                             base::Unretained(this)));
     BindGetterCallback("type", base::Bind(&BoundDeliveredIntent::getType,
                                           base::Unretained(this)));
     BindGetterCallback("data", base::Bind(&BoundDeliveredIntent::getData,
                                           base::Unretained(this)));
@@ skipping 124 matching lines @@
 }
 
 // We set the intent payload into all top-level frame window objects. This
 // should persist the data through redirects, and not deliver it to any
 // sub-frames. TODO(gbillock): This policy needs to be fine-tuned and
 // documented.
 void WebIntentsHost::DidClearWindowObject(WebFrame* frame) {
   if (intent_.get() == NULL || frame->top() != frame)
     return;
 
-  delivered_intent_.reset(new BoundDeliveredIntent(
-      intent_->action, intent_->type, intent_->data, this, frame));
+  delivered_intent_.reset(
+      new BoundDeliveredIntent(*(intent_.get()), this, frame));
   delivered_intent_->BindToJavascript(frame, "intent");
 }