From cca1cb2fa1fedf7984eabac70e5c60cfcbf189b3 Mon Sep 17 00:00:00 2001
From: Hixie <github.com@spam.hixie.ch>
Date: Tue, 2 Feb 2016 13:31:49 -0800
Subject: [PATCH] Actually return a SemanticsServer service.

---
 packages/flutter/lib/src/rendering/binding.dart   | 3 ++-
 packages/flutter/lib/src/rendering/semantics.dart | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/flutter/lib/src/rendering/binding.dart b/packages/flutter/lib/src/rendering/binding.dart
index 29fa3e23a3f..55c0c798e9d 100644
--- a/packages/flutter/lib/src/rendering/binding.dart
+++ b/packages/flutter/lib/src/rendering/binding.dart
@@ -68,7 +68,8 @@ abstract class Renderer extends Object with Scheduler, MojoShell
   void initSemantics() {
     SemanticsNode.onSemanticsEnabled = renderView.scheduleInitialSemantics;
     provideService(mojom.SemanticsServer.serviceName, (core.MojoMessagePipeEndpoint endpoint) {
-      return new SemanticsServer();
+      mojom.SemanticsServerStub server = new mojom.SemanticsServerStub.fromEndpoint(endpoint);
+      server.impl = new SemanticsServer();
     });
   }
 
diff --git a/packages/flutter/lib/src/rendering/semantics.dart b/packages/flutter/lib/src/rendering/semantics.dart
index ac27b1db17f..e435172a1a1 100644
--- a/packages/flutter/lib/src/rendering/semantics.dart
+++ b/packages/flutter/lib/src/rendering/semantics.dart
@@ -439,8 +439,8 @@ class SemanticsNode extends AbstractNode {
 }
 
 class SemanticsServer extends mojom.SemanticsServer {
-  void addSemanticsListener(mojom.SemanticsListener listener) {
-    SemanticsNode.addListener(listener);
+  void addSemanticsListener(mojom.SemanticsListenerProxy listener) {
+    SemanticsNode.addListener(listener.ptr);
   }
   void tap(int nodeID) {
     SemanticsNode.getSemanticActionHandlerForId(nodeID, neededFlag: _SemanticFlags.canBeTapped)?.handleSemanticTap();