Changeset 247560 in webkit

Timestamp:

Jul 18, 2019 1:28:07 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] MOUSE_CURSOR_SCALE is not implemented
​https://bugs.webkit.org/show_bug.cgi?id=109469

Reviewed by Darin Adler.

.:

Enable MOUSE_CURSOR_SCALE for the GTK port.

• Source/cmake/OptionsGTK.cmake:

Source/WebCore:

Use gdk_cursor_new_from_surface() instead of gdk_cursor_new_from_pixbuf() to avoid the surface to pixbuf
conversion.

• platform/gtk/CursorGtk.cpp:

(WebCore::createCustomCursor):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/gtk/CursorGtk.cpp (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2019-07-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] MOUSE_CURSOR_SCALE is not implemented
+        https://bugs.webkit.org/show_bug.cgi?id=109469
+
+        Reviewed by Darin Adler.
+
+        Enable MOUSE_CURSOR_SCALE for the GTK port.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] MOUSE_CURSOR_SCALE is not implemented
+        https://bugs.webkit.org/show_bug.cgi?id=109469
+
+        Reviewed by Darin Adler.
+
+        Use gdk_cursor_new_from_surface() instead of gdk_cursor_new_from_pixbuf() to avoid the surface to pixbuf
+        conversion.
+
+        * platform/gtk/CursorGtk.cpp:
+        (WebCore::createCustomCursor):
+
 2019-07-17  Chris Dumez  <cdumez@apple.com>
 

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

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

trunk/Source/cmake/OptionsGTK.cmake

@@ -157 +157 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})