diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/platform/gtk/ClipboardGtk.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/platform/gtk/ClipboardGtk.cpp')
| -rw-r--r-- | WebCore/platform/gtk/ClipboardGtk.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/WebCore/platform/gtk/ClipboardGtk.cpp b/WebCore/platform/gtk/ClipboardGtk.cpp index ad1c665..924fabc 100644 --- a/WebCore/platform/gtk/ClipboardGtk.cpp +++ b/WebCore/platform/gtk/ClipboardGtk.cpp @@ -331,23 +331,7 @@ void ClipboardGtk::declareAndWriteDragImage(Element* element, const KURL& url, c void ClipboardGtk::writeURL(const KURL& url, const String& label, Frame*) { - String actualLabel(label); - if (actualLabel.isEmpty()) - actualLabel = url; - m_dataObject->setText(actualLabel); - - Vector<UChar> markup; - append(markup, "<a href=\""); - append(markup, url.string()); - append(markup, "\">"); - append(markup, label); - append(markup, "</a>"); - m_dataObject->setMarkup(String::adopt(markup)); - - Vector<KURL> uriList; - uriList.append(url); - m_dataObject->setURIList(uriList); - + m_dataObject->setURL(url, label); if (m_clipboard) m_helper->writeClipboardContents(m_clipboard); } @@ -357,7 +341,7 @@ void ClipboardGtk::writeRange(Range* range, Frame* frame) ASSERT(range); m_dataObject->setText(frame->selectedText()); - m_dataObject->setMarkup(createMarkup(range, 0, AnnotateForInterchange)); + m_dataObject->setMarkup(createMarkup(range, 0, AnnotateForInterchange, false, AbsoluteURLs)); if (m_clipboard) m_helper->writeClipboardContents(m_clipboard); |