From: Sangjin Lee Date: Tue, 8 Nov 2016 10:33:06 +0000 (+0900) Subject: Rename pepper_region_t to pepper_wl_region_t X-Git-Tag: submit/tizen/20161121.084448~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F96362%2F1;p=platform%2Fcore%2Fuifw%2Fpepper.git Rename pepper_region_t to pepper_wl_region_t For remove pixman_region, first rename pepper_region_t. and then add pepper_region_t like pixman_region Change-Id: I59f15b2ea0eb5f42bfe0a9aa9b71fc029939712c --- diff --git a/src/lib/pepper/compositor.c b/src/lib/pepper/compositor.c index f11fbf0..6836cca 100644 --- a/src/lib/pepper/compositor.c +++ b/src/lib/pepper/compositor.c @@ -54,7 +54,7 @@ compositor_create_region(struct wl_client *client, { pepper_compositor_t *compositor = wl_resource_get_user_data(resource); - if (!pepper_region_create(compositor, client, resource, id)) + if (!pepper_wl_region_create(compositor, client, resource, id)) wl_resource_post_no_memory(resource); } @@ -288,14 +288,14 @@ PEPPER_API void pepper_compositor_destroy(pepper_compositor_t *compositor) { pepper_surface_t *surface, *next_surface; - pepper_region_t *region, *next_region; + pepper_wl_region_t *region, *next_region; pepper_list_for_each_safe(surface, next_surface, &compositor->surface_list, link) pepper_surface_destroy(surface); pepper_list_for_each_safe(region, next_region, &compositor->region_list, link) - pepper_region_destroy(region); + pepper_wl_region_destroy(region); if (compositor->subcomp) pepper_subcompositor_destroy(compositor->subcomp); diff --git a/src/lib/pepper/pepper-internal.h b/src/lib/pepper/pepper-internal.h index d03fdd2..b9ccec7 100644 --- a/src/lib/pepper/pepper-internal.h +++ b/src/lib/pepper/pepper-internal.h @@ -41,7 +41,7 @@ #define PEPPER_MAX_OUTPUT_COUNT 32 #define PEPPER_OUTPUT_MAX_TICK_COUNT 10 -typedef struct pepper_region pepper_region_t; +typedef struct pepper_wl_region pepper_wl_region_t; typedef struct pepper_surface_state pepper_surface_state_t; typedef struct pepper_plane_entry pepper_plane_entry_t; typedef struct pepper_input pepper_input_t; @@ -237,7 +237,7 @@ void pepper_surface_send_frame_callback_done(pepper_surface_t *surface, uint32_t time); -struct pepper_region { +struct pepper_wl_region { pepper_object_t base; pepper_compositor_t *compositor; struct wl_resource *resource; @@ -246,14 +246,14 @@ struct pepper_region { pixman_region32_t pixman_region; }; -pepper_region_t * -pepper_region_create(pepper_compositor_t *compositor, +pepper_wl_region_t * +pepper_wl_region_create(pepper_compositor_t *compositor, struct wl_client *client, struct wl_resource *resource, uint32_t id); void -pepper_region_destroy(pepper_region_t *region); +pepper_wl_region_destroy(pepper_wl_region_t *region); void pepper_transform_pixman_region(pixman_region32_t *region, diff --git a/src/lib/pepper/region.c b/src/lib/pepper/region.c index 6e018e6..9cc4dc4 100644 --- a/src/lib/pepper/region.c +++ b/src/lib/pepper/region.c @@ -31,8 +31,8 @@ static void region_resource_destroy_handler(struct wl_resource *resource) { - pepper_region_t *region = wl_resource_get_user_data(resource); - pepper_region_destroy(region); + pepper_wl_region_t *region = wl_resource_get_user_data(resource); + pepper_wl_region_destroy(region); } static void @@ -45,7 +45,7 @@ static void region_add(struct wl_client *client, struct wl_resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) { - pepper_region_t *region = wl_resource_get_user_data(resource); + pepper_wl_region_t *region = wl_resource_get_user_data(resource); pixman_region32_union_rect(®ion->pixman_region, ®ion->pixman_region, x, y, w, h); } @@ -54,7 +54,7 @@ static void region_subtract(struct wl_client *client, struct wl_resource *resource, int32_t x, int32_t y, int32_t w, int32_t h) { - pepper_region_t *region = wl_resource_get_user_data(resource); + pepper_wl_region_t *region = wl_resource_get_user_data(resource); pixman_region32_t rect; pixman_region32_init_rect(&rect, x, y, w, h); @@ -68,13 +68,13 @@ static const struct wl_region_interface region_implementation = { region_subtract, }; -pepper_region_t * -pepper_region_create(pepper_compositor_t *compositor, +pepper_wl_region_t * +pepper_wl_region_create(pepper_compositor_t *compositor, struct wl_client *client, struct wl_resource *resource, uint32_t id) { - pepper_region_t *region = calloc(1, sizeof(pepper_region_t)); + pepper_wl_region_t *region = calloc(1, sizeof(pepper_wl_region_t)); PEPPER_CHECK(region, return NULL, "calloc(0 failed.\n"); region->resource = wl_resource_create(client, &wl_region_interface, 1, id); @@ -98,7 +98,7 @@ error: } void -pepper_region_destroy(pepper_region_t *region) +pepper_wl_region_destroy(pepper_wl_region_t *region) { pixman_region32_fini(®ion->pixman_region); pepper_list_remove(®ion->link); diff --git a/src/lib/pepper/surface.c b/src/lib/pepper/surface.c index 0de7116..dc230cb 100644 --- a/src/lib/pepper/surface.c +++ b/src/lib/pepper/surface.c @@ -204,7 +204,7 @@ surface_set_opaque_region(struct wl_client *client, pepper_surface_t *surface = wl_resource_get_user_data(resource); if (region_resource) { - pepper_region_t *region = wl_resource_get_user_data(region_resource); + pepper_wl_region_t *region = wl_resource_get_user_data(region_resource); pixman_region32_copy(&surface->pending.opaque_region, ®ion->pixman_region); } else { pixman_region32_clear(&surface->pending.opaque_region); @@ -219,7 +219,7 @@ surface_set_input_region(struct wl_client *client, pepper_surface_t *surface = wl_resource_get_user_data(resource); if (region_resource) { - pepper_region_t *region = wl_resource_get_user_data(region_resource); + pepper_wl_region_t *region = wl_resource_get_user_data(region_resource); pixman_region32_copy(&surface->pending.input_region, ®ion->pixman_region); } else { pixman_region32_init_rect(&surface->pending.input_region,