ivi-shell: remove ivi_layout_surface_get_dimension API
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>
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index 2c52ed4..78ac7de 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -96,17 +96,10 @@
test_surface_bad_dimension(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
- struct ivi_layout_surface *ivisurf = NULL;
- int32_t dest_width;
- int32_t dest_height;
iassert(lyt->surface_set_dimension(NULL, 200, 300) == IVI_FAILED);
lyt->commit_changes();
-
- iassert(lyt->surface_get_dimension(NULL, &dest_width, &dest_height) == IVI_FAILED);
- iassert(lyt->surface_get_dimension(ivisurf, NULL, &dest_height) == IVI_FAILED);
- iassert(lyt->surface_get_dimension(ivisurf, &dest_width, NULL) == IVI_FAILED);
}
static void
diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c
index ed31635..44913d6 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -426,32 +426,23 @@
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_surface *ivisurf;
const struct ivi_layout_surface_properties *prop;
- int32_t dest_width;
- int32_t dest_height;
ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0));
runner_assert(ivisurf != NULL);
- runner_assert(lyt->surface_get_dimension(
- ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED);
- runner_assert(dest_width == 1);
- runner_assert(dest_height == 1);
+ prop = lyt->get_properties_of_surface(ivisurf);
+ runner_assert_or_return(prop);
+ runner_assert(prop->dest_width == 1);
+ runner_assert(prop->dest_height == 1);
runner_assert(IVI_SUCCEEDED ==
lyt->surface_set_dimension(ivisurf, 200, 300));
- runner_assert(lyt->surface_get_dimension(
- ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED);
- runner_assert(dest_width == 1);
- runner_assert(dest_height == 1);
+ runner_assert(prop->dest_width == 1);
+ runner_assert(prop->dest_height == 1);
lyt->commit_changes();
- runner_assert(lyt->surface_get_dimension(
- ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED);
- runner_assert(dest_width == 200);
- runner_assert(dest_height == 300);
-
prop = lyt->get_properties_of_surface(ivisurf);
runner_assert_or_return(prop);
runner_assert(prop->dest_width == 200);
@@ -491,8 +482,6 @@
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_surface *ivisurf;
const struct ivi_layout_surface_properties *prop;
- int32_t dest_width;
- int32_t dest_height;
ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0));
runner_assert(ivisurf != NULL);
@@ -516,11 +505,6 @@
lyt->commit_changes();
- runner_assert(lyt->surface_get_dimension(
- ivisurf, &dest_width, &dest_height) == IVI_SUCCEEDED);
- runner_assert(dest_width == 200);
- runner_assert(dest_height == 300);
-
prop = lyt->get_properties_of_surface(ivisurf);
runner_assert_or_return(prop);
runner_assert(prop->dest_width == 200);