Changeset 45414 in webkit

Timestamp:

Jun 30, 2009 7:16:13 PM (15 years ago)

Author:

jmalonzo@webkit.org

Message:

2009-06-30 Zan Dobersek <​zandobersek@gmail.com>

Reviewed by Gustavo Noronha.

[GTK] Drag and drop support
​https://bugs.webkit.org/show_bug.cgi?id=23642

Define DragImageRef as GdkPixbuf and implement essential
functions which manipulate drag images.

• platform/DragImage.h:
• platform/gtk/DragImageGtk.cpp: (WebCore::dragImageSize): (WebCore::deleteDragImage): (WebCore::scaleDragImage): (WebCore::createDragImageFromImage):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/DragImage.h (modified) (2 diffs)
• platform/gtk/DragImageGtk.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-30  Zan Dobersek  <zandobersek@gmail.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] Drag and drop support
+        https://bugs.webkit.org/show_bug.cgi?id=23642
+
+        Define DragImageRef as GdkPixbuf and implement essential
+        functions which manipulate drag images.
+
+        * platform/DragImage.h:
+        * platform/gtk/DragImageGtk.cpp:
+        (WebCore::dragImageSize):
+        (WebCore::deleteDragImage):
+        (WebCore::scaleDragImage):
+        (WebCore::createDragImageFromImage):
+
 2009-06-30  Maxime Simon  <simon.maxime@gmail.com>
 

trunk/WebCore/platform/DragImage.h

@@ -47 +47 @@
 #elif PLATFORM(CHROMIUM)
 #include "DragImageRef.h"
+#elif PLATFORM(GTK)
+typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 
@@ -70 +72 @@
     typedef wxDragImage* DragImageRef;
 #elif PLATFORM(GTK)
-    typedef void* DragImageRef;
+    typedef GdkPixbuf* DragImageRef;
 #endif
     

trunk/WebCore/platform/gtk/DragImageGtk.cpp

@@ -21 +21 @@
 #include "Image.h"
 
+#include <gtk/gtk.h>
+
 namespace WebCore {
 
-IntSize dragImageSize(DragImageRef)
+IntSize dragImageSize(DragImageRef image)
 {
+    if (image)
+        return IntSize(gdk_pixbuf_get_width(image), gdk_pixbuf_get_height(image));
+
     return IntSize(0, 0);
 }
 
-void deleteDragImage(DragImageRef)
+void deleteDragImage(DragImageRef image)
 {
+    if (image)
+        g_object_unref(image);
 }
 
-DragImageRef scaleDragImage(DragImageRef image, FloatSize)
+DragImageRef scaleDragImage(DragImageRef image, FloatSize scale)
 {
-    return image;
+    if (image) {
+        IntSize imageSize = dragImageSize(image);
+        GdkPixbuf* scaledImage = gdk_pixbuf_scale_simple(image,
+                                                         imageSize.width() * scale.width(),
+                                                         imageSize.height() * scale.height(),
+                                                         GDK_INTERP_BILINEAR);
+        deleteDragImage(image);
+        return scaledImage;
+    }
+
+    return 0;
 }
 
@@ -42 +59 @@
 }
 
-DragImageRef createDragImageFromImage(Image*)
+DragImageRef createDragImageFromImage(Image* image)
 {
-    return 0;
+    return image->getGdkPixbuf();
 }