diff options
Diffstat (limited to 'WebCore/platform/gtk/PasteboardGtk.cpp')
| -rw-r--r-- | WebCore/platform/gtk/PasteboardGtk.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/WebCore/platform/gtk/PasteboardGtk.cpp b/WebCore/platform/gtk/PasteboardGtk.cpp index 062ecb8..9f72923 100644 --- a/WebCore/platform/gtk/PasteboardGtk.cpp +++ b/WebCore/platform/gtk/PasteboardGtk.cpp @@ -25,6 +25,7 @@ #include "Frame.h" #include "NotImplemented.h" #include "PlatformString.h" +#include "TextResourceDecoder.h" #include "Image.h" #include "RenderImage.h" #include "KURL.h" @@ -130,8 +131,8 @@ void Pasteboard::writeImage(Node* node, const KURL&, const String&) GtkClipboard* clipboard = gtk_clipboard_get_for_display(gdk_display_get_default(), GDK_SELECTION_CLIPBOARD); ASSERT(node && node->renderer() && node->renderer()->isImage()); - RenderImage* renderer = static_cast<RenderImage*>(node->renderer()); - CachedImage* cachedImage = static_cast<CachedImage*>(renderer->cachedImage()); + RenderImage* renderer = toRenderImage(node->renderer()); + CachedImage* cachedImage = renderer->cachedImage(); ASSERT(cachedImage); Image* image = cachedImage->image(); ASSERT(image); @@ -163,7 +164,9 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP if (GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard, textHtml)) { ASSERT(data->data); - String html = String::fromUTF8(reinterpret_cast<gchar*>(data->data), data->length * data->format / 8); + RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("text/plain", "UTF-8", true); + String html = decoder->decode(reinterpret_cast<char*>(data->data), data->length); + html += decoder->flush(); gtk_selection_data_free(data); if (!html.isEmpty()) { |