summaryrefslogtreecommitdiffstats
path: root/webkit/port/platform/chromium/DragDataChromium.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/port/platform/chromium/DragDataChromium.cpp')
-rw-r--r--webkit/port/platform/chromium/DragDataChromium.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/webkit/port/platform/chromium/DragDataChromium.cpp b/webkit/port/platform/chromium/DragDataChromium.cpp
index 3507739..d615559 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