diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c index 3ee13481d..d9cf7a67b 100644 --- a/clutter/clutter-stage.c +++ b/clutter/clutter-stage.c @@ -292,10 +292,7 @@ clutter_stage_realize (ClutterActor *self) * realization sequence was successful */ if (CLUTTER_ACTOR_IS_REALIZED (priv->impl)) - { - CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_REALIZED); - clutter_stage_ensure_current (CLUTTER_STAGE (self)); - } + clutter_stage_ensure_current (CLUTTER_STAGE (self)); else CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED); } diff --git a/clutter/eglnative/clutter-stage-egl.c b/clutter/eglnative/clutter-stage-egl.c index 3d134b27d..ac4844a62 100644 --- a/clutter/eglnative/clutter-stage-egl.c +++ b/clutter/eglnative/clutter-stage-egl.c @@ -188,8 +188,7 @@ clutter_stage_egl_realize (ClutterActor *actor) CLUTTER_NOTE (GL, "Created EGL Context"); } - CLUTTER_NOTE (BACKEND, "Marking stage as realized and setting context"); - CLUTTER_ACTOR_SET_FLAGS (stage_egl, CLUTTER_ACTOR_REALIZED); + CLUTTER_NOTE (BACKEND, "Setting context"); /* eglnative can have only one stage */ status = eglMakeCurrent (backend_egl->edpy, diff --git a/clutter/eglx/clutter-stage-egl.c b/clutter/eglx/clutter-stage-egl.c index f272e1c9f..517ae1bd9 100644 --- a/clutter/eglx/clutter-stage-egl.c +++ b/clutter/eglx/clutter-stage-egl.c @@ -251,8 +251,6 @@ clutter_stage_egl_realize (ClutterActor *actor) CLUTTER_NOTE (GL, "Created EGL Context"); } - - CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); } else { diff --git a/clutter/fruity/clutter-stage-fruity.c b/clutter/fruity/clutter-stage-fruity.c index e85e0635c..3904c3e97 100644 --- a/clutter/fruity/clutter-stage-fruity.c +++ b/clutter/fruity/clutter-stage-fruity.c @@ -165,8 +165,7 @@ clutter_stage_egl_realize (ClutterActor *actor) } /* this will make sure to set the current context */ - CLUTTER_NOTE (BACKEND, "Marking stage as realized and setting context"); - CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); + CLUTTER_NOTE (BACKEND, "Setting context"); /* this should be done in ClutterBackend::ensure_context */ status = eglMakeCurrent (backend_egl->edpy, diff --git a/clutter/glx/clutter-stage-glx.c b/clutter/glx/clutter-stage-glx.c index 7a845654c..52f149eec 100644 --- a/clutter/glx/clutter-stage-glx.c +++ b/clutter/glx/clutter-stage-glx.c @@ -212,8 +212,7 @@ clutter_stage_glx_realize (ClutterActor *actor) goto fail; } - CLUTTER_NOTE (BACKEND, "Marking stage as realized"); - CLUTTER_ACTOR_SET_FLAGS (stage_x11, CLUTTER_ACTOR_REALIZED); + CLUTTER_NOTE (BACKEND, "Successfully realized stage"); } else { @@ -261,8 +260,7 @@ clutter_stage_glx_realize (ClutterActor *actor) goto fail; } - CLUTTER_NOTE (BACKEND, "Marking stage as realized"); - CLUTTER_ACTOR_SET_FLAGS (stage_x11, CLUTTER_ACTOR_REALIZED); + CLUTTER_NOTE (BACKEND, "Successfully realized stage"); } /* we need to chain up to the X11 stage implementation in order to diff --git a/clutter/osx/clutter-stage-osx.c b/clutter/osx/clutter-stage-osx.c index cb04b22cb..00bbcb45e 100644 --- a/clutter/osx/clutter-stage-osx.c +++ b/clutter/osx/clutter-stage-osx.c @@ -295,11 +295,7 @@ clutter_stage_osx_realize (ClutterActor *actor) CLUTTER_OSX_POOL_RELEASE(); - /* FIXME: ClutterStage:realize is using the class pointer directly rather - * than clutter_actor_realize which would set the REALIZED flag for us. - */ - CLUTTER_NOTE (BACKEND, "Marking stage as realized"); - CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); + CLUTTER_NOTE (BACKEND, "Stage successfully realized"); } static void @@ -321,8 +317,6 @@ clutter_stage_osx_unrealize (ClutterActor *actor) self->window = NULL; CLUTTER_OSX_POOL_RELEASE(); - - CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); } static void diff --git a/clutter/sdl/clutter-stage-sdl.c b/clutter/sdl/clutter-stage-sdl.c index e1cf387ab..fbb7a865f 100644 --- a/clutter/sdl/clutter-stage-sdl.c +++ b/clutter/sdl/clutter-stage-sdl.c @@ -89,8 +89,6 @@ clutter_stage_sdl_realize (ClutterActor *actor) CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); return; } - else - CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); } else { diff --git a/clutter/win32/clutter-stage-win32.c b/clutter/win32/clutter-stage-win32.c index 0b45a49f5..7f37979fe 100644 --- a/clutter/win32/clutter-stage-win32.c +++ b/clutter/win32/clutter-stage-win32.c @@ -558,8 +558,7 @@ clutter_stage_win32_realize (ClutterActor *actor) } } - CLUTTER_NOTE (BACKEND, "Marking stage as realized"); - CLUTTER_ACTOR_SET_FLAGS (stage_win32, CLUTTER_ACTOR_REALIZED); + CLUTTER_NOTE (BACKEND, "Successfully realized stage"); return; diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c index 52c7eea03..cb0c38529 100644 --- a/clutter/x11/clutter-x11-texture-pixmap.c +++ b/clutter/x11/clutter-x11-texture-pixmap.c @@ -531,8 +531,6 @@ clutter_x11_texture_pixmap_realize (ClutterActor *actor) CLUTTER_ACTOR_CLASS (clutter_x11_texture_pixmap_parent_class)-> realize (actor); - CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED); - clutter_x11_texture_pixmap_update_area_real (texture, 0, 0, priv->pixmap_width,