Changeset 76039 in webkit

Timestamp:

Jan 18, 2011 11:06:10 AM (13 years ago)

Author:

Martin Robinson

Message:

2011-01-18 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Eric Seidel.

[GTK] Filenames are converted to URLs during edit drags
​https://bugs.webkit.org/show_bug.cgi?id=52096

• platform/gtk/Skipped: Unskip passing test. Fix a misspelled drag and drop test on the list as well.

2011-01-18 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Eric Seidel.

[GTK] Filenames are converted to URLs during edit drags
​https://bugs.webkit.org/show_bug.cgi?id=52096

• platform/gtk/DragDataGtk.cpp: Only advertise and deliver filenames as URLs if the conversion policy allows it. (WebCore::DragData::containsURL): Ditto. (WebCore::DragData::asURL): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/gtk/DragDataGtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-18  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Filenames are converted to URLs during edit drags
+        https://bugs.webkit.org/show_bug.cgi?id=52096
+
+        * platform/gtk/Skipped: Unskip passing test. Fix a misspelled
+        drag and drop test on the list as well.
+
 2011-01-18  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5339 +5339 @@
 http/tests/local/formdata/upload-events.html
 fast/files/workers/worker-apply-blob-url-to-xhr.html
-fast/files/apply-blob-url-to-xhr.htm
+fast/files/apply-blob-url-to-xhr.html
 
 # [Soup] ResourceHandleSoup does not handle encodedBlobData
@@ -5351 +5351 @@
 # https://bugs.webkit.org/show_bug.cgi?id=52094
 editing/pasteboard/files-during-page-drags.html
-
-# [GTK] Filenames are converted to URLs during edit drags
-# https://bugs.webkit.org/show_bug.cgi?id=52096
-editing/pasteboard/file-drag-to-editable.html
 
 # The feature was disabled due to a compatibility issue.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-18  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Filenames are converted to URLs during edit drags
+        https://bugs.webkit.org/show_bug.cgi?id=52096
+
+        * platform/gtk/DragDataGtk.cpp: Only advertise and deliver filenames as URLs if the
+        conversion policy allows it.
+        (WebCore::DragData::containsURL): Ditto.
+        (WebCore::DragData::asURL): Ditto.
+
 2011-01-18  Helder Correia  <helder@sencha.com>
 

trunk/Source/WebCore/platform/gtk/DragDataGtk.cpp

@@ -67 +67 @@
 }
 
-bool DragData::containsURL(Frame*, FilenameConversionPolicy filenamePolicy) const
+bool DragData::containsURL(Frame* frame, FilenameConversionPolicy filenamePolicy) const
 {
-    return m_platformDragData->hasURL();
+    return !asURL(frame, filenamePolicy).isEmpty();
 }
 
 String DragData::asURL(Frame*, FilenameConversionPolicy filenamePolicy, String* title) const
 {
+    if (!m_platformDragData->hasURL())
+        return String();
+    if (filenamePolicy != ConvertFilenames) {
+        KURL url(KURL(), m_platformDragData->url());
+        if (url.isLocalFile())
+            return String();
+    }
+
     String url(m_platformDragData->url());
     if (title)