diff --git a/garnet/docs/ui/scenic.md b/garnet/docs/ui/scenic.md index c82f2df87ed28c88631758f4a6a12f452ca78be7..075082e336ac779724426098c0551465044fb687 100644 --- a/garnet/docs/ui/scenic.md +++ b/garnet/docs/ui/scenic.md @@ -277,7 +277,6 @@ make up Scenic. * [Views](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.ui.views) (`fuchsia.ui.views`) * [commands.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.ui.views/commands.fidl) - * [events.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.ui.views/events.fidl) * [Input](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.ui.input) (`fuchsia.ui.input`) * [commands.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.ui.input/commands.fidl) diff --git a/sdk/fidl/fuchsia.ui.views/BUILD.gn b/sdk/fidl/fuchsia.ui.views/BUILD.gn index 006c75d6ef56a6c3a435b8f49dfb002aa5b7d372..07e14596029ec3f6181b0e6c1d73f00b42da9901 100644 --- a/sdk/fidl/fuchsia.ui.views/BUILD.gn +++ b/sdk/fidl/fuchsia.ui.views/BUILD.gn @@ -9,7 +9,6 @@ fidl("fuchsia.ui.views") { sources = [ "commands.fidl", - "events.fidl", "view.fidl", "view_config.fidl", "view_token.fidl", diff --git a/sdk/fidl/fuchsia.ui.views/commands.fidl b/sdk/fidl/fuchsia.ui.views/commands.fidl index bb45d4092edc1b5411b6bc8c5af80305649a1156..a65093c37d582770eb78e1a97133c87ec7413539 100644 --- a/sdk/fidl/fuchsia.ui.views/commands.fidl +++ b/sdk/fidl/fuchsia.ui.views/commands.fidl @@ -4,30 +4,9 @@ library fuchsia.ui.views; -union Command { - CreateViewCmd create_view; - CreateViewHolderCmd create_view_holder; - - AddChildViewCmd add_child_view; - RemoveChildViewCmd remove_child_view; -}; - -struct CreateViewCmd { - uint32 id; - handle<eventpair> token; -}; +// DO NOT USE - Retained for ABI stability in fuchsia.ui.scenic.Command -struct CreateViewHolderCmd { - uint32 id; - handle<eventpair> token; -}; - -struct AddChildViewCmd { - uint32 view_id; - uint32 view_holder_id; -}; - -struct RemoveChildViewCmd { - uint32 view_id; - uint32 view_holder_id; +// DO NOT USE +union Command { + int32 empty; }; diff --git a/sdk/fidl/fuchsia.ui.views/events.fidl b/sdk/fidl/fuchsia.ui.views/events.fidl deleted file mode 100644 index f6a4dc0f62ebd86fd1432a9bd4a1da60767022be..0000000000000000000000000000000000000000 --- a/sdk/fidl/fuchsia.ui.views/events.fidl +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2018 The Fuchsia Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -library fuchsia.ui.views; - -union Event { - ChildViewAttachedEvent child_view_attached; - ChildViewUnavailableEvent child_view_unavailable; -}; - -/// Called when a child view is attached. -struct ChildViewAttachedEvent { - uint32 view_holder_id; -}; - -/// Called when a child view has become unavailable. -/// -/// A child may become unavailable for many reasons such being unregistered -/// by its application, abnormal termination of its application, or -/// cycles being introduced in the view tree. -/// -/// To complete removal of an unavailable child, this view component must -/// call RemoveChild() on its view with |child_key|. -/// -/// The implementation should invoke the callback once the event has -/// been handled. -struct ChildViewUnavailableEvent { - uint32 view_holder_id; -}; diff --git a/sdk/fidl/fuchsia.ui.views/fuchsia.ui.views.api b/sdk/fidl/fuchsia.ui.views/fuchsia.ui.views.api index fcd62d6a64ddf200ef0c027b4cfe235962504916..c0083deabf94977c46cf73d19e0cf8081deb4729 100644 --- a/sdk/fidl/fuchsia.ui.views/fuchsia.ui.views.api +++ b/sdk/fidl/fuchsia.ui.views/fuchsia.ui.views.api @@ -1,6 +1,5 @@ { - "fidl/fuchsia.ui.views/commands.fidl": "2715589e8c75085a4ed91977b2ac9605", - "fidl/fuchsia.ui.views/events.fidl": "4f5c0d69b1c1458f7944c4238798029f", + "fidl/fuchsia.ui.views/commands.fidl": "3b8cf058c392d88a98a1b56b7f1ea809", "fidl/fuchsia.ui.views/view.fidl": "9c4aa0db2f3a312519daf681c6fc6a53", "fidl/fuchsia.ui.views/view_config.fidl": "125d69ad66f6d2fef3b9498b5d8c08c3", "fidl/fuchsia.ui.views/view_token.fidl": "3020ee0c3f85ac734587f6b1a54b0584"