Attachment 371259 Details for Bug 198522 – Patch

[patch] Patch

wkgtk-wl-ac-crash.diff (text/plain), 1.85 KB, created by Carlos Garcia Campos on 2019-06-04 02:51:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-06-04 02:51:07 PDT

Size: 1.85 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 09df1022267..87e1115a8fc 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-04  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GTK] Crash when re-entering AC mode after r245957
>+        https://bugs.webkit.org/show_bug.cgi?id=198522
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        When AcceleratedBackingStoreWayland::displayBuffer() is called and we have already left AC mode, we early
>+        dispatch the image and release it. The problem is that images are reused, so the given image can be the
>+        committed one. In that case we end up freeing it again in the next AcceleratedBackingStoreWayland::paint()
>+        call.
>+
>+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
>+        (WebKit::AcceleratedBackingStoreWayland::displayBuffer): Do not release the given image if it's the committed one.
>+
> 2019-06-03  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         REGRESSION(r244182): [CoordinatedGraphics] Related view doesn't receive graphic updates
>diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
>index 57f67951a4c..02578db46ca 100644
>--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
>+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
>@@ -204,7 +204,8 @@ void AcceleratedBackingStoreWayland::displayBuffer(struct wpe_fdo_egl_exported_i
> {
>     if (!m_surfaceID) {
>         wpe_view_backend_exportable_fdo_dispatch_frame_complete(m_exportable);
>-        wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(m_exportable, image);
>+        if (image != m_committedImage)
>+            wpe_view_backend_exportable_fdo_egl_dispatch_release_exported_image(m_exportable, image);
>         return;
>     }
>

Flags:

zan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198522: 371259