Commit 8599312a authored by Alex Zhang's avatar Alex Zhang Committed by Commit Bot

Return true in BufferFormat enum traits when format is UYVY_422

Added the missing return true and unit tests for both BufferFormat and
BufferUsage enum traits.

Bug: 732825
Change-Id: Idd41676f01a11f7666bf2c1c07621b4b9eae6b4a
Reviewed-on: https://chromium-review.googlesource.com/578211Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Commit-Queue: Xingyu Zhang <staraz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488316}
parent 213738bd
......@@ -111,6 +111,7 @@ struct EnumTraits<gfx::mojom::BufferFormat, gfx::BufferFormat> {
return true;
case gfx::mojom::BufferFormat::UYVY_422:
*out = gfx::BufferFormat::UYVY_422;
return true;
}
NOTREACHED();
return false;
......
......@@ -7,6 +7,7 @@
#include "base/message_loop/message_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/mojo/buffer_types_struct_traits.h"
#include "ui/gfx/mojo/traits_test_service.mojom.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/selection_bound.h"
......@@ -192,4 +193,28 @@ TEST_F(StructTraitsTest, NullGpuMemoryBufferHandle) {
EXPECT_TRUE(output.is_null());
}
TEST_F(StructTraitsTest, BufferFormat) {
using BufferFormatTraits =
mojo::EnumTraits<gfx::mojom::BufferFormat, gfx::BufferFormat>;
BufferFormat output;
mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
for (int i = 0; i <= static_cast<int>(BufferFormat::LAST); ++i) {
BufferFormat input = static_cast<BufferFormat>(i);
BufferFormatTraits::FromMojom(BufferFormatTraits::ToMojom(input), &output);
EXPECT_EQ(output, input);
}
}
TEST_F(StructTraitsTest, BufferUsage) {
using BufferUsageTraits =
mojo::EnumTraits<gfx::mojom::BufferUsage, gfx::BufferUsage>;
BufferUsage output;
mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
for (int i = 0; i <= static_cast<int>(BufferUsage::LAST); ++i) {
BufferUsage input = static_cast<BufferUsage>(i);
BufferUsageTraits::FromMojom(BufferUsageTraits::ToMojom(input), &output);
EXPECT_EQ(output, input);
}
}
} // namespace gfx
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