[PageLifecycle] Move the cairo device used by Acc Canvas to the PlatformDisplay.

Author: magomez

Source/WebCore/platform/graphics/PlatformDisplay.cpp

@@ -88,8 +88,34 @@
 #include <wtf/glib/GRefPtr.h>
 #endif
 
+#if USE(CAIRO)
+#include <cairo-gl.h>
+#endif
+
 namespace WebCore {
 
+#if USE(CAIRO)
+static cairo_device_t* s_cairoDevice { nullptr };
+
+cairo_device_t* PlatformDisplay::cairoGLDevice()
+{
+    if (s_cairoDevice)
+        return s_cairoDevice;
+
+    auto* context = sharedDisplayForCompositing().sharingGLContext();
+    if (is<GLContextEGL>(context))
+        s_cairoDevice = cairo_egl_device_create(sharedDisplayForCompositing().eglDisplay(), downcast<GLContextEGL>(context)->context());
+
+    return s_cairoDevice;
+}
+
+static void clearCairoGLDevice()
+{
+    cairo_device_destroy(s_cairoDevice);
+    s_cairoDevice = nullptr;
+}
+#endif
+
 std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
 {
 #if PLATFORM(GTK)
@@ -221,6 +247,9 @@ GLContext* PlatformDisplay::sharingGLContext()
 
 void PlatformDisplay::clearSharingGLContext()
 {
+#if USE(CAIRO)
+    clearCairoGLDevice();
+#endif
     m_sharingGLContext = nullptr;
 }
 #endif

Source/WebCore/platform/graphics/PlatformDisplay.h

@@ -50,6 +50,10 @@ typedef struct _GstGLDisplay GstGLDisplay;
 #include "LCMSUniquePtr.h"
 #endif
 
+#if USE(CAIRO)
+#include <cairo.h>
+#endif
+
 namespace WebCore {
 
 class GLContext;
@@ -109,6 +113,10 @@ class PlatformDisplay {
     const String& accessibilityBusAddress() const;
 #endif
 
+#if USE(CAIRO)
+    cairo_device_t* cairoGLDevice();
+#endif
+
 protected:
     PlatformDisplay();
 #if PLATFORM(GTK)

Source/WebCore/platform/graphics/cairo/ImageBufferCairoGLSurfaceBackend.cpp

@@ -17,22 +17,6 @@ namespace WebCore {
 
 WTF_MAKE_ISO_ALLOCATED_IMPL(ImageBufferCairoGLSurfaceBackend);
 
-static cairo_device_t* cairoDevice()
-{
-    static cairo_device_t* s_device { nullptr };
-
-    static std::once_flag s_flag;
-    std::call_once(s_flag,
-        [&] {
-            auto& platformDisplay = PlatformDisplay::sharedDisplayForCompositing();
-            auto* context = platformDisplay.sharingGLContext();
-            if (is<GLContextEGL>(context))
-                s_device = cairo_egl_device_create(platformDisplay.eglDisplay(), downcast<GLContextEGL>(context)->context());
-        });
-
-    return s_device;
-}
-
 static RefPtr<cairo_surface_t>
 cairoGLSurfaceCopyToImageSurface(cairo_surface_t* surface)
 {
@@ -97,7 +81,7 @@ std::unique_ptr<ImageBufferCairoGLSurfaceBackend> ImageBufferCairoGLSurfaceBacke
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, backendSize.width(), backendSize.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
 
-    auto* device = cairoDevice();
+    auto* device = PlatformDisplay::sharedDisplayForCompositing().cairoGLDevice();
     if (!device) {
         glDeleteTextures(1, &textures[0]);
         return { };
@@ -162,7 +146,7 @@ void ImageBufferCairoGLSurfaceBackend::swapBuffersIfNeeded()
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, backendSize.width(), backendSize.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-        m_surfaces[1] = adoptRef(cairo_gl_surface_create_for_texture(cairoDevice(), CAIRO_CONTENT_COLOR_ALPHA, m_textures[1], backendSize.width(), backendSize.height()));
+        m_surfaces[1] = adoptRef(cairo_gl_surface_create_for_texture(PlatformDisplay::sharedDisplayForCompositing().cairoGLDevice(), CAIRO_CONTENT_COLOR_ALPHA, m_textures[1], backendSize.width(), backendSize.height()));
         m_compositorContext = adoptRef(cairo_create(m_surfaces[1].get()));
     }