Add glue for supporting custom MIME types in DataTransfer.

webkit/glue/webdropdata.cc

 // Copyright (c) 2006-2008 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/webdropdata.h"
 
+#include <utility>
+
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 
 using WebKit::WebData;
 using WebKit::WebDragData;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 WebDropData::WebDropData(const WebDragData& drag_data)
     : url(drag_data.url()),
       url_title(drag_data.urlTitle()),
       download_metadata(drag_data.downloadMetadata()),
       file_extension(drag_data.fileExtension()),
       plain_text(drag_data.plainText()),
       text_html(drag_data.htmlText()),
       html_base_url(drag_data.htmlBaseURL()),
       file_description_filename(drag_data.fileContentFilename()) {
   if (drag_data.containsFilenames()) {
     WebVector<WebString> filenames_copy;
     drag_data.filenames(filenames_copy);
     for (size_t i = 0; i < filenames_copy.size(); ++i)
       filenames.push_back(filenames_copy[i]);
   }
   WebData contents = drag_data.fileContent();
   if (!contents.isEmpty())
     file_contents.assign(contents.data(), contents.size());
+  WebVector<WebDragData::CustomData> custom_data_copy = drag_data.customData();
+  for (size_t i = 0; i < custom_data_copy.size(); ++i)

[tony, 2011/12/02 00:13:29]

Nit: The for loop should use {} since the body is 2 lines.

[dcheng, 2011/12/02 00:29:17]

Done.

+    custom_data.insert(std::make_pair(custom_data_copy[i].m_type,
+                                      custom_data_copy[i].m_data));
 }
 
 WebDropData::WebDropData() {
 }
 
 WebDropData::~WebDropData() {
 }
 
 WebDragData WebDropData::ToDragData() const {
   WebDragData result;
   result.initialize();
   result.setURL(url);
   result.setURLTitle(url_title);
   result.setFileExtension(file_extension);
   result.setFilenames(filenames);
   result.setPlainText(plain_text);
   result.setHTMLText(text_html);
   result.setHTMLBaseURL(html_base_url);
   result.setFileContentFilename(file_description_filename);
   result.setFileContent(WebData(file_contents.data(), file_contents.size()));
+  WebVector<WebDragData::CustomData> custom_data_vector(custom_data.size());
+  size_t i = 0;
+  for (std::map<string16, string16>::const_iterator it = custom_data.begin();
+       it != custom_data.end();
+       ++it) {
+    WebDragData::CustomData data = {it->first, it->second};
+    custom_data_vector[i++] = data;

[tony, 2011/12/02 00:13:29]

Nit: I think it's a bit easier to read with i as part of the for loop (e.g.,:
++it, ++i).

[dcheng, 2011/12/02 00:29:17]

Done.

+  }
   return result;
 }