Changeset 58276 in webkit

Timestamp:

Apr 26, 2010 6:32:44 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-26 Daniel Cheng <​dcheng@chromium.org>

Reviewed by Jian Li.

[Chromium] Don't make file paths available in text/uri-list when dragging files.
​https://bugs.webkit.org/show_bug.cgi?id=25882

Test will be checked in with WebCore/platform/mac fix.

• platform/chromium/ClipboardChromium.cpp: (WebCore::ClipboardChromium::getData): (WebCore::ClipboardChromium::types):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ClipboardChromium.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-26  Daniel Cheng  <dcheng@chromium.org>
+
+        Reviewed by Jian Li.
+
+        [Chromium] Don't make file paths available in text/uri-list when dragging files.
+        https://bugs.webkit.org/show_bug.cgi?id=25882
+
+        Test will be checked in with WebCore/platform/mac fix.
+
+        * platform/chromium/ClipboardChromium.cpp:
+        (WebCore::ClipboardChromium::getData):
+        (WebCore::ClipboardChromium::types):
+
 2010-04-26  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/platform/chromium/ClipboardChromium.cpp

@@ -174 +174 @@
                 text.append(uri);
             }
-            // Also create file:// URLs out of the entries in the file list.
-            for (size_t i = 0; i < m_dataObject->filenames.size(); ++i) {
-                String fileURL = ChromiumBridge::filePathToURL(m_dataObject->filenames[i]);
-                ASSERT(!fileURL.isEmpty());
-                if (!text.isEmpty())
-                    text.append(textMIMETypeLineSeparator);
-                text.append(fileURL);
-            }
             success = !text.isEmpty();
             return text;
@@ -192 +184 @@
             success = true;
             return m_dataObject->url.string();
-        }
-        // Otherwise check if we have a file that we could convert to a file:// URL.
-        if (!m_dataObject->filenames.isEmpty()) {
-            success = true;
-            return ChromiumBridge::filePathToURL(m_dataObject->filenames[0]);
         }
         return String();
@@ -327 +314 @@
         return results;
 
-    if (!m_dataObject->filenames.isEmpty()) {
-        results.add("text/uri-list");
+    if (!m_dataObject->filenames.isEmpty())
         results.add("Files");
-    }
 
     if (m_dataObject->url.isValid()) {