struct wl_listener set_floating_mode;
struct wl_listener unset_floating_mode;
struct wl_listener set_stack_mode;
- struct wl_listener get_subsurface_watcher;
+ struct wl_listener new_subsurface_watcher;
struct wl_listener set_parent;
struct wl_listener ack_conformant_region;
struct wl_listener set_video;
}
static void
-policy_surface_handle_get_subsurface_watcher(struct wl_listener *listener, void *data)
+policy_surface_handle_new_subsurface_watcher(struct wl_listener *listener, void *data)
{
struct tinyds_policy_surface *policy_surface;
struct tinyds_policy_subsurface_watcher*subsurface_watcher;
- struct ds_tizen_event_policy_surface_get_subsurface_watcher *event;
+ struct ds_tizen_event_policy_surface_new_subsurface_watcher *event;
- policy_surface = wl_container_of(listener, policy_surface, get_subsurface_watcher);
- event = (struct ds_tizen_event_policy_surface_get_subsurface_watcher *)data;
+ policy_surface = wl_container_of(listener, policy_surface, new_subsurface_watcher);
+ event = (struct ds_tizen_event_policy_surface_new_subsurface_watcher *)data;
- ds_inf("Policy Info(%p) get_subsurface_watcher", policy_surface);
+ ds_inf("Policy Info(%p) new_subsurface_watcher", policy_surface);
subsurface_watcher = calloc(1, sizeof *subsurface_watcher);
if (!subsurface_watcher)
ds_tizen_policy_surface_add_set_stack_mode_listener(policy_surface->policy_surface,
&policy_surface->set_stack_mode);
- policy_surface->get_subsurface_watcher.notify =
- policy_surface_handle_get_subsurface_watcher;
- ds_tizen_policy_surface_add_get_subsurface_watcher_listener(
- policy_surface->policy_surface, &policy_surface->get_subsurface_watcher);
+ policy_surface->new_subsurface_watcher.notify =
+ policy_surface_handle_new_subsurface_watcher;
+ ds_tizen_policy_surface_add_new_subsurface_watcher_listener(
+ policy_surface->policy_surface, &policy_surface->new_subsurface_watcher);
policy_surface->set_parent.notify = policy_surface_handle_set_parent;
ds_tizen_policy_surface_add_set_parent_listener(policy_surface->policy_surface,
enum ds_tizen_policy_stack_mode mode;
};
-struct ds_tizen_event_policy_surface_get_subsurface_watcher
+struct ds_tizen_event_policy_surface_new_subsurface_watcher
{
struct ds_tizen_policy_surface *policy_surface;
struct ds_tizen_policy_subsurface_watcher *subsurface_watcher;
struct wl_listener *listener);
void
-ds_tizen_policy_surface_add_get_subsurface_watcher_listener(
+ds_tizen_policy_surface_add_new_subsurface_watcher_listener(
struct ds_tizen_policy_surface *policy_surface,
struct wl_listener *listener);
struct wl_signal set_floating_mode;
struct wl_signal unset_floating_mode;
struct wl_signal set_stack_mode;
- struct wl_signal get_subsurface_watcher;
+ struct wl_signal new_subsurface_watcher;
struct wl_signal set_parent;
struct wl_signal ack_conformant_region;
struct wl_signal set_video;
}
WL_EXPORT void
-ds_tizen_policy_surface_add_get_subsurface_watcher_listener(
+ds_tizen_policy_surface_add_new_subsurface_watcher_listener(
struct ds_tizen_policy_surface *policy_surface,
struct wl_listener *listener)
{
- wl_signal_add(&policy_surface->events.get_subsurface_watcher, listener);
+ wl_signal_add(&policy_surface->events.new_subsurface_watcher, listener);
}
WL_EXPORT void
wl_signal_init(&policy_surface->events.set_floating_mode);
wl_signal_init(&policy_surface->events.unset_floating_mode);
wl_signal_init(&policy_surface->events.set_stack_mode);
- wl_signal_init(&policy_surface->events.get_subsurface_watcher);
+ wl_signal_init(&policy_surface->events.new_subsurface_watcher);
wl_signal_init(&policy_surface->events.set_parent);
wl_signal_init(&policy_surface->events.ack_conformant_region);
wl_signal_init(&policy_surface->events.set_video);
&subsurface_watcher_impl, subsurface_watcher,
_tizen_policy_subsurface_watcher_handle_destroy);
- struct ds_tizen_event_policy_surface_get_subsurface_watcher event = {
+ struct ds_tizen_event_policy_surface_new_subsurface_watcher event = {
.policy_surface = policy_surface,
.subsurface_watcher = subsurface_watcher,
};
- wl_signal_emit(&policy_surface->events.get_subsurface_watcher, &event);
+ wl_signal_emit(&policy_surface->events.new_subsurface_watcher, &event);
}
static void
ds_tizen_policy_surface_add_set_stack_mode_listener(policy_surface,
&mSetStackModeListener);
- mGetSubsurfaceWatcherListener.notify = MockPolicySurface::GetSubsurfaceWatcherCallback;
- mGetSubsurfaceWatcherListener.parent = this;
- ds_tizen_policy_surface_add_get_subsurface_watcher_listener(policy_surface,
- &mGetSubsurfaceWatcherListener);
+ mNewSubsurfaceWatcherListener.notify = MockPolicySurface::NewSubsurfaceWatcherCallback;
+ mNewSubsurfaceWatcherListener.parent = this;
+ ds_tizen_policy_surface_add_new_subsurface_watcher_listener(policy_surface,
+ &mNewSubsurfaceWatcherListener);
mSetParentListener.notify = MockPolicySurface::SetParentCallback;
mSetParentListener.parent = this;
policySurface->mStackMode = event->mode;
}
- static void GetSubsurfaceWatcherCallback(struct wl_listener *listener, void *data)
+ static void NewSubsurfaceWatcherCallback(struct wl_listener *listener, void *data)
{
MockPolicySurface *policySurface =
- reinterpret_cast<GetSubsurfaceWatcherListener *>(listener)->parent;
- struct ds_tizen_event_policy_surface_get_subsurface_watcher *event =
- static_cast<struct ds_tizen_event_policy_surface_get_subsurface_watcher *>(data);
+ reinterpret_cast<NewSubsurfaceWatcherListener *>(listener)->parent;
+ struct ds_tizen_event_policy_surface_new_subsurface_watcher *event =
+ static_cast<struct ds_tizen_event_policy_surface_new_subsurface_watcher *>(data);
EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
EXPECT_TRUE(event->subsurface_watcher != NULL);
- policySurface->bGetSubsurfaceWatcher = true;
+ policySurface->bNewSubsurfaceWatcher = true;
MockPolicySubsurfaceWatcher *policySubsurfaceWatcher =
new MockPolicySubsurfaceWatcher(event->subsurface_watcher);
return mPolicyPosition;
}
- MockPolicySubsurfaceWatcher*GetSubsurfaceWatcher()
+ MockPolicySubsurfaceWatcher*NewSubsurfaceWatcher()
{
return mPolicySubsurfaceWatcher;
}
bool bGetSupportedAuxHints;
bool bSetFloatingMode;
enum ds_tizen_policy_stack_mode mStackMode;
- bool bGetSubsurfaceWatcher;
+ bool bNewSubsurfaceWatcher;
struct ds_surface *mParentSurface;
uint32_t mSerial;
bool bVideo;
};
SetStackModeListener mSetStackModeListener;
- struct GetSubsurfaceWatcherListener : ::wl_listener {
+ struct NewSubsurfaceWatcherListener : ::wl_listener {
MockPolicySurface *parent;
};
- GetSubsurfaceWatcherListener mGetSubsurfaceWatcherListener;
+ NewSubsurfaceWatcherListener mNewSubsurfaceWatcherListener;
struct SetParentListener : ::wl_listener {
MockPolicySurface *parent;
EXPECT_TRUE(policy_surface->bSetFloatingMode == true);
}
-TEST_F(PolicyTest, Req_PolicySurfaceGetSubsurfaceWatcher)
+TEST_F(PolicyTest, Req_PolicySurfaceNewSubsurfaceWatcher)
{
MockPolicySurface *policy_surface;
uint32_t surface_res_id;
surface_res_id = wl_proxy_get_id((struct wl_proxy *)surface_res);
policy_surface = comp->FindPolicySurfaceWidthResId(surface_res_id);
- EXPECT_TRUE(policy_surface->bGetSubsurfaceWatcher == true);
+ EXPECT_TRUE(policy_surface->bNewSubsurfaceWatcher == true);
tizen_subsurface_watcher_destroy(subsuface_watcher_res);
}