Attachment 288682 Details for Bug 161684 – Patch

[patch] Patch

bug-161684-20160913130054.patch (text/plain), 3.12 KB, created by Emanuele Aina on 2016-09-13 04:03:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Emanuele Aina

Created: 2016-09-13 04:03:29 PDT

Size: 3.12 KB

patch

obsolete

>Subversion Revision: 205856
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index d67edf2db6fb61bc184bbf0b052f830fcab44083..d83b6c4d2d73160b3224b835bf70368f0203cf49 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,18 @@
>+2016-09-13  Emanuele Aina  <emanuele.aina@collabora.com>
>+
>+        [GTK] Drop redundant wl_display_flush_clients() call
>+        https://bugs.webkit.org/show_bug.cgi?id=161684
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The Wayland GSource::prepare() function already calls
>+        wl_display_flush_clients() at every mainloop iteration, so there's no
>+        need to further call it on Surface::commit().
>+
>+        * UIProcess/gtk/WaylandCompositor.cpp:
>+        (WebKit::WaylandCompositor::Surface::commit):
>+        * UIProcess/gtk/WaylandCompositor.h:
>+
> 2016-09-12  DAN SAUNDERS  <dasau@microsoft.com>
> 
>         AX: WKWebView for macOS does not allow configuration of tabsToLinks
>diff --git a/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp
>index 4d598055dd2371f2961903ea9ff2e9e02d178a39..27f780ee206bfcf5d8be6cac2e85665660468b4b 100644
>--- a/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp
>+++ b/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp
>@@ -218,14 +218,14 @@ bool WaylandCompositor::Surface::prepareTextureForPainting(unsigned& texture, In
>     return true;
> }
> 
>-bool WaylandCompositor::Surface::commit()
>+void WaylandCompositor::Surface::commit()
> {
>     EGLDisplay eglDisplay = PlatformDisplay::sharedDisplay().eglDisplay();
>     if (m_image != EGL_NO_IMAGE_KHR)
>         eglDestroyImage(eglDisplay, m_image);
>     m_image = m_pendingBuffer->createImage();
>     if (m_image == EGL_NO_IMAGE_KHR)
>-        return false;
>+        return;
> 
>     makePendingBufferCurrent();
>     if (m_webPage)
>@@ -240,8 +240,6 @@ bool WaylandCompositor::Surface::commit()
>         wl_callback_send_done(resource, 0);
>         wl_resource_destroy(resource);
>     }
>-
>-    return true;
> }
> 
> static const struct wl_surface_interface surfaceInterface = {
>@@ -288,9 +286,7 @@ static const struct wl_surface_interface surfaceInterface = {
>         auto* surface = static_cast<WaylandCompositor::Surface*>(wl_resource_get_user_data(resource));
>         if (!surface)
>             return;
>-
>-        if (surface->commit())
>-            wl_display_flush_clients(wl_client_get_display(client));
>+        surface->commit();
>     },
>     // setBufferTransformCallback
>     [](struct wl_client*, struct wl_resource*, int32_t) { },
>diff --git a/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h b/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h
>index 0d28aa7651795e70733cf12878c258aeeb984716..626ec3a787d974cfc72b94dac59aeb859e043eb6 100644
>--- a/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h
>+++ b/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h
>@@ -85,7 +85,7 @@ public:
> 
>         void attachBuffer(struct wl_resource*);
>         void requestFrame(struct wl_resource*);
>-        bool commit();
>+        void commit();
> 
>         void setWebPage(WebPageProxy* webPage) { m_webPage = webPage; }
>         bool prepareTextureForPainting(unsigned&, WebCore::IntSize&);

Actions: View | Formatted Diff | Diff

Attachments on bug 161684: 288126 | 288682 | 288683