Revert "Update //garnet (flutter#4611)" (flutter#4617)

This reverts commit 47cae4d.
This reverts commit 9b9de0e.

DEPS

@@ -124,7 +124,7 @@ deps = {
    # and not have to specific specific hashes.
 
   'src/garnet':
-   Var('fuchsia_git') + '/garnet' + '@' + 'cf0752b219fc43b8354eb54a9b2c972b278bd428',
+   Var('fuchsia_git') + '/garnet' + '@' + 'b3ba6b6d6ab8ef658278cc43c9f839a8a8d1718e',
 
   'src/topaz':
    Var('fuchsia_git') + '/topaz' + '@' + '1eb2e77be92ed968223b0cea19fe2108e689dcd5',

travis/licenses_golden/licenses_garnet

@@ -1,4 +1,4 @@
-Signature: 9802f335f276857fb831310b9519853c
+Signature: c026b4e5f1684c9cf9432f9ef2b62acc
 
 UNUSED LICENSES:
 
@@ -45,20 +45,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 LIBRARY: garnet
 ORIGIN: ../../../garnet/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../garnet/.cargo/config
 FILE: ../../../garnet/.dir-locals.el
-FILE: ../../../garnet/Cargo.lock
-FILE: ../../../garnet/Cargo.toml
 FILE: ../../../garnet/manifest/garnet
 FILE: ../../../garnet/manifest/minimal
+FILE: ../../../garnet/manifest/skia
 FILE: ../../../garnet/manifest/third_party
-FILE: ../../../garnet/public/lib/amber/fidl/amber.fidl
-FILE: ../../../garnet/public/lib/auth/fidl/auth_provider.fidl
-FILE: ../../../garnet/public/lib/auth/fidl/auth_provider_factory.fidl
-FILE: ../../../garnet/public/lib/auth/fidl/token_manager.fidl
+FILE: ../../../garnet/public/lib/auth/fidl/account_manager/account_provider.fidl
+FILE: ../../../garnet/public/lib/auth/fidl/token_manager/token_provider.fidl
 FILE: ../../../garnet/public/lib/bluetooth/fidl/common.fidl
 FILE: ../../../garnet/public/lib/bluetooth/fidl/control.fidl
-FILE: ../../../garnet/public/lib/bluetooth/fidl/gatt.fidl
 FILE: ../../../garnet/public/lib/bluetooth/fidl/low_energy.fidl
 FILE: ../../../garnet/public/lib/cobalt/fidl/cobalt.fidl
 FILE: ../../../garnet/public/lib/cobalt/fidl/cobalt_controller.fidl
@@ -70,9 +65,6 @@ FILE: ../../../garnet/public/lib/fidl/rust/fidl/src/endpoints.rs
 FILE: ../../../garnet/public/lib/fidl/tools/sublime/FIDL.sublime-syntax
 FILE: ../../../garnet/public/lib/fidl/tools/vim/ftdetect/fidl.vim
 FILE: ../../../garnet/public/lib/fidl/tools/vim/syntax/fidl.vim
-FILE: ../../../garnet/public/lib/fsl/fidl/sized_vmo_transport.fidl
-FILE: ../../../garnet/public/lib/fsl/io/fd.cc
-FILE: ../../../garnet/public/lib/fsl/io/fd.h
 FILE: ../../../garnet/public/lib/fsl/socket/blocking_drain_unittest.cc
 FILE: ../../../garnet/public/lib/fsl/socket/strings_unittest.cc
 FILE: ../../../garnet/public/lib/fsl/tasks/fd_waiter.cc
@@ -82,8 +74,6 @@ FILE: ../../../garnet/public/lib/fsl/threading/thread.cc
 FILE: ../../../garnet/public/lib/fsl/threading/thread.h
 FILE: ../../../garnet/public/lib/fsl/threading/thread_unittest.cc
 FILE: ../../../garnet/public/lib/fsl/vmo/file_unittest.cc
-FILE: ../../../garnet/public/lib/fsl/vmo/sized_vmo.cc
-FILE: ../../../garnet/public/lib/fsl/vmo/sized_vmo.h
 FILE: ../../../garnet/public/lib/fxl/files/directory_unittest.cc
 FILE: ../../../garnet/public/lib/fxl/files/file_descriptor_unittest.cc
 FILE: ../../../garnet/public/lib/fxl/files/path_win.cc
@@ -113,20 +103,19 @@ FILE: ../../../garnet/public/lib/fxl/time/time_point_unittest.cc
 FILE: ../../../garnet/public/lib/images/fidl/image_info.fidl
 FILE: ../../../garnet/public/lib/images/fidl/image_pipe.fidl
 FILE: ../../../garnet/public/lib/images/fidl/memory_type.fidl
-FILE: ../../../garnet/public/lib/mdns/fidl/mdns.fidl
 FILE: ../../../garnet/public/lib/media/audio/lpcm_output_stream.cc
 FILE: ../../../garnet/public/lib/media/audio/lpcm_output_stream.h
 FILE: ../../../garnet/public/lib/media/audio/perceived_level.h
 FILE: ../../../garnet/public/lib/media/audio/types.cc
 FILE: ../../../garnet/public/lib/media/audio/types.h
 FILE: ../../../garnet/public/lib/media/c/audio.h
-FILE: ../../../garnet/public/lib/media/fidl/audio_capturer.fidl
 FILE: ../../../garnet/public/lib/media/fidl/audio_policy_service.fidl
 FILE: ../../../garnet/public/lib/media/fidl/logs/media_source_channel.fidl
 FILE: ../../../garnet/public/lib/media/fidl/net_media_player.fidl
 FILE: ../../../garnet/public/lib/media/fidl/net_media_service.fidl
 FILE: ../../../garnet/public/lib/media/timeline/fidl_type_conversions.h
 FILE: ../../../garnet/public/lib/netconnector/cpp/net_stub_responder.h
+FILE: ../../../garnet/public/lib/netconnector/fidl/mdns.fidl
 FILE: ../../../garnet/public/lib/netstack/c/netconfig.h
 FILE: ../../../garnet/public/lib/power/fidl/power_manager.fidl
 FILE: ../../../garnet/public/lib/svc/cpp/service_namespace.h
@@ -144,7 +133,6 @@ FILE: ../../../garnet/public/lib/test_runner/cpp/reporting/reporter.h
 FILE: ../../../garnet/public/lib/test_runner/cpp/test_runner.h
 FILE: ../../../garnet/public/lib/test_runner/cpp/test_runner_store_impl.cc
 FILE: ../../../garnet/public/lib/test_runner/cpp/test_runner_store_impl.h
-FILE: ../../../garnet/public/lib/time_service/fidl/time_service.fidl
 FILE: ../../../garnet/public/lib/ui/fun/sketchy/fidl/canvas.fidl
 FILE: ../../../garnet/public/lib/ui/fun/sketchy/fidl/ops.fidl
 FILE: ../../../garnet/public/lib/ui/fun/sketchy/fidl/resources.fidl
@@ -181,6 +169,12 @@ FILE: ../../../garnet/public/lib/ui/scenic/fidl/shapes.fidl
 FILE: ../../../garnet/public/lib/ui/scenic/fidl/types.fidl
 FILE: ../../../garnet/public/lib/ui/scenic/fidl_helpers.cc
 FILE: ../../../garnet/public/lib/ui/scenic/fidl_helpers.h
+FILE: ../../../garnet/public/lib/ui/scenic/skia/host_canvas_cycler.cc
+FILE: ../../../garnet/public/lib/ui/scenic/skia/host_canvas_cycler.h
+FILE: ../../../garnet/public/lib/ui/scenic/skia/host_surfaces.cc
+FILE: ../../../garnet/public/lib/ui/scenic/skia/host_surfaces.h
+FILE: ../../../garnet/public/lib/ui/scenic/skia/image_info.cc
+FILE: ../../../garnet/public/lib/ui/scenic/skia/image_info.h
 FILE: ../../../garnet/public/lib/ui/scenic/types.h
 FILE: ../../../garnet/public/lib/ui/sketchy/canvas.cc
 FILE: ../../../garnet/public/lib/ui/sketchy/canvas.h
@@ -189,12 +183,11 @@ FILE: ../../../garnet/public/lib/ui/sketchy/resources.cc
 FILE: ../../../garnet/public/lib/ui/sketchy/resources.h
 FILE: ../../../garnet/public/lib/ui/sketchy/types.cc
 FILE: ../../../garnet/public/lib/ui/sketchy/types.h
+FILE: ../../../garnet/public/lib/ui/view_framework/skia_view.cc
+FILE: ../../../garnet/public/lib/ui/view_framework/skia_view.h
 FILE: ../../../garnet/public/lib/wlan/fidl/wlan_mlme.fidl
 FILE: ../../../garnet/public/lib/wlan/fidl/wlan_mlme_ext.fidl
 FILE: ../../../garnet/public/lib/wlan/fidl/wlan_service.fidl
-FILE: ../../../garnet/tools/vboot_reference/futility_cmds.c
-FILE: ../../../garnet/tools/vboot_reference/uuid/uuid.cc
-FILE: ../../../garnet/tools/vboot_reference/uuid/uuid.h
 ----------------------------------------------------------------------------------------------------
 Copyright 2017 The Fuchsia Authors. All rights reserved.
 
@@ -292,6 +285,7 @@ FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/map_serialization.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/message_header_validator.cc
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/message_header_validator.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/message_internal.h
+FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/no_interface.cc
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/router.cc
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/router.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/shared_data.h
@@ -303,6 +297,7 @@ FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/validation_errors.cc
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/validation_errors.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/map.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/message.h
+FILE: ../../../garnet/public/lib/fidl/cpp/bindings/no_interface.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/string.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/struct_ptr.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/type_converter.h
@@ -397,40 +392,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: garnet
-ORIGIN: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/channel_reader.cc + ../../../garnet/LICENSE
+ORIGIN: ../../../garnet/public/lib/media/audio/lpcm_payload.cc + ../../../garnet/LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/channel_reader.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/channel_reader.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/channel_reader_unittest.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/message_handler.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/message_handler.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/pending_response.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/pending_response.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/proxy_controller.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/proxy_controller.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/proxy_controller_unittest.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/stub.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/stub.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/stub_controller.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/stub_controller.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/stub_controller_unittest.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/weak_stub_controller.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/internal/weak_stub_controller.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/put.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/put_unittest.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/string.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/string.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/string_unittest.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/take.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/take_unittest.cc
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/traits.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/vector.h
-FILE: ../../../garnet/public/lib/fidl/cpp/bindings2/vector_unittest.cc
-FILE: ../../../garnet/public/lib/mdns/cpp/service_subscriber.cc
-FILE: ../../../garnet/public/lib/mdns/cpp/service_subscriber.h
-FILE: ../../../garnet/public/lib/ui/presentation/fidl/display_usage.fidl
+FILE: ../../../garnet/public/lib/media/audio/lpcm_payload.cc
+FILE: ../../../garnet/public/lib/media/audio/lpcm_payload.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2018 The Fuchsia Authors. All rights reserved.
+Copyright 2017 The Fuchsia Authors.All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -461,12 +428,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: garnet
-ORIGIN: ../../../garnet/public/lib/media/audio/lpcm_payload.cc + ../../../garnet/LICENSE
+ORIGIN: ../../../garnet/public/lib/netstack/fidl/netstack.fidl + ../../../LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../garnet/public/lib/media/audio/lpcm_payload.cc
-FILE: ../../../garnet/public/lib/media/audio/lpcm_payload.h
+FILE: ../../../garnet/public/lib/netstack/fidl/netstack.fidl
 ----------------------------------------------------------------------------------------------------
-Copyright 2017 The Fuchsia Authors.All rights reserved.
+Copyright 2013 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -497,11 +463,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: garnet
-ORIGIN: ../../../garnet/public/lib/netstack/fidl/netstack.fidl + ../../../LICENSE
+ORIGIN: ../../../garnet/public/lib/svc/cpp/service_namespace.cc + ../../../LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../garnet/public/lib/netstack/fidl/netstack.fidl
+FILE: ../../../garnet/public/lib/svc/cpp/service_namespace.cc
 ----------------------------------------------------------------------------------------------------
-Copyright 2013 The Chromium Authors. All rights reserved.
+Copyright 2017 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -532,11 +498,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: garnet
-ORIGIN: ../../../garnet/public/lib/svc/cpp/service_namespace.cc + ../../../LICENSE
+ORIGIN: ../../../garnet/public/lib/ui/skia/type_converters.cc + ../../../LICENSE
 TYPE: LicenseType.bsd
-FILE: ../../../garnet/public/lib/svc/cpp/service_namespace.cc
+FILE: ../../../garnet/public/lib/ui/skia/type_converters.cc
+FILE: ../../../garnet/public/lib/ui/skia/type_converters.h
 ----------------------------------------------------------------------------------------------------
-Copyright 2017 The Chromium Authors. All rights reserved.
+Copyright 2016 The Chromium Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -619,11 +586,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 LIBRARY: garnet
 ORIGIN: ../../../topaz/LICENSE
 TYPE: LicenseType.bsd
+FILE: ../../../garnet/public/lib/fidl/c/waiter/async_waiter.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/formatting.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/message_validator.cc
+FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/synchronous_connector.cc
+FILE: ../../../garnet/public/lib/fidl/cpp/bindings/internal/synchronous_connector.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/message_validator.h
 FILE: ../../../garnet/public/lib/fidl/cpp/bindings/synchronous_interface_ptr.h
+FILE: ../../../garnet/public/lib/fidl/cpp/waiter/default.h
 FILE: ../../../garnet/public/lib/fidl/rust/fidl/src/client.rs
+FILE: ../../../garnet/public/lib/fidl/rust/fidl/src/cookiemap.rs
 FILE: ../../../garnet/public/lib/fidl/rust/fidl/src/encoding.rs
 FILE: ../../../garnet/public/lib/fidl/rust/fidl/src/error.rs
 FILE: ../../../garnet/public/lib/fidl/rust/fidl/src/interface.rs
@@ -669,6 +641,7 @@ FILE: ../../../garnet/public/lib/fsl/vmo/strings_unittest.cc
 FILE: ../../../garnet/public/lib/fsl/vmo/vector.h
 FILE: ../../../garnet/public/lib/fsl/vmo/vector_unittest.cc
 FILE: ../../../garnet/public/lib/fsl/vmo/vmo.cc
+FILE: ../../../garnet/public/lib/fsl/waiter/default.cc
 FILE: ../../../garnet/public/lib/fxl/arraysize.h
 FILE: ../../../garnet/public/lib/fxl/arraysize_unittest.cc
 FILE: ../../../garnet/public/lib/fxl/build_config.h
@@ -802,7 +775,6 @@ FILE: ../../../garnet/public/lib/media/fidl/problem.fidl
 FILE: ../../../garnet/public/lib/media/fidl/seeking_reader.fidl
 FILE: ../../../garnet/public/lib/media/fidl/timeline_controller.fidl
 FILE: ../../../garnet/public/lib/media/fidl/timelines.fidl
-FILE: ../../../garnet/public/lib/media/fidl/tts_service.fidl
 FILE: ../../../garnet/public/lib/media/fidl/video_renderer.fidl
 FILE: ../../../garnet/public/lib/media/flog/flog.cc
 FILE: ../../../garnet/public/lib/media/flog/flog.h
@@ -824,6 +796,8 @@ FILE: ../../../garnet/public/lib/media/transport/shared_buffer_set.cc
 FILE: ../../../garnet/public/lib/media/transport/shared_buffer_set.h
 FILE: ../../../garnet/public/lib/media/transport/shared_buffer_set_allocator.cc
 FILE: ../../../garnet/public/lib/media/transport/shared_buffer_set_allocator.h
+FILE: ../../../garnet/public/lib/netconnector/cpp/async_wait.cc
+FILE: ../../../garnet/public/lib/netconnector/cpp/async_wait.h
 FILE: ../../../garnet/public/lib/netconnector/cpp/message_relay.cc
 FILE: ../../../garnet/public/lib/netconnector/cpp/message_relay.h
 FILE: ../../../garnet/public/lib/netconnector/fidl/netconnector.fidl
@@ -843,6 +817,10 @@ FILE: ../../../garnet/public/lib/ui/geometry/fidl/geometry.fidl
 FILE: ../../../garnet/public/lib/ui/input/cpp/formatting.cc
 FILE: ../../../garnet/public/lib/ui/input/cpp/formatting.h
 FILE: ../../../garnet/public/lib/ui/presentation/fidl/presenter.fidl
+FILE: ../../../garnet/public/lib/ui/skia/skia_font_loader.cc
+FILE: ../../../garnet/public/lib/ui/skia/skia_font_loader.h
+FILE: ../../../garnet/public/lib/ui/skia/skia_vmo_data.cc
+FILE: ../../../garnet/public/lib/ui/skia/skia_vmo_data.h
 FILE: ../../../garnet/public/lib/ui/view_framework/view_provider_app.cc
 FILE: ../../../garnet/public/lib/ui/view_framework/view_provider_app.h
 FILE: ../../../garnet/public/lib/ui/views/fidl/view_containers.fidl