[mutter] compositor: Simplify meta_window_actor_set_updates_frozen
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] compositor: Simplify meta_window_actor_set_updates_frozen
- Date: Tue, 17 Jun 2014 17:11:06 +0000 (UTC)
commit 24d7c5ebe3a9711d993d3b11ff56cf44f38b4341
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Jun 17 13:06:10 2014 -0400
compositor: Simplify meta_window_actor_set_updates_frozen
Since we always call it with the same value, just push that
value into the implementation.
src/compositor/compositor.c | 7 +++----
src/compositor/meta-window-actor-private.h | 3 +--
src/compositor/meta-window-actor.c | 13 +++++++++++--
src/meta/compositor.h | 5 ++---
src/x11/window-x11.c | 9 +++------
5 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 94ac781..c84a1c6 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -691,12 +691,11 @@ meta_compositor_remove_window (MetaCompositor *compositor,
}
void
-meta_compositor_set_updates_frozen (MetaCompositor *compositor,
- MetaWindow *window,
- gboolean updates_frozen)
+meta_compositor_sync_updates_frozen (MetaCompositor *compositor,
+ MetaWindow *window)
{
MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
- meta_window_actor_set_updates_frozen (window_actor, updates_frozen);
+ meta_window_actor_sync_updates_frozen (window_actor);
}
void
diff --git a/src/compositor/meta-window-actor-private.h b/src/compositor/meta-window-actor-private.h
index 2d27850..5f495d6 100644
--- a/src/compositor/meta-window-actor-private.h
+++ b/src/compositor/meta-window-actor-private.h
@@ -51,8 +51,7 @@ void meta_window_actor_update_shape (MetaWindowActor *self);
void meta_window_actor_update_opacity (MetaWindowActor *self);
void meta_window_actor_mapped (MetaWindowActor *self);
void meta_window_actor_unmapped (MetaWindowActor *self);
-void meta_window_actor_set_updates_frozen (MetaWindowActor *self,
- gboolean updates_frozen);
+void meta_window_actor_sync_updates_frozen (MetaWindowActor *self);
void meta_window_actor_queue_frame_drawn (MetaWindowActor *self,
gboolean no_delay_frame);
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 6da79b7..b743127 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -1326,7 +1326,7 @@ meta_window_actor_new (MetaWindow *window)
priv = self->priv;
- meta_window_actor_set_updates_frozen (self, meta_window_updates_are_frozen (priv->window));
+ meta_window_actor_sync_updates_frozen (self);
/* If a window doesn't start off with updates frozen, we should
* we should send a _NET_WM_FRAME_DRAWN immediately after the first drawn.
@@ -2022,7 +2022,7 @@ meta_window_actor_update_opacity (MetaWindowActor *self)
clutter_actor_set_opacity (CLUTTER_ACTOR (priv->surface), window->opacity);
}
-void
+static void
meta_window_actor_set_updates_frozen (MetaWindowActor *self,
gboolean updates_frozen)
{
@@ -2039,3 +2039,12 @@ meta_window_actor_set_updates_frozen (MetaWindowActor *self,
meta_window_actor_thaw (self);
}
}
+
+void
+meta_window_actor_sync_updates_frozen (MetaWindowActor *self)
+{
+ MetaWindowActorPrivate *priv = self->priv;
+ MetaWindow *window = priv->window;
+
+ meta_window_actor_set_updates_frozen (self, meta_window_updates_are_frozen (window));
+}
diff --git a/src/meta/compositor.h b/src/meta/compositor.h
index 2090748..6c4ba51 100644
--- a/src/meta/compositor.h
+++ b/src/meta/compositor.h
@@ -101,9 +101,8 @@ void meta_compositor_unmaximize_window (MetaCompositor *compositor,
void meta_compositor_sync_window_geometry (MetaCompositor *compositor,
MetaWindow *window,
gboolean did_placement);
-void meta_compositor_set_updates_frozen (MetaCompositor *compositor,
- MetaWindow *window,
- gboolean updates_frozen);
+void meta_compositor_sync_updates_frozen (MetaCompositor *compositor,
+ MetaWindow *window);
void meta_compositor_queue_frame_drawn (MetaCompositor *compositor,
MetaWindow *window,
gboolean no_delay_frame);
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 5422b54..2def97a 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -929,8 +929,7 @@ sync_request_timeout (gpointer data)
* window updates
*/
window->sync_request_wait_serial = 0;
- meta_compositor_set_updates_frozen (window->display->compositor, window,
- meta_window_updates_are_frozen (window));
+ meta_compositor_sync_updates_frozen (window->display->compositor, window);
if (window == window->display->grab_window &&
meta_grab_op_is_resizing (window->display->grab_op))
@@ -993,8 +992,7 @@ send_sync_request (MetaWindow *window)
g_source_set_name_by_id (window->sync_request_timeout_id,
"[mutter] sync_request_timeout");
- meta_compositor_set_updates_frozen (window->display->compositor, window,
- meta_window_updates_are_frozen (window));
+ meta_compositor_sync_updates_frozen (window->display->compositor, window);
}
static unsigned long
@@ -3455,8 +3453,7 @@ meta_window_x11_update_sync_request_counter (MetaWindow *window,
}
window->sync_request_serial = new_counter_value;
- meta_compositor_set_updates_frozen (window->display->compositor, window,
- meta_window_updates_are_frozen (window));
+ meta_compositor_sync_updates_frozen (window->display->compositor, window);
if (window == window->display->grab_window &&
meta_grab_op_is_resizing (window->display->grab_op) &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]