Skip to content

Commit

Permalink
Revert "Reland: "Always use texture layer when displaying an Android …
Browse files Browse the repository at this point in the history 
…view" (#100237)" (#100660)

This reverts commit d92fedc.
  • Loading branch information
Emmanuel Garcia authored Mar 24, 2022
1 parent 6e13f3d commit 19680c3
Show file tree
Hide file tree
Showing 8 changed files with 261 additions and 168 deletions.
8 changes: 6 additions & 2 deletions dev/integration_tests/hybrid_android_views/test_driver/main_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ Future<void> main() async {
expect(
await driver.requestData('hierarchy'),
'|-FlutterView\n'
' |-FlutterSurfaceView\n' // Flutter UI
' |-FlutterSurfaceView\n' // Flutter UI (hidden)
' |-FlutterImageView\n' // Flutter UI (background surface)
' |-ViewGroup\n' // Platform View
' |-ViewGroup\n'
' |-FlutterImageView\n' // Flutter UI (overlay surface)
);

// Hide platform view.
Expand All @@ -99,9 +101,11 @@ Future<void> main() async {
expect(
await driver.requestData('hierarchy'),
'|-FlutterView\n'
' |-FlutterSurfaceView\n' // Flutter UI
' |-FlutterSurfaceView\n' // Flutter UI (hidden)
' |-FlutterImageView\n' // Flutter UI (background surface)
' |-ViewGroup\n' // Platform View
' |-ViewGroup\n'
' |-FlutterImageView\n' // Flutter UI (overlay surface)
);
}, timeout: Timeout.none);
});
Expand Down
84 changes: 43 additions & 41 deletions packages/flutter/lib/src/rendering/platform_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Set<Type> _factoriesTypeSet<T>(Set<Factory<T>> factories) {

/// A render object for an Android view.
///
/// Requires Android API level 23 or greater.
/// Requires Android API level 20 or greater.
///
/// [RenderAndroidView] is responsible for sizing, displaying and passing touch events to an
/// Android [View](https://developer.android.com/reference/android/view/View).
Expand All @@ -74,7 +74,7 @@ Set<Type> _factoriesTypeSet<T>(Set<Factory<T>> factories) {
///
/// * [AndroidView] which is a widget that is used to show an Android view.
/// * [PlatformViewsService] which is a service for controlling platform views.
class RenderAndroidView extends PlatformViewRenderBox {
class RenderAndroidView extends RenderBox with _PlatformViewGestureMixin {
/// Creates a render object for an Android view.
RenderAndroidView({
required AndroidViewController viewController,
Expand All @@ -86,8 +86,7 @@ class RenderAndroidView extends PlatformViewRenderBox {
assert(gestureRecognizers != null),
assert(clipBehavior != null),
_viewController = viewController,
_clipBehavior = clipBehavior,
super(controller: viewController, hitTestBehavior: hitTestBehavior, gestureRecognizers: gestureRecognizers) {
_clipBehavior = clipBehavior {
_viewController.pointTransformer = (Offset offset) => globalToLocal(offset);
updateGestureRecognizers(gestureRecognizers);
_viewController.addOnPlatformViewCreatedListener(_onPlatformViewCreated);
Expand All @@ -102,22 +101,18 @@ class RenderAndroidView extends PlatformViewRenderBox {
bool _isDisposed = false;

/// The Android view controller for the Android view associated with this render object.
@override
AndroidViewController get controller => _viewController;

AndroidViewController get viewController => _viewController;
AndroidViewController _viewController;

/// Sets a new Android view controller.
@override
set controller(AndroidViewController controller) {
///
/// `viewController` must not be null.
set viewController(AndroidViewController viewController) {
assert(_viewController != null);
assert(controller != null);
if (_viewController == controller)
assert(viewController != null);
if (_viewController == viewController)
return;
_viewController.removeOnPlatformViewCreatedListener(_onPlatformViewCreated);
super.controller = controller;
_viewController = controller;
_viewController.pointTransformer = (Offset offset) => globalToLocal(offset);
_viewController = viewController;
_sizePlatformView();
if (_viewController.isCreated) {
markNeedsSemanticsUpdate();
Expand All @@ -143,6 +138,26 @@ class RenderAndroidView extends PlatformViewRenderBox {
markNeedsSemanticsUpdate();
}

/// {@template flutter.rendering.RenderAndroidView.updateGestureRecognizers}
/// Updates which gestures should be forwarded to the platform view.
///
/// Gesture recognizers created by factories in this set participate in the gesture arena for each
/// pointer that was put down on the render box. If any of the recognizers on this list wins the
/// gesture arena, the entire pointer event sequence starting from the pointer down event
/// will be dispatched to the Android view.
///
/// The `gestureRecognizers` property must not contain more than one factory with the same [Factory.type].
///
/// Setting a new set of gesture recognizer factories with the same [Factory.type]s as the current
/// set has no effect, because the factories' constructors would have already been called with the previous set.
/// {@endtemplate}
///
/// Any active gesture arena the Android view participates in is rejected when the
/// set of gesture recognizers is changed.
void updateGestureRecognizers(Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers) {
_updateGestureRecognizersWithCallBack(gestureRecognizers, _viewController.dispatchPointerEvent);
}

@override
bool get sizedByParent => true;

Expand All @@ -167,8 +182,9 @@ class RenderAndroidView extends PlatformViewRenderBox {
// Android virtual displays cannot have a zero size.
// Trying to size it to 0 crashes the app, which was happening when starting the app
// with a locked screen (see: https://github.com/flutter/flutter/issues/20456).
if (_state == _PlatformViewState.resizing || size.isEmpty)
if (_state == _PlatformViewState.resizing || size.isEmpty) {
return;
}

_state = _PlatformViewState.resizing;
markNeedsPaint();
Expand Down Expand Up @@ -196,8 +212,7 @@ class RenderAndroidView extends PlatformViewRenderBox {
void _setOffset() {
SchedulerBinding.instance.addPostFrameCallback((_) async {
if (!_isDisposed) {
if (attached)
await _viewController.setOffset(localToGlobal(Offset.zero));
await _viewController.setOffset(localToGlobal(Offset.zero));
// Schedule a new post frame callback.
_setOffset();
}
Expand All @@ -206,7 +221,7 @@ class RenderAndroidView extends PlatformViewRenderBox {

@override
void paint(PaintingContext context, Offset offset) {
if (_viewController.textureId == null || _currentTextureSize == null)
if (_viewController.textureId == null)
return;

// As resizing the Android view happens asynchronously we don't know exactly when is a
Expand Down Expand Up @@ -249,15 +264,14 @@ class RenderAndroidView extends PlatformViewRenderBox {

context.addLayer(TextureLayer(
rect: offset & _currentTextureSize!,
textureId: _viewController.textureId!,
textureId: viewController.textureId!,
));
}

@override
void describeSemanticsConfiguration(SemanticsConfiguration config) {
// Don't call the super implementation since `platformViewId` should
// be set only when the platform view is created, but the concept of
// a "created" platform view belongs to this subclass.
void describeSemanticsConfiguration (SemanticsConfiguration config) {
super.describeSemanticsConfiguration(config);

config.isSemanticBoundary = true;

if (_viewController.isCreated) {
Expand Down Expand Up @@ -325,7 +339,7 @@ class RenderUiKitView extends RenderBox {
// any newly arriving events there's nothing we need to invalidate.
PlatformViewHitTestBehavior hitTestBehavior;

/// {@macro flutter.rendering.PlatformViewRenderBox.updateGestureRecognizers}
/// {@macro flutter.rendering.RenderAndroidView.updateGestureRecognizers}
void updateGestureRecognizers(Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers) {
assert(gestureRecognizers != null);
assert(
Expand Down Expand Up @@ -639,11 +653,11 @@ class PlatformViewRenderBox extends RenderBox with _PlatformViewGestureMixin {
PlatformViewController get controller => _controller;
PlatformViewController _controller;
/// This value must not be null, and setting it to a new value will result in a repaint.
set controller(covariant PlatformViewController controller) {
set controller(PlatformViewController controller) {
assert(controller != null);
assert(controller.viewId != null && controller.viewId > -1);

if (_controller == controller) {
if ( _controller == controller) {
return;
}
final bool needsSemanticsUpdate = _controller.viewId != controller.viewId;
Expand All @@ -654,19 +668,7 @@ class PlatformViewRenderBox extends RenderBox with _PlatformViewGestureMixin {
}
}

/// {@template flutter.rendering.PlatformViewRenderBox.updateGestureRecognizers}
/// Updates which gestures should be forwarded to the platform view.
///
/// Gesture recognizers created by factories in this set participate in the gesture arena for each
/// pointer that was put down on the render box. If any of the recognizers on this list wins the
/// gesture arena, the entire pointer event sequence starting from the pointer down event
/// will be dispatched to the Android view.
///
/// The `gestureRecognizers` property must not contain more than one factory with the same [Factory.type].
///
/// Setting a new set of gesture recognizer factories with the same [Factory.type]s as the current
/// set has no effect, because the factories' constructors would have already been called with the previous set.
/// {@endtemplate}
/// {@macro flutter.rendering.RenderAndroidView.updateGestureRecognizers}
///
/// Any active gesture arena the `PlatformView` participates in is rejected when the
/// set of gesture recognizers is changed.
Expand Down Expand Up @@ -698,7 +700,7 @@ class PlatformViewRenderBox extends RenderBox with _PlatformViewGestureMixin {
}

@override
void describeSemanticsConfiguration(SemanticsConfiguration config) {
void describeSemanticsConfiguration (SemanticsConfiguration config) {
super.describeSemanticsConfiguration(config);
assert(_controller.viewId != null);
config.isSemanticBoundary = true;
Expand Down
Loading

0 comments on commit 19680c3

Please sign in to comment.