Title: [206961] trunk/Source/WebKit2
- Revision
- 206961
- Author
- commit-qu...@webkit.org
- Date
- 2016-10-08 16:12:17 -0700 (Sat, 08 Oct 2016)
Log Message
[GTK] Drop redundant wl_display_flush_clients() call
https://bugs.webkit.org/show_bug.cgi?id=161904
Patch by Emanuele Aina <emanuele.a...@collabora.com> 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (206960 => 206961)
--- trunk/Source/WebKit2/ChangeLog 2016-10-08 23:01:27 UTC (rev 206960)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-08 23:12:17 UTC (rev 206961)
@@ -1,3 +1,18 @@
+2016-10-08 Emanuele Aina <emanuele.a...@collabora.com>
+
+ [GTK] Drop redundant wl_display_flush_clients() call
+ https://bugs.webkit.org/show_bug.cgi?id=161904
+
+ 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:
+
2016-10-06 Darin Adler <da...@apple.com>
Next step on moving to modern way to return DOM exceptions
Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp (206960 => 206961)
--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-08 23:01:27 UTC (rev 206960)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-08 23:12:17 UTC (rev 206961)
@@ -218,7 +218,7 @@
return true;
}
-bool WaylandCompositor::Surface::commit()
+void WaylandCompositor::Surface::commit()
{
EGLDisplay eglDisplay = PlatformDisplay::sharedDisplay().eglDisplay();
if (m_image != EGL_NO_IMAGE_KHR)
@@ -225,7 +225,7 @@
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 @@
wl_callback_send_done(resource, 0);
wl_resource_destroy(resource);
}
-
- return true;
}
static const struct wl_surface_interface surfaceInterface = {
@@ -288,9 +286,7 @@
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) { },
Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h (206960 => 206961)
--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-08 23:01:27 UTC (rev 206960)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-08 23:12:17 UTC (rev 206961)
@@ -85,7 +85,7 @@
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&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
