Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1444437 - [Wayland] Don't map mozcontainer subsurface until parent surface is commited, r=ashie

Browse Source 
MozReview-Commit-ID: 4qoyGH8VCAU

--HG--
extra : rebase_source : 32c2e5d80268d082b4a9a8ae8c90d2ee86537fd2
This commit is contained in:
Martin Stransky 2018-06-28 13:37:31 +02:00
parent 50ea4ccf48
commit df210ffb15
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
widget/gtk/mozcontainer.cpp
View File

@ -212,7 +212,7 @@ moz_container_init (MozContainer *container)
container->surface = nullptr;
container->subsurface = nullptr;
container->eglwindow = nullptr;
container->committed = false;
container->parent_surface_committed = false;
GdkDisplay *gdk_display = gtk_widget_get_display(GTK_WIDGET(container));
if (GDK_IS_WAYLAND_DISPLAY (gdk_display)) {
@ -233,11 +233,12 @@ moz_container_init (MozContainer *container)
#if defined(MOZ_WAYLAND)
static void
moz_container_after_paint(GdkFrameClock *clock, MozContainer *container)
moz_container_commited_handler(GdkFrameClock *clock, MozContainer *container)
{
container->committed = true;
g_signal_handlers_disconnect_by_func(clock,
reinterpret_cast<gpointer>(moz_container_after_paint), container);
container->parent_surface_committed = true;
g_signal_handler_disconnect(clock,
container->parent_surface_committed_handler);
container->parent_surface_committed_handler = 0;
}
/* We want to draw to GdkWindow owned by mContainer from Compositor thread but
@ -268,6 +269,18 @@ moz_container_map_surface(MozContainer *container)
if (container->subsurface && container->surface)
return true;
if (!container->parent_surface_committed) {
if (!container->parent_surface_committed_handler) {
GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(container));
GdkFrameClock *clock = sGdkWindowGetFrameClock(window);
container->parent_surface_committed_handler =
g_signal_connect_after(clock, "after-paint",
G_CALLBACK(moz_container_commited_handler),
container);
}
return false;
}
if (!container->surface) {
struct wl_compositor *compositor;
compositor = sGdkWaylandDisplayGetWlCompositor(display);
@ -284,11 +297,6 @@ moz_container_map_surface(MozContainer *container)
return false;
}
GdkFrameClock *clock = sGdkWindowGetFrameClock(window);
g_signal_connect_after(clock, "after-paint",
G_CALLBACK(moz_container_after_paint),
container);
container->subsurface =
wl_subcompositor_get_subsurface (container->subcompositor,
container->surface,
@ -315,7 +323,19 @@ moz_container_unmap_surface(MozContainer *container)
g_clear_pointer(&container->eglwindow, wl_egl_window_destroy);
g_clear_pointer(&container->subsurface, wl_subsurface_destroy);
g_clear_pointer(&container->surface, wl_surface_destroy);
container->committed = false;
if (container->parent_surface_committed_handler) {
static auto sGdkWindowGetFrameClock =
(GdkFrameClock *(*)(GdkWindow *))
dlsym(RTLD_DEFAULT, "gdk_window_get_frame_clock");
GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(container));
GdkFrameClock *clock = sGdkWindowGetFrameClock(window);
g_signal_handler_disconnect(clock,
container->parent_surface_committed_handler);
container->parent_surface_committed_handler = 0;
}
container->parent_surface_committed = false;
}
#endif
@ -587,7 +607,7 @@ moz_container_get_wl_surface(MozContainer *container)
moz_container_map_surface(container);
}
return container->committed ? container->surface : nullptr;
return container->surface;
}
struct wl_egl_window *

3
widget/gtk/mozcontainer.h
View File

@ -73,7 +73,8 @@ struct _MozContainer
struct wl_surface *surface;
struct wl_subsurface *subsurface;
struct wl_egl_window *eglwindow;
gboolean committed;
gboolean parent_surface_committed;
gulong parent_surface_committed_handler;
#endif
};