Add constructor to get extras, service, ports from WebIntent object.

webkit/glue/web_intent_data.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/glue/web_intent_data.h"
 
+#include "content/common/webmessageportchannel_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 
 namespace webkit_glue {
 
 WebIntentData::WebIntentData()
     : blob_length(0),
       data_type(SERIALIZED) {
 }
 
 WebIntentData::~WebIntentData() {
 }
 
 WebIntentData::WebIntentData(const WebKit::WebIntent& intent)
     : action(intent.action()),
       type(intent.type()),
       data(intent.data()),
+      service(intent.service()),
       blob_length(0),
       data_type(SERIALIZED) {
+  WebKit::WebVector<WebKit::WebString> names = intent.extrasNames();

[darin (slow to review), 2012/04/30 18:31:25]

it would help to get someone more familiar with MessagePortChannel to comment on
this code.  atwilson@ perhaps?

[Greg Billock, 2012/04/30 23:09:34]

Sounds good. Should I split this off for separate review? I'd like to get the
explicit intent parameters in to unblock chromium OS ECHO progress. Does that
look good to go? The port ID stuff I am basically lifting from existing code;
I'm much less sure about it.

+  for (size_t i = 0; i < names.size(); ++i) {
+    extra_data[names[i]] = intent.extrasValue(names[i]);
+  }
+
+  // See WebMessagePortChannelImpl::postMessage() and ::OnMessagedQueued()
+  WebKit::WebMessagePortChannelArray* channels =
+      intent.messagePortChannelsRelease();
+  if (channels) {
+    for (size_t i = 0; i < channels->size(); ++i) {
+      WebMessagePortChannelImpl* webchannel =
+          static_cast<WebMessagePortChannelImpl*>((*channels)[i]);
+      message_port_ids.push_back(webchannel->message_port_id());
+      webchannel->QueueMessages();   // needed?

[jam, 2012/05/01 19:00:48]

I don't quite remember why we needed this (it's been a few years). If you're not
sure why you need it, don't add it.

+      DCHECK(message_port_ids[i] != MSG_ROUTING_NONE);
+    }
+    delete channels;
+  }
 }
 
 WebIntentData::WebIntentData(const string16& action_in,
                              const string16& type_in,
                              const string16& unserialized_data_in)
     : action(action_in),
       type(type_in),
       unserialized_data(unserialized_data_in),
       blob_length(0),
       data_type(UNSERIALIZED) {
 }
 
 WebIntentData::WebIntentData(const string16& action_in,
                              const string16& type_in,
                              const FilePath& blob_file_in,
                              int64 blob_length_in)
     : action(action_in),
       type(type_in),
       blob_file(blob_file_in),
       blob_length(blob_length_in),
       data_type(BLOB) {
 }
 
 }  // namespace webkit_glue