firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2425 from abarth/view_owner

Browse Source 
Teaches ChildViewConnection to wrap an existing ViewOwner
This commit is contained in:
Adam Barth 2016-03-04 14:49:31 -08:00
commit 9f14271018
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/flutter/lib/src/rendering/child_view.dart
View File

@ -20,7 +20,7 @@ import 'object.dart';
mojom.ViewProxy _initViewProxy() { mojom.ViewProxy _initViewProxy() {
int viewHandle = ui.takeViewHandle(); int viewHandle = ui.takeViewHandle();
assert(() { assert(() {
if (viewHandle == 0) if (viewHandle == core.MojoHandle.INVALID)
debugPrint('Child view are supported only when running in Mojo shell.'); debugPrint('Child view are supported only when running in Mojo shell.');
return true; return true;
}); });
@ -35,8 +35,12 @@ mojom.ViewProxy _initViewProxy() {
final mojom.ViewProxy _viewProxy = _initViewProxy(); final mojom.ViewProxy _viewProxy = _initViewProxy();
final mojom.View _view = _viewProxy?.ptr; final mojom.View _view = _viewProxy?.ptr;
/// (mojo-only) A connection with a child view.
///
/// Used with the [ChildView] widget to display a child view.
class ChildViewConnection { class ChildViewConnection {
ChildViewConnection({ this.url }) { /// Establishes a connection to the app at the given URL.
ChildViewConnection({ String url }) {
mojom.ViewProviderProxy viewProvider = new mojom.ViewProviderProxy.unbound(); mojom.ViewProviderProxy viewProvider = new mojom.ViewProviderProxy.unbound();
shell.connectToService(url, viewProvider); shell.connectToService(url, viewProvider);
mojom.ServiceProviderProxy incomingServices = new mojom.ServiceProviderProxy.unbound(); mojom.ServiceProviderProxy incomingServices = new mojom.ServiceProviderProxy.unbound();
@ -47,8 +51,16 @@ class ChildViewConnection {
_connection = new ApplicationConnection(outgoingServices, incomingServices); _connection = new ApplicationConnection(outgoingServices, incomingServices);
} }
final String url; /// Wraps an already-established connection ot a child app.
ChildViewConnection.fromViewOwner({
mojom.ViewOwnerProxy viewOwner,
ApplicationConnection connection
}) : _connection = connection, _viewOwner = viewOwner;
/// The underlying application connection to the child app.
///
/// Useful for requesting services from the child app and for providing
/// services to the child app.
ApplicationConnection get connection => _connection; ApplicationConnection get connection => _connection;
ApplicationConnection _connection; ApplicationConnection _connection;
@ -120,18 +132,16 @@ class ChildViewConnection {
..devicePixelRatio = scale; ..devicePixelRatio = scale;
return (await _view.layoutChild(_viewKey, layoutParams)).info; return (await _view.layoutChild(_viewKey, layoutParams)).info;
} }
String toString() {
return '$runtimeType(url: $url)';
}
} }
/// (mojo-only) A view of a child application.
class RenderChildView extends RenderBox { class RenderChildView extends RenderBox {
RenderChildView({ RenderChildView({
ChildViewConnection child, ChildViewConnection child,
double scale double scale
}) : _child = child, _scale = scale; }) : _child = child, _scale = scale;
/// The child to display.
ChildViewConnection get child => _child; ChildViewConnection get child => _child;
ChildViewConnection _child; ChildViewConnection _child;
void set child (ChildViewConnection value) { void set child (ChildViewConnection value) {
@ -150,6 +160,7 @@ class RenderChildView extends RenderBox {
} }
} }
/// The device pixel ratio to provide the child.
double get scale => _scale; double get scale => _scale;
double _scale; double _scale;
void set scale (double value) { void set scale (double value) {