| Index: services/ui/public/interfaces/cursor/cursor_struct_traits.cc
|
| diff --git a/services/ui/public/interfaces/cursor/cursor_struct_traits.cc b/services/ui/public/interfaces/cursor/cursor_struct_traits.cc
|
| index 63c6e6a435179708d9f983ab752ff93bf55c226a..5eef86df5baa46f57345b29c2492720a92cf9a2b 100644
|
| --- a/services/ui/public/interfaces/cursor/cursor_struct_traits.cc
|
| +++ b/services/ui/public/interfaces/cursor/cursor_struct_traits.cc
|
| @@ -9,7 +9,6 @@
|
| #include "services/ui/public/interfaces/cursor/cursor.mojom.h"
|
| #include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| -#include "ui/base/cursor/cursor.h"
|
| #include "ui/gfx/geometry/mojo/geometry_struct_traits.h"
|
|
|
| namespace mojo {
|
| @@ -268,6 +267,37 @@ bool EnumTraits<ui::mojom::CursorType, ui::CursorType>::FromMojom(
|
| return false;
|
| }
|
|
|
| +// static
|
| +ui::mojom::CursorSet EnumTraits<ui::mojom::CursorSet, ui::CursorSet>::ToMojom(
|
| + ui::CursorSet input) {
|
| + switch (input) {
|
| + case ui::CursorSet::kNormal:
|
| + return ui::mojom::CursorSet::kNormal;
|
| + case ui::CursorSet::kLarge:
|
| + return ui::mojom::CursorSet::kLarge;
|
| + }
|
| +
|
| + NOTREACHED();
|
| + return ui::mojom::CursorSet::kNormal;
|
| +}
|
| +
|
| +// static
|
| +bool EnumTraits<ui::mojom::CursorSet, ui::CursorSet>::FromMojom(
|
| + ui::mojom::CursorSet input,
|
| + ui::CursorSet* out) {
|
| + switch (input) {
|
| + case ui::mojom::CursorSet::kNormal:
|
| + *out = ui::CursorSet::kNormal;
|
| + return true;
|
| + case ui::mojom::CursorSet::kLarge:
|
| + *out = ui::CursorSet::kLarge;
|
| + return true;
|
| + }
|
| +
|
| + NOTREACHED();
|
| + return false;
|
| +}
|
| +
|
| // static
|
| const base::TimeDelta&
|
| StructTraits<ui::mojom::CursorDataDataView, ui::CursorData>::frame_delay(
|
|
|