Changeset 212428 in webkit

Timestamp:

Feb 16, 2017 4:08:53 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Images are never read from the clipboard
​https://bugs.webkit.org/show_bug.cgi?id=168419

Reviewed by Sergio Villar Senin.

We write images in the clipboard, but we don't read them.

Fixes: editing/pasteboard/paste-image-using-image-data.html

• editing/Editor.cpp:

(WebCore::Editor::createFragmentForImageAndURL): Moved from EditorMac.mm since it's cross-platform code.

• editing/Editor.h:
• editing/gtk/EditorGtk.cpp:

(WebCore::createFragmentFromPasteboardData): Check if there's an image in the selection, and use
Editor::createFragmentForImageAndURL in that case.

• editing/mac/EditorMac.mm:

(WebCore::Editor::createFragmentForImageAndURL): Deleted.

• platform/gtk/PasteboardHelper.cpp:

(WebCore::PasteboardHelper::getClipboardContents): Check also if there's an image in the clipboard.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/Editor.h (modified) (2 diffs)
• editing/gtk/EditorGtk.cpp (modified) (2 diffs)
• editing/mac/EditorMac.mm (modified) (1 diff)
• platform/gtk/PasteboardHelper.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Images are never read from the clipboard
+        https://bugs.webkit.org/show_bug.cgi?id=168419
+
+        Reviewed by Sergio Villar Senin.
+
+        We write images in the clipboard, but we don't read them.
+
+        Fixes: editing/pasteboard/paste-image-using-image-data.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::createFragmentForImageAndURL): Moved from EditorMac.mm since it's cross-platform code.
+        * editing/Editor.h:
+        * editing/gtk/EditorGtk.cpp:
+        (WebCore::createFragmentFromPasteboardData): Check if there's an image in the selection, and use
+        Editor::createFragmentForImageAndURL in that case.
+        * editing/mac/EditorMac.mm:
+        (WebCore::Editor::createFragmentForImageAndURL): Deleted.
+        * platform/gtk/PasteboardHelper.cpp:
+        (WebCore::PasteboardHelper::getClipboardContents): Check also if there's an image in the clipboard.
+
 2017-02-15  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -3741 +3741 @@
 }
 
+Ref<DocumentFragment> Editor::createFragmentForImageAndURL(const String& url)
+{
+    auto imageElement = HTMLImageElement::create(*m_frame.document());
+    imageElement->setAttributeWithoutSynchronization(HTMLNames::srcAttr, url);
+
+    auto fragment = document().createDocumentFragment();
+    fragment->appendChild(imageElement);
+
+    return fragment;
+}
 
 } // namespace WebCore

trunk/Source/WebCore/editing/Editor.h

@@ -484 +484 @@
     bool isGettingDictionaryPopupInfo() const { return m_isGettingDictionaryPopupInfo; }
 
+    Ref<DocumentFragment> createFragmentForImageAndURL(const String&);
+
 private:
     class WebContentReader;
@@ -523 +525 @@
     RefPtr<SharedBuffer> imageInWebArchiveFormat(Element&);
     RefPtr<DocumentFragment> createFragmentForImageResourceAndAddResource(RefPtr<ArchiveResource>&&);
-    Ref<DocumentFragment> createFragmentForImageAndURL(const String&);
     RefPtr<DocumentFragment> createFragmentAndAddResources(NSAttributedString *);
     FragmentAndResources createFragment(NSAttributedString *);

trunk/Source/WebCore/editing/gtk/EditorGtk.cpp

@@ -28 +28 @@
 #include "Editor.h"
 
+#include "Blob.h"
 #include "CachedImage.h"
+#include "DOMURL.h"
 #include "DocumentFragment.h"
 #include "Frame.h"
@@ -55 +57 @@
 
     const auto& selection = pasteboard.selectionData();
+    if (selection.hasImage()) {
+        Vector<uint8_t> buffer;
+        auto status = cairo_surface_write_to_png_stream(selection.image()->nativeImage().get(), [](void* output, const unsigned char* data, unsigned size) {
+            if (!reinterpret_cast<Vector<uint8_t>*>(output)->tryAppend(data, size))
+                return CAIRO_STATUS_WRITE_ERROR;
+            return CAIRO_STATUS_SUCCESS;
+        }, &buffer);
+        if (status == CAIRO_STATUS_SUCCESS) {
+            auto blob = Blob::create(WTFMove(buffer), "image/png");
+            return frame.editor().createFragmentForImageAndURL(DOMURL::createObjectURL(*frame.document(), blob));
+        }
+    }
+
     if (selection.hasMarkup() && frame.document())
         return createFragmentFromMarkup(*frame.document(), selection.markup(), emptyString(), DisallowScriptingAndPluginContent);

trunk/Source/WebCore/editing/mac/EditorMac.mm

@@ -487 +487 @@
 }
 
-Ref<DocumentFragment> Editor::createFragmentForImageAndURL(const String& url)
-{
-    auto imageElement = HTMLImageElement::create(*m_frame.document());
-    imageElement->setAttributeWithoutSynchronization(HTMLNames::srcAttr, url);
-
-    auto fragment = document().createDocumentFragment();
-    fragment->appendChild(imageElement);
-
-    return fragment;
-}
-
 void Editor::applyFontStyles(const String& fontFamily, double fontSize, unsigned fontTraits)
 {

trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp

@@ -24 +24 @@
 #include "PasteboardHelper.h"
 
+#include "BitmapImage.h"
 #include "GtkVersioning.h"
 #include "SelectionData.h"
@@ -113 +114 @@
         }
     }
+
+#ifndef GTK_API_VERSION_2
+    if (gtk_clipboard_wait_is_image_available(clipboard)) {
+        if (GRefPtr<GdkPixbuf> pixbuf = adoptGRef(gtk_clipboard_wait_for_image(clipboard))) {
+            RefPtr<cairo_surface_t> surface = adoptRef(gdk_cairo_surface_create_from_pixbuf(pixbuf.get(), 1, nullptr));
+            Ref<Image> image = BitmapImage::create(WTFMove(surface));
+            selection.setImage(image.ptr());
+        }
+    }
+#endif
 
     selection.setCanSmartReplace(gtk_clipboard_wait_is_target_available(clipboard, smartPasteAtom));