Attachment 371737 Details for Bug 198713 – Patch

[patch] Patch

bug-198713-20190610144024.patch (text/plain), 6.63 KB, created by Philippe Normand on 2019-06-10 06:40:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2019-06-10 06:40:25 PDT

Size: 6.63 KB

patch

obsolete

>Subversion Revision: 246255
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index e968451353ad6905736a12176046f44199f99994..79ab98bcce094396043dd5a629742268a3b8aaaf 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-10  Philippe Normand  <pnormand@igalia.com>
>+
>+        [WPE][Qt] Port to new wpe_fdo_egl_exported_image API
>+        https://bugs.webkit.org/show_bug.cgi?id=198713
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/wpe/qt/WPEQtViewBackend.cpp:
>+        (WPEQtViewBackend::WPEQtViewBackend):
>+        (WPEQtViewBackend::texture):
>+        (WPEQtViewBackend::displayImage):
>+        * UIProcess/API/wpe/qt/WPEQtViewBackend.h:
>+
> 2019-06-09  Brent Fulgham  <bfulgham@apple.com>
> 
>         [iOS] ResourceLoadStatistics state is not properly relayed to the NetworkProcess
>diff --git a/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp b/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp
>index 266fe279438e71e6be1815663b1ee32c7e471e6e..97ba149db49764753ec28ebb529c7a14ba00956c 100644
>--- a/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp
>+++ b/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp
>@@ -113,13 +113,14 @@ WPEQtViewBackend::WPEQtViewBackend(const QSizeF& size, EGLDisplay display, EGLCo
>     m_textureUniform = glFunctions->glGetUniformLocation(m_program, "u_texture");
> 
>     static struct wpe_view_backend_exportable_fdo_egl_client exportableClient = {
>-        // export_buffer_resource
>-        [](void* data, EGLImageKHR image)
>+        // export_egl_image
>+        nullptr,
>+        [](void* data, struct wpe_fdo_egl_exported_image* image)
>         {
>             static_cast<WPEQtViewBackend*>(data)->displayImage(image);
>         },
>         // padding
>-        nullptr, nullptr, nullptr, nullptr
>+        nullptr, nullptr, nullptr
>     };
> 
>     m_exportable = wpe_view_backend_exportable_fdo_egl_create(&exportableClient, this, m_size.width(), m_size.height());
>@@ -171,7 +172,7 @@ GLuint WPEQtViewBackend::texture(QOpenGLContext* context)
> 
>     glFunctions->glActiveTexture(GL_TEXTURE0);
>     glFunctions->glBindTexture(GL_TEXTURE_2D, m_textureId);
>-    imageTargetTexture2DOES(GL_TEXTURE_2D, m_lockedImage);
>+    imageTargetTexture2DOES(GL_TEXTURE_2D, wpe_fdo_egl_exported_image_get_egl_image(m_lockedImage));
>     glFunctions->glUniform1i(m_textureUniform, 0);
> 
>     static const GLfloat vertices[4][2] = {
>@@ -200,15 +201,15 @@ GLuint WPEQtViewBackend::texture(QOpenGLContext* context)
>     glFunctions->glDisableVertexAttribArray(1);
> 
>     wpe_view_backend_exportable_fdo_dispatch_frame_complete(m_exportable);
>-    wpe_view_backend_exportable_fdo_egl_dispatch_release_image(m_exportable, m_lockedImage);
>-    m_lockedImage = EGL_NO_IMAGE_KHR;
>+    wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(m_exportable, m_lockedImage);
>+    m_lockedImage = nullptr;
> 
>     return m_textureId;
> }
> 
>-void WPEQtViewBackend::displayImage(EGLImageKHR image)
>+void WPEQtViewBackend::displayImage(struct wpe_fdo_egl_exported_image* image)
> {
>-    RELEASE_ASSERT(m_lockedImage == EGL_NO_IMAGE_KHR);
>+    RELEASE_ASSERT(m_lockedImage == nullptr);
>     m_lockedImage = image;
>     if (m_view)
>         m_view->triggerUpdate();
>diff --git a/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h b/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h
>index f0456d6fbad9708510f53aa3344bc8eaf5ff1631..a0c0e7d2e37273e58fd9dbba2cd516668a2cda24 100644
>--- a/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h
>+++ b/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.h
>@@ -61,14 +61,13 @@ public:
>     struct wpe_view_backend* backend() const { return wpe_view_backend_exportable_fdo_get_view_backend(m_exportable); };
> 
> private:
>-    void displayImage(EGLImageKHR);
>+    void displayImage(struct wpe_fdo_egl_exported_image*);
>     uint32_t modifiers() const;
> 
>     EGLDisplay m_eglDisplay { nullptr };
>     EGLContext m_eglContext { nullptr };
>     struct wpe_view_backend_exportable_fdo* m_exportable { nullptr };
>-
>-    EGLImageKHR m_lockedImage { EGL_NO_IMAGE_KHR };
>+    struct wpe_fdo_egl_exported_image* m_lockedImage { nullptr };
> 
>     QPointer<WPEQtView> m_view;
>     QOffscreenSurface m_surface;
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index 5c99232ba0cd49d35dfdeb1e8bc61c4048f27abb..52e321ea1eab5bcda211b192f2b088fbfce123ae 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -172,7 +172,7 @@ if (ENABLE_WPE_QT_API)
>     find_package(Qt5 REQUIRED COMPONENTS Core Quick Gui)
>     find_package(Qt5Test REQUIRED)
>     find_package(PkgConfig)
>-    pkg_check_modules(WPE_BACKEND_FDO REQUIRED wpebackend-fdo-1.0)
>+    pkg_check_modules(WPE_BACKEND_FDO REQUIRED "wpebackend-fdo-1.0 >= 1.3.0")
> endif ()
> 
> add_definitions(-DBUILDING_WPE__=1)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f472956f05de6fc84fdc2df627ae0a4e657fddb5..552f8962c8c7e8c523d18da888267bd0fe321a36 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-10  Philippe Normand  <pnormand@igalia.com>
>+
>+        [WPE][Qt] Port to new wpe_fdo_egl_exported_image API
>+        https://bugs.webkit.org/show_bug.cgi?id=198713
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * flatpak/org.webkit.WPEModules.yaml: Include wpebackend-fdo
>+        patches currently used in JHBuild.
>+
> 2019-06-10  Zan Dobersek  <zdobersek@igalia.com>
> 
>         Unreviewed follow-up to r246148. Add another WPEBackend-fdo patch that
>diff --git a/Tools/flatpak/org.webkit.WPEModules.yaml b/Tools/flatpak/org.webkit.WPEModules.yaml
>index 970348f2d14945d2db34a471e21a603de438bd48..5155ae2535d7c211de3ae408e4580392e06709cc 100644
>--- a/Tools/flatpak/org.webkit.WPEModules.yaml
>+++ b/Tools/flatpak/org.webkit.WPEModules.yaml
>@@ -10,3 +10,7 @@
>     - type: archive
>       url: https://wpewebkit.org/releases/wpebackend-fdo-1.3.0.tar.xz
>       sha256: fed9ab29f5d53cf465188da80d014f3aa067c77704f8508c6bd17971fded359d
>+    - type: patch
>+      path: ../gtk/patches/wpebackend-fdo-Handle-the-case-of-new-target-created-for-the-same-v.patch
>+    - type: patch
>+      path: ../gtk/wpebackend-fdo-view-backend-exportable-private-don-t-double-free-ca.patch
>diff --git a/ChangeLog b/ChangeLog
>index 78c804e2ab7a4d31eaa5ec8761f36f0083551c82..2164c4646a1818d9f59b63e73f44cdc027c85298 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-06-10  Philippe Normand  <pnormand@igalia.com>
>+
>+        [WPE][Qt] Port to new wpe_fdo_egl_exported_image API
>+        https://bugs.webkit.org/show_bug.cgi?id=198713
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsWPE.cmake:
>+
> 2019-06-04  Takashi Komori  <Takashi.Komori@sony.com>
> 
>         [WinCairo] Implement cpu and memory measuring functions.

Flags:

cgarcia: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198713: 371737