Title: [135609] trunk/Source/WebKit2
Revision
135609
Author
[email protected]
Date
2012-11-23 07:15:58 -0800 (Fri, 23 Nov 2012)

Log Message

[EFL][WK2][AC] EwkViewImpl::transformToScreen() does not retrieve the Ecore_X_Window properly
https://bugs.webkit.org/show_bug.cgi?id=103133

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

If accelerated compositing is enabled, EwkViewImpl::transformToScreen() should
attempt to retrieve the Ecore_X_Window using ecore_evas_gl_x11_window_get() first
and only fall back to ecore_evas_software_x11_window_get().

* UIProcess/API/efl/EwkViewImpl.cpp:
(EwkViewImpl::transformToScreen):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (135608 => 135609)


--- trunk/Source/WebKit2/ChangeLog	2012-11-23 15:13:38 UTC (rev 135608)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-23 15:15:58 UTC (rev 135609)
@@ -1,3 +1,17 @@
+2012-11-23  Christophe Dumez  <[email protected]>
+
+        [EFL][WK2][AC] EwkViewImpl::transformToScreen() does not retrieve the Ecore_X_Window properly
+        https://bugs.webkit.org/show_bug.cgi?id=103133
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        If accelerated compositing is enabled, EwkViewImpl::transformToScreen() should
+        attempt to retrieve the Ecore_X_Window using ecore_evas_gl_x11_window_get() first
+        and only fall back to ecore_evas_software_x11_window_get().
+
+        * UIProcess/API/efl/EwkViewImpl.cpp:
+        (EwkViewImpl::transformToScreen):
+
 2012-11-23  Wojciech Bielawski  <[email protected]>
 
         [WK2][WKTR] WebKitTestRunner needs eventSender.contextClick()

Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp (135608 => 135609)


--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp	2012-11-23 15:13:38 UTC (rev 135608)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp	2012-11-23 15:15:58 UTC (rev 135609)
@@ -314,8 +314,15 @@
 
 #ifdef HAVE_ECORE_X
     Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(sd->base.evas);
-    Ecore_X_Window window = ecore_evas_software_x11_window_get(ecoreEvas); // Returns 0 if none.
 
+    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); // Returns 0 if none.
+
     int x, y; // x, y are relative to parent (in a reparenting window manager).
     while (window) {
         ecore_x_window_geometry_get(window, &x, &y, 0, 0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to