Attachment 207629 Details for Bug 118905 – Patch

[patch] Patch

bug-118905-20130729100828.patch (text/plain), 1.67 KB, created by Enrique Ocaña on 2013-07-29 03:08:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Enrique Ocaña

Created: 2013-07-29 03:08:29 PDT

Size: 1.67 KB

patch

obsolete

>Subversion Revision: 152631
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 33c58e9b7dbfa5e45a03273607d62cc3811f8720..1e26ab939d1e2dd1c5c3778b4cf09c2bf3d6a2ec 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2013-07-19  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 NOBODY (OOPS!).
>+
>+        Checked that the custom cursor image and its pixbuf is valid and create a null
>+        cursor otherwise.
>+
>+        * platform/gtk/CursorGtk.cpp:
>+        (WebCore::createCustomCursor):
>+
> 2013-07-15  Brian Holt  <brian.holt@samsung.com>
> 
>         [ATK] Leak: Leak in WebKitAccessibleTextGetText
>diff --git a/Source/WebCore/platform/gtk/CursorGtk.cpp b/Source/WebCore/platform/gtk/CursorGtk.cpp
>index 8fb905a964de76234209c2f5c91c6cdf79054207..e6687aff990ce939a92fb91936bd7953246b4e2a 100644
>--- a/Source/WebCore/platform/gtk/CursorGtk.cpp
>+++ b/Source/WebCore/platform/gtk/CursorGtk.cpp
>@@ -60,8 +60,12 @@ static GRefPtr<GdkCursor> createNamedCursor(CustomCursorType cursorType)
> 
> static GRefPtr<GdkCursor> createCustomCursor(Image* image, const IntPoint& hotSpot)
> {
>-    IntPoint effectiveHotSpot = determineHotSpot(image, hotSpot);
>     GRefPtr<GdkPixbuf> pixbuf = adoptGRef(image->getGdkPixbuf());
>+
>+    if (!image->nativeImageForCurrentFrame() || !pixbuf)
>+        return 0;
>+
>+    IntPoint effectiveHotSpot = determineHotSpot(image, hotSpot);
>     return adoptGRef(gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf.get(), effectiveHotSpot.x(), effectiveHotSpot.y()));
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 118905: 207090 | 207093 | 207629 | 207638