Changeset 64852 in webkit

Timestamp:

Aug 6, 2010 8:59:55 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-08-06 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Support for image drags
​https://bugs.webkit.org/show_bug.cgi?id=40788

Unskip and add baselines for tests that are now passing with image drag support.

• platform/gtk/Skipped:
• platform/gtk/editing/pasteboard/drag-image-to-contenteditable-in-iframe-expected.txt: Added.
• platform/gtk/editing/pasteboard/drag-selected-image-to-contenteditable-expected.txt: Added.
• platform/gtk/editing/selection/drag-to-contenteditable-iframe-expected.txt: Added.
• platform/gtk/fast/events/standalone-image-drag-to-editable-expected.txt: Added.

2010-08-06 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Support for image drags
​https://bugs.webkit.org/show_bug.cgi?id=40788

Add image drag-and-drop support for WebKit GTK+.

• platform/gtk/ClipboardGtk.cpp: (WebCore::ClipboardGtk::setDragImage): Filled this stub. (WebCore::ClipboardGtk::setDragImageElement): Filled this stub. (WebCore::ClipboardGtk::createDragImage): Filled this stub. (WebCore::ClipboardGtk::declareAndWriteDragImage): Write the image URL, markup, and image itself to the data object member.
• platform/gtk/ClipboardGtk.h: Brought method declarations into line with the parent class.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/gtk/editing/pasteboard/drag-image-to-contenteditable-in-iframe-expected.txt (added)
• LayoutTests/platform/gtk/editing/pasteboard/drag-selected-image-to-contenteditable-expected.txt (added)
• LayoutTests/platform/gtk/editing/selection/drag-to-contenteditable-iframe-expected.txt (added)
• LayoutTests/platform/gtk/fast/events/standalone-image-drag-to-editable-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/ClipboardGtk.cpp (modified) (3 diffs)
• WebCore/platform/gtk/ClipboardGtk.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Support for image drags
+        https://bugs.webkit.org/show_bug.cgi?id=40788
+
+        Unskip and add baselines for tests that are now passing with image drag support.
+
+        * platform/gtk/Skipped:
+        * platform/gtk/editing/pasteboard/drag-image-to-contenteditable-in-iframe-expected.txt: Added.
+        * platform/gtk/editing/pasteboard/drag-selected-image-to-contenteditable-expected.txt: Added.
+        * platform/gtk/editing/selection/drag-to-contenteditable-iframe-expected.txt: Added.
+        * platform/gtk/fast/events/standalone-image-drag-to-editable-expected.txt: Added.
+
 2010-08-06  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5828 +5828 @@
 http/tests/security/clipboard/clipboard-file-access.html
 
-# Tests that fail because image dragging does not yet work
-editing/pasteboard/drag-image-in-about-blank-frame.html
-editing/pasteboard/drag-image-to-contenteditable-in-iframe.html
-editing/pasteboard/drag-selected-image-to-contenteditable.html
-editing/selection/drag-to-contenteditable-iframe.html
-fast/events/standalone-image-drag-to-editable.html
-editing/pasteboard/drag-drop-iframe-refresh-crash.html
+# Still failing, looks like a bug in the EventSender drag-and-drop
 fast/css/user-drag-none.html
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Support for image drags
+        https://bugs.webkit.org/show_bug.cgi?id=40788
+
+        Add image drag-and-drop support for WebKit GTK+.
+
+        * platform/gtk/ClipboardGtk.cpp:
+        (WebCore::ClipboardGtk::setDragImage): Filled this stub.
+        (WebCore::ClipboardGtk::setDragImageElement): Filled this stub.
+        (WebCore::ClipboardGtk::createDragImage): Filled this stub.
+        (WebCore::ClipboardGtk::declareAndWriteDragImage): Write the image URL, markup, and image itself to the data object member.
+        * platform/gtk/ClipboardGtk.h: Brought method declarations into line with the parent class.
+
 2010-08-06  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/platform/gtk/ClipboardGtk.cpp

@@ -24 +24 @@
 #include "FileList.h"
 #include "Frame.h"
+#include "HTMLNames.h"
 #include "Image.h"
 #include "NotImplemented.h"
@@ -272 +273 @@
 }
 
