diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/platform/gtk/DragDataGtk.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/platform/gtk/DragDataGtk.cpp')
| -rw-r--r-- | Source/WebCore/platform/gtk/DragDataGtk.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/WebCore/platform/gtk/DragDataGtk.cpp b/Source/WebCore/platform/gtk/DragDataGtk.cpp index 42ddb16..3a1daf1 100644 --- a/Source/WebCore/platform/gtk/DragDataGtk.cpp +++ b/Source/WebCore/platform/gtk/DragDataGtk.cpp @@ -21,6 +21,7 @@ #include "ClipboardGtk.h" #include "Document.h" #include "DocumentFragment.h" +#include "Frame.h" #include "markup.h" namespace WebCore { @@ -50,7 +51,7 @@ bool DragData::containsPlainText() const return m_platformDragData->hasText(); } -String DragData::asPlainText() const +String DragData::asPlainText(Frame*) const { return m_platformDragData->text(); } @@ -62,15 +63,15 @@ Color DragData::asColor() const bool DragData::containsCompatibleContent() const { - return containsPlainText() || containsURL() || m_platformDragData->hasMarkup() || containsColor() || containsFiles(); + return containsPlainText() || containsURL(0) || m_platformDragData->hasMarkup() || containsColor() || containsFiles(); } -bool DragData::containsURL(FilenameConversionPolicy filenamePolicy) const +bool DragData::containsURL(Frame*, FilenameConversionPolicy filenamePolicy) const { return m_platformDragData->hasURL(); } -String DragData::asURL(FilenameConversionPolicy filenamePolicy, String* title) const +String DragData::asURL(Frame*, FilenameConversionPolicy filenamePolicy, String* title) const { String url(m_platformDragData->url()); if (title) @@ -79,12 +80,12 @@ String DragData::asURL(FilenameConversionPolicy filenamePolicy, String* title) c } -PassRefPtr<DocumentFragment> DragData::asFragment(Document* document) const +PassRefPtr<DocumentFragment> DragData::asFragment(Frame* frame, PassRefPtr<Range>, bool, bool&) const { if (!m_platformDragData->hasMarkup()) return 0; - return createFragmentFromMarkup(document, m_platformDragData->markup(), ""); + return createFragmentFromMarkup(frame->document(), m_platformDragData->markup(), ""); } } |