commit 0b9c5f0defdce901f28e30e7a91e336a7ee9a9bd
author David Worsham <dworsham@google.com> Thu Mar 07 21:06:21 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Mar 08 06:12:18 2019 +0000
tree a41467d5f77b1df3cf65c61dd18b925d23aec847
parent fe1c0f5523178814313d1b6f1ef4727e88864481

[child_view] Add proper token type

SCN-898 #comment
SCN-1291 #comment

Change-Id: If661bf687af2c4ee279f83182627688b95be15a3

public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart

diff --git a/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart b/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart
index b926b31..6ac24dc 100644
--- a/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart
+++ b/public/dart/fuchsia_scenic_flutter/lib/src/child_view_connection.dart
@@ -5,11 +5,10 @@
 import 'dart:async';
 import 'dart:ui';
 
-import 'package:fidl/fidl.dart';
 import 'package:fidl_fuchsia_math/fidl_async.dart';
 import 'package:fidl_fuchsia_ui_gfx/fidl_async.dart' show ImportToken;
+import 'package:fidl_fuchsia_ui_views/fidl_async.dart' show ViewHolderToken;
 import 'package:fidl_fuchsia_ui_viewsv1/fidl_async.dart';
-import 'package:fidl_fuchsia_ui_viewsv1token/fidl_async.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 import 'package:zircon/zircon.dart';
@@ -68,7 +67,7 @@
 
   final ChildViewConnectionCallback _onAvailableCallback;
   final ChildViewConnectionCallback _onUnavailableCallback;
-  ImportToken _viewHolderToken;
+  ViewHolderToken _viewHolderToken;
 
   int _viewKey;
   ViewProperties _currentViewProperties;
@@ -79,25 +78,8 @@
   SceneHost _sceneHost;
   int _attachments = 0;
 
-  /// Deprecated.
-  ChildViewConnection(InterfaceHandle<ViewOwner> viewOwner,
-      {ChildViewConnectionCallback onAvailable,
-      ChildViewConnectionCallback onUnavailable})
-      : this.fromImportToken(
-            ImportToken(
-                value: EventPair(viewOwner?.passChannel()?.passHandle())),
-            onAvailable: onAvailable,
-            onUnavailable: onUnavailable);
-
   /// Constructs |ChildViewConnection| from a token.
-  ChildViewConnection.fromViewHolderToken(EventPair viewHolderToken,
-      {ChildViewConnectionCallback onAvailable,
-      ChildViewConnectionCallback onUnavailable})
-      : this.fromImportToken(ImportToken(value: viewHolderToken),
-            onAvailable: onAvailable, onUnavailable: onUnavailable);
-
-  /// Constructs |ChildViewConnection| from a token.
-  ChildViewConnection.fromImportToken(ImportToken viewHolderToken,
+  ChildViewConnection(ViewHolderToken viewHolderToken,
       {ChildViewConnectionCallback onAvailable,
       ChildViewConnectionCallback onUnavailable})
       : _onAvailableCallback = onAvailable ?? _emptyConnectionCallback,
@@ -106,6 +88,20 @@
     assert(_viewHolderToken?.value != null);
   }
 
+  /// Deprecated.
+  ChildViewConnection.fromViewHolderToken(EventPair viewHolderToken,
+      {ChildViewConnectionCallback onAvailable,
+      ChildViewConnectionCallback onUnavailable})
+      : this(ViewHolderToken(value: viewHolderToken),
+            onAvailable: onAvailable, onUnavailable: onUnavailable);
+
+  /// Deprecated.
+  ChildViewConnection.fromImportToken(ImportToken viewHolderToken,
+      {ChildViewConnectionCallback onAvailable,
+      ChildViewConnectionCallback onUnavailable})
+      : this(ViewHolderToken(value: viewHolderToken.value),
+            onAvailable: onAvailable, onUnavailable: onUnavailable);
+
   bool get _attached => _attachments > 0;
 
   /// TODO add documnetation
@@ -171,7 +167,7 @@
     _viewKey = shared.nextGlobalViewKey();
     shared.globalViewContainer
         .addChild2(_viewKey, _viewHolderToken.value, sceneTokens.second);
-    _viewHolderToken = ImportToken(value: EventPair(null));
+    _viewHolderToken = ViewHolderToken(value: EventPair(null));
     assert(
         !ViewContainerListenerImpl.instance.containsConnectionForKey(_viewKey));
     ViewContainerListenerImpl.instance.addConnectionForKey(_viewKey, this);
@@ -236,7 +232,7 @@
     final EventPairPair viewTokens = new EventPairPair();
     assert(viewTokens.status == ZX.OK);
     ViewContainerListenerImpl.instance.removeConnectionForKey(_viewKey);
-    _viewHolderToken = ImportToken(value: viewTokens.first);
+    _viewHolderToken = ViewHolderToken(value: viewTokens.first);
     shared.globalViewContainer.removeChild2(_viewKey, viewTokens.second);
     _viewKey = null;
     _available = false;