-IntPoint ClipboardGtk::dragLocation() const
-{
-    notImplemented();
-    return IntPoint(0, 0);
-}
-
-CachedImage* ClipboardGtk::dragImage() const
-{
-    notImplemented();
-    return 0;
-}
-
-void ClipboardGtk::setDragImage(CachedImage*, const IntPoint&)
-{
-    notImplemented();
-}
-
-Node* ClipboardGtk::dragImageElement()
-{
-    notImplemented();
-    return 0;
-}
-
-void ClipboardGtk::setDragImageElement(Node*, const IntPoint&)
-{
-    notImplemented();
-}
-
-DragImageRef ClipboardGtk::createDragImage(IntPoint&) const
-{
-    notImplemented();
-    return 0;
+void ClipboardGtk::setDragImage(CachedImage* image, const IntPoint& location)
+{
+    setDragImage(image, 0, location);
+}
+
+void ClipboardGtk::setDragImageElement(Node* element, const IntPoint& location)
+{
+    setDragImage(0, element, location);
+}
+
+void ClipboardGtk::setDragImage(CachedImage* image, Node* element, const IntPoint& location)
+{
+    if (policy() != ClipboardImageWritable && policy() != ClipboardWritable)
+        return;
+
+    if (m_dragImage)
+        m_dragImage->removeClient(this);
+    m_dragImage = image;
+    if (m_dragImage)
+        m_dragImage->addClient(this);
+
+    m_dragLoc = location;
+    m_dragImageElement = element;
+}
+
+DragImageRef ClipboardGtk::createDragImage(IntPoint& location) const
+{
+    location = m_dragLoc;
+    if (!m_dragImage)
+        return 0;
+
+    return createDragImageFromImage(m_dragImage->image());
 }
 
@@ -321 +322 @@
 }
 
-void ClipboardGtk::declareAndWriteDragImage(Element* element, const KURL& url, const String& label, Frame*)
-{
-    CachedImage* cachedImage = getCachedImage(element);
-    if (!cachedImage || !cachedImage->isLoaded())
-        return;
-
-    GdkPixbuf* pixbuf = cachedImage->image()->getGdkPixbuf();
+void ClipboardGtk::declareAndWriteDragImage(Element* element, const KURL& url, const String& label, Frame* frame)
+{
+    m_dataObject->setURL(url, label);
+    m_dataObject->setMarkup(createMarkup(element, IncludeNode, 0, AbsoluteURLs));
+
+    CachedImage* image = getCachedImage(element);
+    if (!image || !image->isLoaded())
+        return;
+
+    GRefPtr<GdkPixbuf> pixbuf = adoptGRef(image->image()->getGdkPixbuf());
     if (!pixbuf)
         return;
 
-    GtkClipboard* imageClipboard = gtk_clipboard_get(gdk_atom_intern_static_string("WebKitClipboardImage"));
-    gtk_clipboard_clear(imageClipboard);
-
-    gtk_clipboard_set_image(imageClipboard, pixbuf);
-    g_object_unref(pixbuf);
-
-    writeURL(url, label, 0);
+    m_dataObject->setImage(pixbuf.get());
 }
 

trunk/WebCore/platform/gtk/ClipboardGtk.h

@@ -28 +28 @@
 #define ClipboardGtk_h
 
+#include "CachedResourceClient.h"
 #include "Clipboard.h"
 #include "DataObjectGtk.h"
@@ -40 +41 @@
     // State available during IE's events for drag and drop and copy/paste
     // Created from the EventHandlerGtk to be used by the dom
-    class ClipboardGtk : public Clipboard {
+    class ClipboardGtk : public Clipboard, public CachedResourceClient {
     public:
         static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, GtkClipboard* clipboard, bool isForDragging, Frame* frame)
@@ -61 +62 @@
         virtual PassRefPtr<FileList> files() const;
 
-        IntPoint dragLocation() const;
-        CachedImage* dragImage() const;
         void setDragImage(CachedImage*, const IntPoint&);
-        Node* dragImageElement();
         void setDragImageElement(Node*, const IntPoint&);
+        void setDragImage(CachedImage*, Node*, const IntPoint&);
 
         virtual DragImageRef createDragImage(IntPoint&) const;
+#if ENABLE(DRAG_SUPPORT)
         virtual void declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*);
+#endif
         virtual void writeURL(const KURL&, const String&, Frame*);
         virtual void writeRange(Range*, Frame*);