Commit 89660a79 authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Enable disabled test in ui/gfx/mojo/.

There's no real reason not to run this test on iOS/Android, as they define an
AcceleratedWidget type and the test works correctly when they're serialized
appropriately.  The correct struct traits are obvious, so I don't see any
benefit to not defining them.

Bug: none
Change-Id: I58db88a774abb441bb3af8e7f458040214c5fd93
Reviewed-on: https://chromium-review.googlesource.com/c/1343562Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610907}
parent bb6843b1
...@@ -5,5 +5,7 @@ per-file *.mojom=set noparent ...@@ -5,5 +5,7 @@ per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS per-file *.mojom=file://ipc/SECURITY_OWNERS
per-file *_mojom_traits*.*=set noparent per-file *_mojom_traits*.*=set noparent
per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
per-file *_struct_traits*.*=set noparent
per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
per-file *.typemap=set noparent per-file *.typemap=set noparent
per-file *.typemap=file://ipc/SECURITY_OWNERS per-file *.typemap=file://ipc/SECURITY_OWNERS
...@@ -15,7 +15,7 @@ template <> ...@@ -15,7 +15,7 @@ template <>
struct StructTraits<gfx::mojom::AcceleratedWidgetDataView, struct StructTraits<gfx::mojom::AcceleratedWidgetDataView,
gfx::AcceleratedWidget> { gfx::AcceleratedWidget> {
static uint64_t widget(gfx::AcceleratedWidget widget) { static uint64_t widget(gfx::AcceleratedWidget widget) {
#if defined(OS_WIN) #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_IOS)
return reinterpret_cast<uint64_t>(widget); return reinterpret_cast<uint64_t>(widget);
#elif defined(USE_OZONE) || defined(USE_X11) || defined(OS_MACOSX) #elif defined(USE_OZONE) || defined(USE_X11) || defined(OS_MACOSX)
return static_cast<uint64_t>(widget); return static_cast<uint64_t>(widget);
...@@ -27,7 +27,7 @@ struct StructTraits<gfx::mojom::AcceleratedWidgetDataView, ...@@ -27,7 +27,7 @@ struct StructTraits<gfx::mojom::AcceleratedWidgetDataView,
static bool Read(gfx::mojom::AcceleratedWidgetDataView data, static bool Read(gfx::mojom::AcceleratedWidgetDataView data,
gfx::AcceleratedWidget* out) { gfx::AcceleratedWidget* out) {
#if defined(OS_WIN) #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_IOS)
*out = reinterpret_cast<gfx::AcceleratedWidget>(data.widget()); *out = reinterpret_cast<gfx::AcceleratedWidget>(data.widget());
return true; return true;
#elif defined(USE_OZONE) || defined(USE_X11) || defined(OS_MACOSX) #elif defined(USE_OZONE) || defined(USE_X11) || defined(OS_MACOSX)
......
...@@ -129,15 +129,7 @@ TEST_F(StructTraitsTest, Transform) { ...@@ -129,15 +129,7 @@ TEST_F(StructTraitsTest, Transform) {
EXPECT_EQ(col4row4, output.matrix().get(3, 3)); EXPECT_EQ(col4row4, output.matrix().get(3, 3));
} }
// AcceleratedWidgets can only be sent between processes on some platforms. TEST_F(StructTraitsTest, AcceleratedWidget) {
#if defined(OS_WIN) || defined(USE_OZONE) || defined(USE_X11) || \
defined(OS_MACOSX)
#define MAYBE_AcceleratedWidget AcceleratedWidget
#else
#define MAYBE_AcceleratedWidget DISABLED_AcceleratedWidget
#endif
TEST_F(StructTraitsTest, MAYBE_AcceleratedWidget) {
gfx::AcceleratedWidget input(CastToAcceleratedWidget(1001)); gfx::AcceleratedWidget input(CastToAcceleratedWidget(1001));
gfx::AcceleratedWidget output; gfx::AcceleratedWidget output;
mojo::test::SerializeAndDeserialize<gfx::mojom::AcceleratedWidget>(&input, mojo::test::SerializeAndDeserialize<gfx::mojom::AcceleratedWidget>(&input,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment