From 4f0015143c107a8ef4418be497cb18d6a3887c18 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Wed, 7 Sep 2022 15:17:04 +0900 Subject: [PATCH] tizen_policy: change the get_visibility to new_visibility change the symbol name Change-Id: Ic8c6fecd1f51b3aef6f7f0ca328f5805159f489d --- examples/tinyds-tdm.c | 18 ++++++++--------- include/libds-tizen/policy.h | 4 ++-- src/policy/policy.c | 12 ++++++------ tests/tc_policy.cpp | 46 ++++++++++++++++++++++---------------------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/examples/tinyds-tdm.c b/examples/tinyds-tdm.c index 30102fe..60ba931 100644 --- a/examples/tinyds-tdm.c +++ b/examples/tinyds-tdm.c @@ -111,7 +111,7 @@ struct tinyds_policy_surface struct ds_tizen_policy_surface *policy_surface; struct wl_listener destroy; - struct wl_listener get_visibility; + struct wl_listener new_visibility; struct wl_listener get_position; struct wl_listener activate; struct wl_listener raise; @@ -2638,16 +2638,16 @@ policy_surface_handle_destroy(struct wl_listener *listener, void *data) } static void -policy_surface_handle_get_visibility(struct wl_listener *listener, void *data) +policy_surface_handle_new_visibility(struct wl_listener *listener, void *data) { struct tinyds_policy_surface *policy_surface; struct tinyds_policy_visibility *visibility; - struct ds_tizen_event_policy_surface_get_visibility *event; + struct ds_tizen_event_policy_surface_new_visibility *event; - policy_surface = wl_container_of(listener, policy_surface, get_visibility); - event = (struct ds_tizen_event_policy_surface_get_visibility *)data; + policy_surface = wl_container_of(listener, policy_surface, new_visibility); + event = (struct ds_tizen_event_policy_surface_new_visibility *)data; - ds_inf("Policy Info(%p) get_visibility", policy_surface); + ds_inf("Policy Info(%p) new_visibility", policy_surface); visibility = calloc(1, sizeof *visibility); if (!visibility) @@ -3086,9 +3086,9 @@ policy_handle_new_surface(struct wl_listener *listener, void *data) ds_tizen_policy_surface_add_destroy_listener(policy_surface->policy_surface, &policy_surface->destroy); - policy_surface->get_visibility.notify = policy_surface_handle_get_visibility; - ds_tizen_policy_surface_add_get_visibility_listener(policy_surface->policy_surface, - &policy_surface->get_visibility); + policy_surface->new_visibility.notify = policy_surface_handle_new_visibility; + ds_tizen_policy_surface_add_new_visibility_listener(policy_surface->policy_surface, + &policy_surface->new_visibility); policy_surface->get_position.notify = policy_surface_handle_get_position; ds_tizen_policy_surface_add_get_position_listener(policy_surface->policy_surface, diff --git a/include/libds-tizen/policy.h b/include/libds-tizen/policy.h index 4d27c1f..2dc87e4 100644 --- a/include/libds-tizen/policy.h +++ b/include/libds-tizen/policy.h @@ -161,7 +161,7 @@ struct ds_tizen_event_policy_set_transient_for_below }; // policy policy_surface event structures -struct ds_tizen_event_policy_surface_get_visibility +struct ds_tizen_event_policy_surface_new_visibility { struct ds_tizen_policy_surface *policy_surface; struct ds_tizen_policy_visibility *visibility; @@ -418,7 +418,7 @@ ds_tizen_policy_surface_add_destroy_listener( struct wl_listener *listener); void -ds_tizen_policy_surface_add_get_visibility_listener( +ds_tizen_policy_surface_add_new_visibility_listener( struct ds_tizen_policy_surface *policy_surface, struct wl_listener *listener); diff --git a/src/policy/policy.c b/src/policy/policy.c index 057b4f0..5bf32a4 100644 --- a/src/policy/policy.c +++ b/src/policy/policy.c @@ -77,7 +77,7 @@ struct ds_tizen_policy_surface struct { struct wl_signal destroy; - struct wl_signal get_visibility; + struct wl_signal new_visibility; struct wl_signal get_position; struct wl_signal activate; struct wl_signal raise; @@ -329,11 +329,11 @@ ds_tizen_policy_surface_add_destroy_listener( } WL_EXPORT void -ds_tizen_policy_surface_add_get_visibility_listener( +ds_tizen_policy_surface_add_new_visibility_listener( struct ds_tizen_policy_surface *policy_surface, struct wl_listener *listener) { - wl_signal_add(&policy_surface->events.get_visibility, listener); + wl_signal_add(&policy_surface->events.new_visibility, listener); } WL_EXPORT void @@ -947,7 +947,7 @@ tizen_policy_client_get_surface(struct wl_resource *resource, wl_list_init(&policy_surface->subsurface_watchers); wl_signal_init(&policy_surface->events.destroy); - wl_signal_init(&policy_surface->events.get_visibility); + wl_signal_init(&policy_surface->events.new_visibility); wl_signal_init(&policy_surface->events.get_position); wl_signal_init(&policy_surface->events.activate); wl_signal_init(&policy_surface->events.raise); @@ -1076,11 +1076,11 @@ policy_handle_get_visibility(struct wl_client *wl_client, struct wl_resource *re &visibility_impl, visibility, _tizen_policy_visibility_handle_destroy); - struct ds_tizen_event_policy_surface_get_visibility event = { + struct ds_tizen_event_policy_surface_new_visibility event = { .policy_surface = policy_surface, .visibility = visibility, }; - wl_signal_emit(&policy_surface->events.get_visibility, &event); + wl_signal_emit(&policy_surface->events.new_visibility, &event); } static void diff --git a/tests/tc_policy.cpp b/tests/tc_policy.cpp index dc3da43..f8e2d2a 100644 --- a/tests/tc_policy.cpp +++ b/tests/tc_policy.cpp @@ -246,10 +246,10 @@ public: ds_tizen_policy_surface_add_destroy_listener(policy_surface, &mDestroyListener); // policy_surface listeners - mGetVisibilityListener.notify = MockPolicySurface::GetVisibilityCallback; - mGetVisibilityListener.parent = this; - ds_tizen_policy_surface_add_get_visibility_listener(policy_surface, - &mGetVisibilityListener); + mNewVisibilityListener.notify = MockPolicySurface::NewVisibilityCallback; + mNewVisibilityListener.parent = this; + ds_tizen_policy_surface_add_new_visibility_listener(policy_surface, + &mNewVisibilityListener); mGetPositionListener.notify = MockPolicySurface::GetPositionCallback; mGetPositionListener.parent = this; @@ -405,9 +405,9 @@ public: { ds_inf("%s", __func__); - if (mGetVisibilityListener.notify) { - wl_list_remove(&mGetVisibilityListener.link); - mGetVisibilityListener.notify = nullptr; + if (mNewVisibilityListener.notify) { + wl_list_remove(&mNewVisibilityListener.link); + mNewVisibilityListener.notify = nullptr; } if (mDestroyListener.notify) { @@ -440,17 +440,17 @@ public: policySurface->bDestroyed = true; } - static void GetVisibilityCallback(struct wl_listener *listener, void *data) + static void NewVisibilityCallback(struct wl_listener *listener, void *data) { MockPolicySurface *policySurface = - reinterpret_cast(listener)->parent; - struct ds_tizen_event_policy_surface_get_visibility *event = - static_cast(data); + reinterpret_cast(listener)->parent; + struct ds_tizen_event_policy_surface_new_visibility *event = + static_cast(data); EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface); EXPECT_TRUE(event->visibility != NULL); - policySurface->bGetVisibility = true; + policySurface->bNewVisibility = true; MockPolicyVisibility *policyVisibility = new MockPolicyVisibility(event->visibility); @@ -840,7 +840,7 @@ public: return wl_resource_get_id(surface_res); } - MockPolicyVisibility *GetVisibility() + MockPolicyVisibility *NewVisibility() { return mPolicyVisibility; } @@ -901,7 +901,7 @@ public: public: bool bDestroyed; - bool bGetVisibility; + bool bNewVisibility; bool bGetPosition; bool bActivate; bool bRaise; @@ -941,10 +941,10 @@ private: DestroyListener mDestroyListener; // policy policy_surface listener structure - struct GetVisibilityListener : ::wl_listener { + struct NewVisibilityListener : ::wl_listener { MockPolicySurface *parent; }; - GetVisibilityListener mGetVisibilityListener; + NewVisibilityListener mNewVisibilityListener; struct GetPositionListener : ::wl_listener { MockPolicySurface *parent; @@ -2177,7 +2177,7 @@ tizen_visibility_listener visibility_cb_listener = .changed = client_tizen_visibility_cb_changed, }; -TEST_F(PolicyTest, Req_PolicySurfaceGetVisibility) +TEST_F(PolicyTest, Req_PolicySurfaceNewVisibility) { MockPolicySurface *policy_surface; MockPolicyVisibility *visibility; @@ -2193,9 +2193,9 @@ TEST_F(PolicyTest, Req_PolicySurfaceGetVisibility) surface_res_id = wl_proxy_get_id((struct wl_proxy *)surface_res); policy_surface = comp->FindPolicySurfaceWidthResId(surface_res_id); - EXPECT_TRUE(policy_surface->bGetVisibility); + EXPECT_TRUE(policy_surface->bNewVisibility); - visibility = policy_surface->GetVisibility(); + visibility = policy_surface->NewVisibility(); tizen_visibility_destroy(visibility_res); client->RoundTrip(); @@ -2221,9 +2221,9 @@ TEST_F(PolicyTest, Ev_VisibilityNotify) surface_res_id = wl_proxy_get_id((struct wl_proxy *)surface_res); policy_surface = comp->FindPolicySurfaceWidthResId(surface_res_id); - EXPECT_TRUE(policy_surface->bGetVisibility); + EXPECT_TRUE(policy_surface->bNewVisibility); - visibility = policy_surface->GetVisibility(); + visibility = policy_surface->NewVisibility(); visibility->SendNotify(type); comp->Process(); @@ -2256,9 +2256,9 @@ TEST_F(PolicyTest, Ev_VisibilityChanged) surface_res_id = wl_proxy_get_id((struct wl_proxy *)surface_res); policy_surface = comp->FindPolicySurfaceWidthResId(surface_res_id); - EXPECT_TRUE(policy_surface->bGetVisibility); + EXPECT_TRUE(policy_surface->bNewVisibility); - visibility = policy_surface->GetVisibility(); + visibility = policy_surface->NewVisibility(); visibility->SendChanged(type, option); comp->Process(); -- 2.7.4