Remove cf_html from webdropdata.h. This is windows

specific code so we should handle it before we get
to webkit.

CF_HTML needs the source URL to resolve relative URLs
so I added that to the format and plumb it through
from webcore.

I also did some small refactoring so we only have one
implementation of converting to/from CF_HTML and regular
markup.  We can tweak these converters (and add unit tests)
in follow up changes.

Review URL: http://codereview.chromium.org/11247

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5662 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 7 deletions

diff --git a/webkit/glue/webdropdata.h b/webkit/glue/webdropdata.h
index 38d67b4..e6d51f4 100644
--- a/webkit/glue/webdropdata.h
+++ b/webkit/glue/webdropdata.h
@@ -26,14 +26,11 @@ struct WebDropData {
   // User is dragging plain text into the webview.
   std::wstring plain_text;
 
-  // User is dragging MS HTML into the webview (e.g., out of IE).
-  // TODO(tc): We should remove this from webdropdata because not all platforms
-  // have cf_html. On the browser side, we should do the necessary conversions
-  // so we still support cf_html.
-  std::wstring cf_html;
-
-  // User is dragging text/html into the webview (e.g., out of Firefox).
+  // User is dragging text/html into the webview (e.g., out of Firefox). 
+  // |html_base_url| is the URL that the html fragment is taken from (used to
+  // resolve relative links).  It's ok for |html_base_url| to be empty.
   std::wstring text_html;
+  GURL html_base_url;
 
   // User is dragging data from the webview (e.g., an image).
   std::wstring file_description_filename;