Index: webkit/port/platform/chromium/DragDataChromium.cpp |
diff --git a/webkit/port/platform/chromium/DragDataChromium.cpp b/webkit/port/platform/chromium/DragDataChromium.cpp |
index 35077393f86da2fc4d2f808fce5376ea8aec0f92..d615559f63aaa8cc97a1e9341db42f7da7cb09c9 100644 |
--- a/webkit/port/platform/chromium/DragDataChromium.cpp |
+++ b/webkit/port/platform/chromium/DragDataChromium.cpp |
@@ -126,21 +126,21 @@ PassRefPtr<DocumentFragment> DragData::asFragment(Document* doc) const |
* * PICT |
*/ |
- // TODO(tc): Disabled because containsFilenames is hardcoded to return |
- // false. We need to implement fragmentFromFilenames when this is |
- // re-enabled in Apple's win port. |
- //if (containsFilenames()) |
- // if (PassRefPtr<DocumentFragment> fragment = fragmentFromFilenames(doc, m_platformDragData)) |
- // return fragment; |
- |
- if (!m_platformDragData->text_html.isEmpty()) { |
- String url; |
- RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(doc, |
- m_platformDragData->text_html, url); |
- return fragment; |
- } |
- |
- return 0; |
+ if (containsFiles()) { |
+ // TODO(tc): Implement this. Should be pretty simple to make some HTML |
+ // and call createFragmentFromMarkup. |
+ //if (RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(doc, |
+ // ?, KURL())) |
+ // return fragment; |
+ } |
+ |
+ if (!m_platformDragData->text_html.isEmpty()) { |
+ RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(doc, |
+ m_platformDragData->text_html, m_platformDragData->html_base_url); |
+ return fragment.release(); |
+ } |
+ |
+ return 0; |
} |
Color DragData::asColor() const |