Commit deb9d0b3 authored by Adam Barth's avatar Adam Barth

Remove references to dart:ui_internals

This library is being folded into dart:ui.

Fixes #83
parent aa90a9f4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:async'; import 'dart:async';
import 'dart:ui_internals' as internals; import 'dart:ui' as ui;
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:mojo_services/mojo/gfx/composition/scene_token.mojom.dart' as mojom; import 'package:mojo_services/mojo/gfx/composition/scene_token.mojom.dart' as mojom;
...@@ -18,7 +18,7 @@ import 'box.dart'; ...@@ -18,7 +18,7 @@ import 'box.dart';
import 'object.dart'; import 'object.dart';
mojom.ViewHostProxy _initViewHostProxy() { mojom.ViewHostProxy _initViewHostProxy() {
int viewHost = internals.takeViewHostHandle(); int viewHost = ui.takeViewHostHandle();
assert(() { assert(() {
if (viewHost == 0) if (viewHost == 0)
debugPrint('Child view are supported only when running in Mojo shell.'); debugPrint('Child view are supported only when running in Mojo shell.');
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:async'; import 'dart:async';
import 'dart:ui_internals' as internals; import 'dart:ui' as ui;
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:flutter/http.dart' as http; import 'package:flutter/http.dart' as http;
...@@ -95,7 +95,7 @@ class MojoAssetBundle extends CachingAssetBundle { ...@@ -95,7 +95,7 @@ class MojoAssetBundle extends CachingAssetBundle {
AssetBundle _initRootBundle() { AssetBundle _initRootBundle() {
try { try {
AssetBundleProxy bundle = new AssetBundleProxy.fromHandle( AssetBundleProxy bundle = new AssetBundleProxy.fromHandle(
new core.MojoHandle(internals.takeRootBundleHandle()) new core.MojoHandle(ui.takeRootBundleHandle())
); );
return new MojoAssetBundle(bundle); return new MojoAssetBundle(bundle);
} catch (e) { } catch (e) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui_internals' as internals; import 'dart:ui' as ui;
import 'package:mojo/application.dart'; import 'package:mojo/application.dart';
import 'package:mojo/bindings.dart' as bindings; import 'package:mojo/bindings.dart' as bindings;
...@@ -55,7 +55,7 @@ abstract class MojoShell extends BindingBase { ...@@ -55,7 +55,7 @@ abstract class MojoShell extends BindingBase {
static MojoShell get instance => _instance; static MojoShell get instance => _instance;
static mojom.ShellProxy _initShellProxy() { static mojom.ShellProxy _initShellProxy() {
core.MojoHandle shellHandle = new core.MojoHandle(internals.takeShellProxyHandle()); core.MojoHandle shellHandle = new core.MojoHandle(ui.takeShellProxyHandle());
if (!shellHandle.isValid) if (!shellHandle.isValid)
return null; return null;
return new mojom.ShellProxy.fromHandle(shellHandle); return new mojom.ShellProxy.fromHandle(shellHandle);
...@@ -63,8 +63,8 @@ abstract class MojoShell extends BindingBase { ...@@ -63,8 +63,8 @@ abstract class MojoShell extends BindingBase {
final mojom.Shell _shell = _initShellProxy()?.ptr; final mojom.Shell _shell = _initShellProxy()?.ptr;
static ApplicationConnection _initEmbedderConnection() { static ApplicationConnection _initEmbedderConnection() {
core.MojoHandle servicesHandle = new core.MojoHandle(internals.takeServicesProvidedByEmbedder()); core.MojoHandle servicesHandle = new core.MojoHandle(ui.takeServicesProvidedByEmbedder());
core.MojoHandle exposedServicesHandle = new core.MojoHandle(internals.takeServicesProvidedToEmbedder()); core.MojoHandle exposedServicesHandle = new core.MojoHandle(ui.takeServicesProvidedToEmbedder());
if (!servicesHandle.isValid || !exposedServicesHandle.isValid) if (!servicesHandle.isValid || !exposedServicesHandle.isValid)
return null; return null;
mojom.ServiceProviderProxy services = new mojom.ServiceProviderProxy.fromHandle(servicesHandle); mojom.ServiceProviderProxy services = new mojom.ServiceProviderProxy.fromHandle(servicesHandle);
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui_internals' as internals; import 'dart:ui' as ui;
import 'package:mojo_services/mojo/service_registry.mojom.dart'; import 'package:mojo_services/mojo/service_registry.mojom.dart';
import 'package:mojo/core.dart' as core; import 'package:mojo/core.dart' as core;
ServiceRegistryProxy _initServiceRegistryProxy() { ServiceRegistryProxy _initServiceRegistryProxy() {
core.MojoHandle serviceRegistryHandle = new core.MojoHandle(internals.takeServiceRegistry()); core.MojoHandle serviceRegistryHandle = new core.MojoHandle(ui.takeServiceRegistry());
if (!serviceRegistryHandle.isValid) if (!serviceRegistryHandle.isValid)
return null; return null;
return new ServiceRegistryProxy.fromHandle(serviceRegistryHandle); return new ServiceRegistryProxy.fromHandle(serviceRegistryHandle);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment