Title: [135604] trunk/Source/WebCore
Revision
135604
Author
[email protected]
Date
2012-11-23 06:22:55 -0800 (Fri, 23 Nov 2012)

Log Message

[EFL][AC] Mouse cursor is not updated when accelerated compositing is enabled
https://bugs.webkit.org/show_bug.cgi?id=103131

Patch by Christophe Dumez <[email protected]> on 2012-11-23
Reviewed by Kenneth Rohde Christiansen.

Make sure we try to get the Ecore_X_Window using ecore_evas_gl_x11_window_get()
in applyFallbackCursor() if accelerated compositing is enabled instead of
using ecore_evas_software_x11_window_get(). This fixes mouse cursor update
when accelerated compositing is enabled.

No new tests, no behavior change for layout tests.

* platform/efl/EflScreenUtilities.cpp:
(WebCore::applyFallbackCursor):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (135603 => 135604)


--- trunk/Source/WebCore/ChangeLog	2012-11-23 14:08:00 UTC (rev 135603)
+++ trunk/Source/WebCore/ChangeLog	2012-11-23 14:22:55 UTC (rev 135604)
@@ -1,3 +1,20 @@
+2012-11-23  Christophe Dumez  <[email protected]>
+
+        [EFL][AC] Mouse cursor is not updated when accelerated compositing is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=103131
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Make sure we try to get the Ecore_X_Window using ecore_evas_gl_x11_window_get()
+        in applyFallbackCursor() if accelerated compositing is enabled instead of
+        using ecore_evas_software_x11_window_get(). This fixes mouse cursor update
+        when accelerated compositing is enabled.
+
+        No new tests, no behavior change for layout tests.
+
+        * platform/efl/EflScreenUtilities.cpp:
+        (WebCore::applyFallbackCursor):
+
 2012-11-16  Yury Semikhatsky  <[email protected]>
 
         Memory instrumentation: extract MemoryObjectInfo declaration into a separate file

Modified: trunk/Source/WebCore/platform/efl/EflScreenUtilities.cpp (135603 => 135604)


--- trunk/Source/WebCore/platform/efl/EflScreenUtilities.cpp	2012-11-23 14:08:00 UTC (rev 135603)
+++ trunk/Source/WebCore/platform/efl/EflScreenUtilities.cpp	2012-11-23 14:22:55 UTC (rev 135604)
@@ -112,7 +112,15 @@
                   " c ursor group %s", cursorString);
         shape = ECORE_X_CURSOR_LEFT_PTR;
     }
-    Ecore_X_Window window = ecore_evas_software_x11_window_get(ecoreEvas);
+
+    Ecore_X_Window window;
+#if USE(ACCELERATED_COMPOSITING)
+    window = ecore_evas_gl_x11_window_get(ecoreEvas);
+    // Fallback to software mode if necessary.
+    if (!window)
+#endif
+    window = ecore_evas_software_x11_window_get(ecoreEvas);
+
     Ecore_X_Cursor cursor = ecore_x_cursor_shape_get(shape);
     ecore_x_window_cursor_set(window, cursor);
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to