[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mrobinson at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit d418a3a16a6bd22f245d1388375f78c72638d5d0
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 19:06:10 2011 +0000

    2011-01-18  Martin Robinson  <mrobinson at 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 at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76039 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bb5ca2b..ca1361e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-18  Martin Robinson  <mrobinson at 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 at chromium.org>
 
         [Chromium] Create baselines for svg/css/text-gradient-shadow.svg
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 7114f2b..1e50e3d 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5338,7 +5338,7 @@ editing/pasteboard/drop-link.html
 # https://bugs.webkit.org/show_bug.cgi?id=52090
 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
 # https://bugs.webkit.org/show_bug.cgi?id=52092
@@ -5351,10 +5351,6 @@ http/tests/local/formdata/send-form-data-with-sliced-file.html
 # 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.
 # https://bugs.webkit.org/show_bug.cgi?id=40520
 fast/forms/interactive-validation-lost-focusable.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a15a746..a8fd896 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-18  Martin Robinson  <mrobinson at 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 at sencha.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/Source/WebCore/platform/gtk/DragDataGtk.cpp b/Source/WebCore/platform/gtk/DragDataGtk.cpp
index 3a1daf1..cc9a208 100644
--- a/Source/WebCore/platform/gtk/DragDataGtk.cpp
+++ b/Source/WebCore/platform/gtk/DragDataGtk.cpp
@@ -66,13 +66,21 @@ bool DragData::containsCompatibleContent() const
     return containsPlainText() || containsURL(0) || m_platformDragData->hasMarkup() || containsColor() || containsFiles();
 }
 
-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)
         *title = m_platformDragData->urlLabel();

-- 
WebKit Debian packaging