Skip to content

F
Front-End
Commit 6d99acfd authored by Adam Barth's avatar Adam Barth Committed by GitHub
Browse files
Options

Remove dependency on package:mojo (#6413) 

Fixes #5843
parent 09f76449
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 284 deletions
packages/flutter/lib/services.dart
View file @ 6d99acfd
......@@ -2,16 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/// System services exposed to Flutter apps.
/// Platform services exposed to Flutter apps.
///
/// To use, import `package:flutter/services.dart`.
///
/// For example, this library includes [fetch], which fetches data from the
/// network.
///
/// This library depends only on core Dart libraries, the `mojo`,
/// `mojo_services`, and `sky_services` packages, and the `foundation`
/// Flutter library.
/// This library depends only on core Dart libraries and the `foundation`
/// library.
library services;
export 'src/services/asset_bundle.dart';
......@@ -27,7 +23,6 @@ export 'src/services/image_stream.dart';
export 'src/services/path_provider.dart';
export 'src/services/platform_messages.dart';
export 'src/services/raw_keyboard.dart';
export 'src/services/shell.dart';
export 'src/services/system_chrome.dart';
export 'src/services/system_navigator.dart';
export 'src/services/system_sound.dart';
......
packages/flutter/lib/src/services/binding.dart
View file @ 6d99acfd
......@@ -9,7 +9,6 @@ import 'package:flutter/foundation.dart';
import 'asset_bundle.dart';
import 'image_cache.dart';
import 'shell.dart';
import 'platform_messages.dart';
/// Ensures that the [MojoShell] singleton is created synchronously
......@@ -31,7 +30,6 @@ abstract class ServicesBinding extends BindingBase {
super.initInstances();
ui.window
..onPlatformMessage = PlatformMessages.handlePlatformMessage;
new MojoShell();
LicenseRegistry.addLicense(_addLicenses);
}
......
packages/flutter/lib/src/services/image_decoder.dart
View file @ 6d99acfd
......@@ -4,25 +4,7 @@
import 'dart:async';
import 'dart:typed_data';
import 'dart:ui' as ui show Image, decodeImageFromDataPipe, decodeImageFromList;
import 'package:mojo/core.dart' show MojoDataPipeConsumer;
/// Creates an image from a stream of bytes.
///
/// This function drains the given data pipe and attempts to interpret the bytes
/// in the data pipe as an image. If successful, the returned [Future] resolves
/// to the decoded image. Otherwise, the [Future] resolves to [null].
Future<ui.Image> decodeImageFromDataPipe(MojoDataPipeConsumer consumerHandle) {
assert(consumerHandle != null);
assert(consumerHandle.handle != null);
assert(consumerHandle.handle.h != null);
Completer<ui.Image> completer = new Completer<ui.Image>();
ui.decodeImageFromDataPipe(consumerHandle.handle.h, (ui.Image image) {
completer.complete(image);
});
return completer.future;
}
import 'dart:ui' as ui show Image, decodeImageFromList;
/// Creates an image from a list of bytes.
///
......
packages/flutter/lib/src/services/shell.dart deleted 100644 → 0
View file @ 09f76449
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' as ui;
import 'package:mojo/application.dart';
import 'package:mojo/bindings.dart' as bindings;
import 'package:mojo/core.dart' as core;
import 'package:mojo/mojo/service_provider.mojom.dart' as mojom;
import 'package:mojo/mojo/shell.mojom.dart' as mojom;
/// Signature for connecting to services. The generated mojom.dart code has
/// static functions that match this signature on the interface objects. For
/// example, the `mojom.Foo` interface has a `mojom.Foo.connectToService`
/// function that matches this signature.
typedef bindings.Proxy<dynamic> ServiceConnectionCallback(
bindings.ServiceConnector s, String url, [String serviceName]);
/// Signature for replacements for [shell.connectToApplicationService]. If the
/// function returns `null`, then [shell.connectToApplicationService] will fall
/// back to its default behavior.
typedef bindings.Proxy<dynamic> OverrideConnectToService(String url, ServiceConnectionCallback callback);
ApplicationConnection _initEmbedderConnection() {
core.MojoHandle incomingServicesHandle = new core.MojoHandle(ui.MojoServices.takeIncomingServices());
core.MojoHandle outgoingServicesHandle = new core.MojoHandle(ui.MojoServices.takeOutgoingServices());
if (!incomingServicesHandle.isValid || !outgoingServicesHandle.isValid)
return null;
mojom.ServiceProviderProxy incomingServices = new mojom.ServiceProviderProxy.fromHandle(incomingServicesHandle);
mojom.ServiceProviderStub outgoingServices = new mojom.ServiceProviderStub.fromHandle(outgoingServicesHandle);
return new ApplicationConnection(outgoingServices, incomingServices);
}
mojom.ShellProxy _takeShell() {
core.MojoHandle shellHandle = new core.MojoHandle(ui.MojoServices.takeShell());
if (!shellHandle.isValid)
return null;
return new mojom.ShellProxy.fromHandle(shellHandle);
}
mojom.ServiceProviderProxy _takeViewServices() {
core.MojoHandle services = new core.MojoHandle(ui.MojoServices.takeViewServices());
if (!services.isValid)
return null;
return new mojom.ServiceProviderProxy.fromHandle(services);
}
class _ShellServiceConnector extends bindings.ServiceConnector {
@override
void connectToService(String url, bindings.Proxy<dynamic> proxy, [String serviceName]) {
final MojoShell instance = MojoShell.instance;
if (url == null || instance._shell == null) {
// If the application URL is null, it means the service to connect
// to is one provided by the embedder.
// If the applircation URL isn't null but there's no shell, then
// ask the embedder in case it provides it. (For example, if you're
// running on Android without the Mojo shell, then you can obtain
// the media service from the embedder directly, instead of having
// to ask the media application for it.)
// This makes it easier to write an application that works both
// with and without a Mojo environment.
instance._embedderConnection?.requestService(proxy);
return;
}
mojom.ServiceProviderProxy services = new mojom.ServiceProviderProxy.unbound();
instance._shell.connectToApplication(url, services);
core.MojoMessagePipe pipe = new core.MojoMessagePipe();
proxy.ctrl.bind(pipe.endpoints[0]);
services.connectToService_(serviceName, pipe.endpoints[1]);
services.close();
}
}
class _ViewAssociatedServiceConnector extends bindings.ServiceConnector {
final mojom.ServiceProviderProxy _viewServices = _takeViewServices();
@override
void connectToService(String url, bindings.Proxy<dynamic> proxy, [String serviceName]) {
if (_viewServices != null) {
core.MojoMessagePipe pipe = new core.MojoMessagePipe();
proxy.ctrl.bind(pipe.endpoints[0]);
_viewServices.connectToService_(serviceName, pipe.endpoints[1]);
}
}
}
/// Manages connections with embedder-provided services.
class MojoShell {
/// Creates the MojoShell singleton. This constructor can only be called once.
/// If your application uses bindings, it is called by the [ServicesBinding] binding.
/// (See [BindingBase] for more details on bindings. Any application using
/// the Flutter 'rendering' or 'widgets' libraries uses a binding.)
MojoShell() {
assert(_instance == null);
_instance = this;
}
/// The unique instance of this class.
static MojoShell get instance => _instance;
static MojoShell _instance;
final ApplicationConnection _embedderConnection = _initEmbedderConnection();
final mojom.Shell _shell = _takeShell();
final _ShellServiceConnector _shellServiceConnector = new _ShellServiceConnector();
final _ViewAssociatedServiceConnector _viewServiceConnector = new _ViewAssociatedServiceConnector();
/// Whether [connectToApplication] is able to connect to other applications.
bool get canConnectToOtherApplications => _shell != null;
/// Attempts to connect to an application via the Mojo shell.
///
/// Returns `null` if [canConnectToOtherApplications] is false.
ApplicationConnection connectToApplication(String url) {
if (_shell == null)
return null;
mojom.ServiceProviderProxy services = new mojom.ServiceProviderProxy.unbound();
_shell.connectToApplication(url, services);
return new ApplicationConnection(null, services);
}
/// Interceptor for calls to [connectToService] and
/// [connectToViewAssociatedService] so that tests can supply alternative
/// implementations of services (for example, a mock for testing).
OverrideConnectToService overrideConnectToService;
/// Attempts to connect to a service implementing the interface for the given
/// proxy. If an application URL is specified and
/// [canConnectToOtherApplications] is true, the service will be requested
/// from that application. Otherwise, it will be requested from the embedder
/// (the Flutter engine).
///
/// For example, suppose there was a service of type `Foo` that was normally
/// hosted with the URL "mojo:foo" and that was also provided by the Flutter
/// embedder when there is no shell (i.e. when [canConnectToOtherApplications]
/// returns false). The following code (assuming the relevant mojom file
/// declaring `Foo` was imported with the prefix `mojom`) would connect to it,
/// and then invoke the method `bar()` on it:
///
/// ```dart
/// mojom.FooProxy foo = shell.connectToApplicationService(
/// "mojo:foo", mojom.Foo.connectToService);
/// foo.bar();
/// ```
///
/// For examples of mojom files, see the `sky_services` package.
///
/// See also [connectToViewAssociatedService].
bindings.Proxy<dynamic> connectToApplicationService(String url, ServiceConnectionCallback callback) {
bindings.Proxy<dynamic> proxy;
if (overrideConnectToService != null)
proxy = overrideConnectToService(url, callback);
return proxy ?? callback(_shellServiceConnector, url);
}
/// Attempts to connect to a service provided specifically for the current
/// view by the embedder or host platform.
///
/// For example, keyboard services are specific to a view; you can only
/// receive keyboard input when the application's view is the one with focus.
///
/// For example, suppose there was a service of type `Foo` that was provided
/// on a view-by-view basis by the embedder or host platform. The following
/// code (assuming the relevant mojom file declaring `Foo` was imported with
/// the prefix `mojom`) would connect to it, and then invoke the method
/// `bar()` on it:
///
/// ```dart
/// mojom.FooProxy foo = shell.connectToViewAssociatedService(
/// mojom.Foo.connectToService);
/// foo.bar();
/// ```
///
/// For examples of mojom files, see the `sky_services` package.
///
/// See also [connectToService].
bindings.Proxy<dynamic> connectToViewAssociatedService(ServiceConnectionCallback callback) {
bindings.Proxy<dynamic> proxy;
if (overrideConnectToService != null)
proxy = overrideConnectToService(null, callback);
return proxy ?? callback(_viewServiceConnector, null);
}
/// Registers a service to expose to the embedder.
///
/// For example, suppose a Flutter application wanted to provide a service
/// `Foo` to the embedder, that a mojom file declaring `Foo` was imported with
/// the prefix `mojom`, that `package:mojo/core.dart` was imported with the
/// prefix `core`, and that an implementation of the `Foo` service existed in
/// the class `MyFooImplementation`. The following code, run during the
/// binding initialization (i.e. during the same call stack as the call to the
/// [new MojoShell] constructor) would achieve this:
///
/// ```dart
/// shell.provideService(mojom.Foo.serviceName, (core.MojoMessagePipeEndpoint endpoint) {
/// mojom.FooStub foo = new mojom.FooStub.fromEndpoint(endpoint);
/// foo.impl = new MyFooImplementation();
/// });
/// ```
void provideService(String interfaceName, ServiceFactory factory) {
_embedderConnection?.provideService(interfaceName, factory);
}
}
/// The singleton object that manages connections with embedder-provided services.
MojoShell get shell => MojoShell.instance;
packages/flutter_test/lib/flutter_test.dart
View file @ 6d99acfd
......@@ -13,7 +13,6 @@ export 'src/controller.dart';
export 'src/finders.dart';
export 'src/matchers.dart';
export 'src/test_async_utils.dart';
export 'src/service_mocker.dart';
export 'src/stack_manipulation.dart';
export 'src/test_pointer.dart';
export 'src/widget_tester.dart';
packages/flutter_test/lib/src/service_mocker.dart deleted 100644 → 0
View file @ 09f76449
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/services.dart';
import 'package:mojo/bindings.dart' as bindings;
import 'binding.dart';
class _MockServiceConnector extends bindings.ServiceConnector {
String serviceName;
@override
void connectToService(String url, bindings.Proxy<dynamic> proxy, [String serviceName]) {
this.serviceName = serviceName;
}
}
/// Tests can use [ServiceMocker] to register replacement implementations
/// of Mojo services.
class ServiceMocker {
ServiceMocker._() {
TestWidgetsFlutterBinding.ensureInitialized();
shell.overrideConnectToService = _connectToService;
}
// Map of interface names to mock implementations.
Map<String, bindings.Proxy<dynamic>> _interfaceMocks = <String, bindings.Proxy<dynamic>>{};
bindings.Proxy<dynamic> _connectToService(String url, ServiceConnectionCallback callback) {
// TODO(abarth): This is quite awkward. See <https://github.com/domokit/mojo/issues/786>.
_MockServiceConnector connector = new _MockServiceConnector();
callback(connector, url);
return _interfaceMocks[connector.serviceName];
}
/// Provide a mock implementation for a Mojo interface.
void registerMockService(bindings.Proxy<dynamic> mock) {
_interfaceMocks[mock.ctrl.serviceName] = mock;
}
}
/// Instance of the utility class for providing mocks for tests.
///
/// The first time this variable is accessed, it will initialize the
/// [TestWidgetsFlutterBinding] if necessary.
final ServiceMocker serviceMocker = new ServiceMocker._();
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

HIAST - GitLab