[mutter] wayland/surface: Remove unnecessary NULL check
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland/surface: Remove unnecessary NULL check
- Date: Wed, 5 Jan 2022 17:17:47 +0000 (UTC)
commit 90076cf268bde6c18e49908514d7dc7af4b3a92e
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Thu Aug 5 16:03:26 2021 +0200
wayland/surface: Remove unnecessary NULL check
This check has caused repeated confusion, as there are no current code
paths where this can ever end up in the true-branch.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1959>
src/wayland/meta-wayland-surface.c | 28 ----------------------------
1 file changed, 28 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 07d269109d..320df11ede 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1028,10 +1028,6 @@ wl_surface_attach (struct wl_client *client,
MetaWaylandSurfaceState *pending = surface->pending_state;
MetaWaylandBuffer *buffer;
- /* X11 unmanaged window */
- if (!surface)
- return;
-
if (buffer_resource)
buffer = meta_wayland_buffer_from_resource (buffer_resource);
else
@@ -1069,10 +1065,6 @@ wl_surface_damage (struct wl_client *client,
MetaWaylandSurfaceState *pending = surface->pending_state;
cairo_rectangle_int_t rectangle;
- /* X11 unmanaged window */
- if (!surface)
- return;
-
rectangle = (cairo_rectangle_int_t) {
.x = x,
.y = y,
@@ -1101,10 +1093,6 @@ wl_surface_frame (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandSurfaceState *pending = surface->pending_state;
- /* X11 unmanaged window */
- if (!surface)
- return;
-
callback = g_new0 (MetaWaylandFrameCallback, 1);
callback->surface = surface;
callback->resource = wl_resource_create (client,
@@ -1125,10 +1113,6 @@ wl_surface_set_opaque_region (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandSurfaceState *pending = surface->pending_state;
- /* X11 unmanaged window */
- if (!surface)
- return;
-
g_clear_pointer (&pending->opaque_region, cairo_region_destroy);
if (region_resource)
{
@@ -1147,10 +1131,6 @@ wl_surface_set_input_region (struct wl_client *client,
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaWaylandSurfaceState *pending = surface->pending_state;
- /* X11 unmanaged window */
- if (!surface)
- return;
-
g_clear_pointer (&pending->input_region, cairo_region_destroy);
if (region_resource)
{
@@ -1167,10 +1147,6 @@ wl_surface_commit (struct wl_client *client,
{
MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
- /* X11 unmanaged window */
- if (!surface)
- return;
-
meta_wayland_surface_commit (surface);
}
@@ -1258,10 +1234,6 @@ wl_surface_damage_buffer (struct wl_client *client,
MetaWaylandSurfaceState *pending = surface->pending_state;
cairo_rectangle_int_t rectangle;
- /* X11 unmanaged window */
- if (!surface)
- return;
-
rectangle = (cairo_rectangle_int_t) {
.x = x,
.y = y,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]