mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell: remove ivi_layout_surface_get_orientation API

Browse Source 
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Acked-by: wataru_natsume <wataru_natsume@xddp.denso.co.jp>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Ucan, Emre \(ADITG/SW1\)
2016-03-04 12:50:35 +00:00
committed by Bryce Harrington
parent 18691f0310
commit 4d9001bc49
4 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/ivi-layout-export.h
-10
View File
@@ -338,16 +338,6 @@ struct ivi_layout_interface {
int32_t (*surface_set_orientation)(struct ivi_layout_surface *ivisurf, int32_t (*surface_set_orientation)(struct ivi_layout_surface *ivisurf,
enum wl_output_transform orientation); enum wl_output_transform orientation);
/**
* \brief Gets the orientation of a surface.
*
* \return (enum wl_output_transform)
* if the method call was successful
* \return WL_OUTPUT_TRANSFORM_NORMAL if the method call was failed
*/
enum wl_output_transform
(*surface_get_orientation)(struct ivi_layout_surface *ivisurf);
/** /**
* \brief Set an observer callback for ivi_surface content status change. * \brief Set an observer callback for ivi_surface content status change.
* *
ivi-shell/ivi-layout.c
-12
View File
@@ -2132,17 +2132,6 @@ ivi_layout_surface_set_orientation(struct ivi_layout_surface *ivisurf,
return IVI_SUCCEEDED; return IVI_SUCCEEDED;
} }
static enum wl_output_transform
ivi_layout_surface_get_orientation(struct ivi_layout_surface *ivisurf)
{
if (ivisurf == NULL) {
weston_log("ivi_layout_surface_get_orientation: invalid argument\n");
return 0;
}
return ivisurf->prop.orientation;
}
static int32_t static int32_t
ivi_layout_screen_add_layer(struct ivi_layout_screen *iviscrn, ivi_layout_screen_add_layer(struct ivi_layout_screen *iviscrn,
struct ivi_layout_layer *addlayer) struct ivi_layout_layer *addlayer)
@@ -2647,7 +2636,6 @@ static struct ivi_layout_interface ivi_layout_interface = {
.surface_set_position = ivi_layout_surface_set_position, .surface_set_position = ivi_layout_surface_set_position,
.surface_set_dimension = ivi_layout_surface_set_dimension, .surface_set_dimension = ivi_layout_surface_set_dimension,
.surface_set_orientation = ivi_layout_surface_set_orientation, .surface_set_orientation = ivi_layout_surface_set_orientation,
.surface_get_orientation = ivi_layout_surface_get_orientation,
.surface_set_content_observer = ivi_layout_surface_set_content_observer, .surface_set_content_observer = ivi_layout_surface_set_content_observer,
.surface_add_notification = ivi_layout_surface_add_notification, .surface_add_notification = ivi_layout_surface_add_notification,
.surface_remove_notification = ivi_layout_surface_remove_notification, .surface_remove_notification = ivi_layout_surface_remove_notification,
tests/ivi_layout-internal-test.c
-2
View File
@@ -88,8 +88,6 @@ test_surface_bad_orientation(struct test_context *ctx)
const struct ivi_layout_interface *lyt = ctx->layout_interface; const struct ivi_layout_interface *lyt = ctx->layout_interface;
iassert(lyt->surface_set_orientation(NULL, WL_OUTPUT_TRANSFORM_90) == IVI_FAILED); iassert(lyt->surface_set_orientation(NULL, WL_OUTPUT_TRANSFORM_90) == IVI_FAILED);
iassert(lyt->surface_get_orientation(NULL) == WL_OUTPUT_TRANSFORM_NORMAL);
} }
static void static void
tests/ivi_layout-test-plugin.c
+4 -9
View File
@@ -402,22 +402,17 @@ RUNNER_TEST(surface_orientation)
ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0)); ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0));
runner_assert(ivisurf != NULL); runner_assert(ivisurf != NULL);
runner_assert(lyt->surface_get_orientation(ivisurf) == prop = lyt->get_properties_of_surface(ivisurf);
WL_OUTPUT_TRANSFORM_NORMAL); runner_assert_or_return(prop);
runner_assert(prop->orientation == WL_OUTPUT_TRANSFORM_NORMAL);
runner_assert(lyt->surface_set_orientation( runner_assert(lyt->surface_set_orientation(
ivisurf, WL_OUTPUT_TRANSFORM_90) == IVI_SUCCEEDED); ivisurf, WL_OUTPUT_TRANSFORM_90) == IVI_SUCCEEDED);
runner_assert(lyt->surface_get_orientation(ivisurf) == runner_assert(prop->orientation == WL_OUTPUT_TRANSFORM_NORMAL);
WL_OUTPUT_TRANSFORM_NORMAL);
lyt->commit_changes(); lyt->commit_changes();
runner_assert(lyt->surface_get_orientation(
ivisurf) == WL_OUTPUT_TRANSFORM_90);
prop = lyt->get_properties_of_surface(ivisurf);
runner_assert_or_return(prop);
runner_assert(prop->orientation == WL_OUTPUT_TRANSFORM_90); runner_assert(prop->orientation == WL_OUTPUT_TRANSFORM_90);
} }