Commit d418a3a1 authored by mrobinson@webkit.org's avatar mrobinson@webkit.org
Browse files

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76039 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9b84d5f3
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>
 
[Chromium] Create baselines for svg/css/text-gradient-shadow.svg
......
......@@ -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
......
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>
 
Reviewed by Kenneth Rohde Christiansen.
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment