Changeset 245956 in webkit

Timestamp:

May 31, 2019, 1:15:09 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[CoordinatedGraphics] WPERenderer: do not release the host file descritor when initializing the render target
​https://bugs.webkit.org/show_bug.cgi?id=198371

Reviewed by Michael Catanzaro.

We are assuming that there will always be only one target for a web page. In the GTK port we destroy the render
target when leaving AC mode, and a new one is created when re-entering AC mode. Since the file descriptor is
released on the first target and adopted by libwpe, the second target passes -1 as host fd to libwpe, and the
new surface created by the target is not properly registered in the wayland compositor. That means that frame
requests for the new target are simply ignored by the wayland compositor, it returns early on surfacxe frame
when the surface doesn't have a view backend client.

• WebProcess/WebPage/WebPage.h:

(WebKit::WebPage::hostFileDescriptor const): Rename it and make it const.

• WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp:

(WebKit::AcceleratedSurfaceLibWPE::initialize): Pass a duplicated file descriptor to
wpe_renderer_backend_egl_target_create().

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [CoordinatedGraphics] WPERenderer: do not release the host file descritor when initializing the render target
+        https://bugs.webkit.org/show_bug.cgi?id=198371
+
+        Reviewed by Michael Catanzaro.
+
+        We are assuming that there will always be only one target for a web page. In the GTK port we destroy the render
+        target when leaving AC mode, and a new one is created when re-entering AC mode. Since the file descriptor is
+        released on the first target and adopted by libwpe, the second target passes -1 as host fd to libwpe, and the
+        new surface created by the target is not properly registered in the wayland compositor. That means that frame
+        requests for the new target are simply ignored by the wayland compositor, it returns early on surfacxe frame
+        when the surface doesn't have a view backend client.
+
+        * WebProcess/WebPage/WebPage.h:
+        (WebKit::WebPage::hostFileDescriptor const): Rename it and make it const.
+        * WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp:
+        (WebKit::AcceleratedSurfaceLibWPE::initialize): Pass a duplicated file descriptor to
+        wpe_renderer_backend_egl_target_create().
+
 2019-05-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -1157 +1157 @@
 
 #if USE(WPE_RENDERER)
-    int releaseHostFileDescriptor() { return m_hostFileDescriptor.releaseFileDescriptor(); }
+    int hostFileDescriptor() const { return m_hostFileDescriptor.fileDescriptor(); }
 #endif
 

trunk/Source/WebKit/WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp

@@ -32 +32 @@
 #include <WebCore/PlatformDisplayLibWPE.h>
 #include <wpe/wpe-egl.h>
+#include <wtf/UniStdExtras.h>
 
 namespace WebKit {
@@ -53 +54 @@
 void AcceleratedSurfaceLibWPE::initialize()
 {
-    m_backend = wpe_renderer_backend_egl_target_create(m_webPage.releaseHostFileDescriptor());
+    m_backend = wpe_renderer_backend_egl_target_create(dupCloseOnExec(m_webPage.hostFileDescriptor()));
     static struct wpe_renderer_backend_egl_target_client s_client = {
         // frame_complete