Changeset 155113 in webkit

Timestamp:

Sep 5, 2013 7:15:46 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Assertion fails when the mouse pointer is styled with a custom cursor
​https://bugs.webkit.org/show_bug.cgi?id=118905

Patch by Enrique Ocaña González <​eocanha@igalia.com> on 2013-09-05
Reviewed by Philippe Normand.

Checked that the custom cursor image and its pixbuf is valid and create a null
cursor otherwise.

• platform/gtk/CursorGtk.cpp:

(WebCore::createCustomCursor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/CursorGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-05  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GTK] Assertion fails when the mouse pointer is styled with a custom cursor
+        https://bugs.webkit.org/show_bug.cgi?id=118905
+
+        Reviewed by Philippe Normand.
+
+        Checked that the custom cursor image and its pixbuf is valid and create a null
+        cursor otherwise.
+
+        * platform/gtk/CursorGtk.cpp:
+        (WebCore::createCustomCursor):
+
 2013-09-05  Praveen R Jadhav  <praveen.j@samsung.com>
 

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

@@ -61 +61 @@
 static GRefPtr<GdkCursor> createCustomCursor(Image* image, const IntPoint& hotSpot)
 {
+    GRefPtr<GdkPixbuf> pixbuf = adoptGRef(image->getGdkPixbuf());
+
+    if (!image->nativeImageForCurrentFrame() || !pixbuf)
+        return 0;
+
     IntPoint effectiveHotSpot = determineHotSpot(image, hotSpot);
-    GRefPtr<GdkPixbuf> pixbuf = adoptGRef(image->getGdkPixbuf());
     return adoptGRef(gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf.get(), effectiveHotSpot.x(), effectiveHotSpot.y()));
 }