Changeset 206961 in webkit


Ignore:
Timestamp:
Oct 8, 2016 4:12:17 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Drop redundant wl_display_flush_clients() call
https://bugs.webkit.org/show_bug.cgi?id=161904

Patch by Emanuele Aina <Emanuele Aina> on 2016-10-08
Reviewed by Michael Catanzaro.

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:
Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r206960 r206961  
     12016-10-08  Emanuele Aina  <emanuele.aina@collabora.com>
     2
     3        [GTK] Drop redundant wl_display_flush_clients() call
     4        https://bugs.webkit.org/show_bug.cgi?id=161904
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        The Wayland GSource::prepare() function already calls
     9        wl_display_flush_clients() at every mainloop iteration, so there's no
     10        need to further call it on Surface::commit().
     11
     12        * UIProcess/gtk/WaylandCompositor.cpp:
     13        (WebKit::WaylandCompositor::Surface::commit):
     14        * UIProcess/gtk/WaylandCompositor.h:
     15
    1162016-10-06  Darin Adler  <darin@apple.com>
    217
  • trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp

    r205547 r206961  
    219219}
    220220
    221 bool WaylandCompositor::Surface::commit()
     221void WaylandCompositor::Surface::commit()
    222222{
    223223    EGLDisplay eglDisplay = PlatformDisplay::sharedDisplay().eglDisplay();
     
    226226    m_image = m_pendingBuffer->createImage();
    227227    if (m_image == EGL_NO_IMAGE_KHR)
    228         return false;
     228        return;
    229229
    230230    makePendingBufferCurrent();
     
    241241        wl_resource_destroy(resource);
    242242    }
    243 
    244     return true;
    245243}
    246244
     
    289287        if (!surface)
    290288            return;
    291 
    292         if (surface->commit())
    293             wl_display_flush_clients(wl_client_get_display(client));
     289        surface->commit();
    294290    },
    295291    // setBufferTransformCallback
  • trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h

    r205116 r206961  
    8686        void attachBuffer(struct wl_resource*);
    8787        void requestFrame(struct wl_resource*);
    88         bool commit();
     88        void commit();
    8989
    9090        void setWebPage(WebPageProxy* webPage) { m_webPage = webPage; }
Note: See TracChangeset for help on using the changeset viewer.