mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ivi-shell: remove ivi_layout_surface_set_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>
This commit is contained in:
Ucan, Emre \(ADITG/SW1\) 2016-03-04 12:50:50 +00:00 committed by Bryce Harrington
parent e62bfd8d5e
commit 45d3942816
5 changed files with 2 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ivi-shell/ivi-layout-export.h
View File

@ -311,15 +311,6 @@ struct ivi_layout_interface {
int32_t x, int32_t y,
int32_t width, int32_t height);
/**
* \brief Set the horizontal and vertical dimension of the surface.
*
* \return IVI_SUCCEEDED if the method call was successful
* \return IVI_FAILED if the method call was failed
*/
int32_t (*surface_set_dimension)(struct ivi_layout_surface *ivisurf,
int32_t dest_width, int32_t dest_height);
/**
* \brief Sets the orientation of a ivi_surface.
*

25
ivi-shell/ivi-layout.c
View File

@ -2029,30 +2029,6 @@ ivi_layout_surface_set_destination_rectangle(struct ivi_layout_surface *ivisurf,
return IVI_SUCCEEDED;
}
static int32_t
ivi_layout_surface_set_dimension(struct ivi_layout_surface *ivisurf,
int32_t dest_width, int32_t dest_height)
{
struct ivi_layout_surface_properties *prop = NULL;
if (ivisurf == NULL) {
weston_log("ivi_layout_surface_set_dimension: invalid argument\n");
return IVI_FAILED;
}
prop = &ivisurf->pending.prop;
prop->dest_width = dest_width;
prop->dest_height = dest_height;
if (ivisurf->prop.dest_width != dest_width ||
ivisurf->prop.dest_height != dest_height)
ivisurf->event_mask |= IVI_NOTIFICATION_DIMENSION;
else
ivisurf->event_mask &= ~IVI_NOTIFICATION_DIMENSION;
return IVI_SUCCEEDED;
}
static int32_t
ivi_layout_surface_set_orientation(struct ivi_layout_surface *ivisurf,
enum wl_output_transform orientation)
@ -2576,7 +2552,6 @@ static struct ivi_layout_interface ivi_layout_interface = {
.surface_set_opacity = ivi_layout_surface_set_opacity,
.surface_set_source_rectangle = ivi_layout_surface_set_source_rectangle,
.surface_set_destination_rectangle = ivi_layout_surface_set_destination_rectangle,
.surface_set_dimension = ivi_layout_surface_set_dimension,
.surface_set_orientation = ivi_layout_surface_set_orientation,
.surface_set_content_observer = ivi_layout_surface_set_content_observer,
.surface_add_notification = ivi_layout_surface_add_notification,

11
tests/ivi_layout-internal-test.c
View File

@ -90,16 +90,6 @@ test_surface_bad_orientation(struct test_context *ctx)
iassert(lyt->surface_set_orientation(NULL, WL_OUTPUT_TRANSFORM_90) == IVI_FAILED);
}
static void
test_surface_bad_dimension(struct test_context *ctx)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
iassert(lyt->surface_set_dimension(NULL, 200, 300) == IVI_FAILED);
lyt->commit_changes();
}
static void
test_surface_bad_source_rectangle(struct test_context *ctx)
{
@ -1001,7 +991,6 @@ run_internal_tests(void *data)
test_surface_bad_visibility(ctx);
test_surface_bad_destination_rectangle(ctx);
test_surface_bad_orientation(ctx);
test_surface_bad_dimension(ctx);
test_surface_bad_source_rectangle(ctx);
test_surface_bad_properties(ctx);

14
tests/ivi_layout-test-plugin.c
View File

@ -431,7 +431,8 @@ RUNNER_TEST(surface_dimension)
runner_assert(prop->dest_height == 1);
runner_assert(IVI_SUCCEEDED ==
lyt->surface_set_dimension(ivisurf, 200, 300));
lyt->surface_set_destination_rectangle(ivisurf, prop->dest_x,
prop->dest_y, 200, 300));
runner_assert(prop->dest_width == 1);
runner_assert(prop->dest_height == 1);
@ -621,17 +622,6 @@ RUNNER_TEST(commit_changes_after_orientation_set_surface_destroy)
ivisurf, WL_OUTPUT_TRANSFORM_90) == IVI_SUCCEEDED);
}
RUNNER_TEST(commit_changes_after_dimension_set_surface_destroy)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;
struct ivi_layout_surface *ivisurf;
ivisurf = lyt->get_surface_from_id(IVI_TEST_SURFACE_ID(0));
runner_assert(ivisurf != NULL);
runner_assert(lyt->surface_set_dimension(
ivisurf, 200, 300) == IVI_SUCCEEDED);
}
RUNNER_TEST(commit_changes_after_source_rectangle_set_surface_destroy)
{
const struct ivi_layout_interface *lyt = ctx->layout_interface;

1
tests/ivi_layout-test.c
View File

@ -204,7 +204,6 @@ const char * const surface_property_commit_changes_test_names[] = {
"commit_changes_after_visibility_set_surface_destroy",
"commit_changes_after_opacity_set_surface_destroy",
"commit_changes_after_orientation_set_surface_destroy",
"commit_changes_after_dimension_set_surface_destroy",
"commit_changes_after_source_rectangle_set_surface_destroy",
"commit_changes_after_destination_rectangle_set_surface_destroy",
};