Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Ensure all images are closed in FlutterImageView #20842

Merged
blasten merged 6 commits into from
Sep 1, 2020
Merged

Ensure all images are closed in FlutterImageView #20842

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b2e67e
Ensure all images are closed in FlutterImageView
Aug 28, 2020
74bddff
Merge remote-tracking branch 'upstream/master' into fix_image_limit
Sep 1, 2020
fc81d61
Lint
Sep 1, 2020
43b9aee
Feedback
Sep 1, 2020
a43b79a
Fixes
Sep 1, 2020
f05d4f9
Use View#onDraw and suppress lint
Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Lint
  • Loading branch information
Emmanuel Garcia committed Sep 1, 2020
commit fc81d61ce851e9b6486b9056afb3ca291292ad18
8 changes: 8 additions & 0 deletions shell/platform/android/io/flutter/embedding/android/FlutterImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ public FlutterImageView(@NonNull Context context, int width, int height, Surface
this(context, createImageReader(width, height), kind);
}

public FlutterImageView(@NonNull Context context) {
this(context, 1, 1, SurfaceKind.background);
}

public FlutterImageView(@NonNull Context context, @NonNull AttributeSet attrs) {
Copy link
Member

@jason-simmons jason-simmons Sep 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the import for AttributeSet

Copy link
Author

@blasten blasten Sep 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♂️

this(context, 1, 1, SurfaceKind.background);
}

@VisibleForTesting
FlutterImageView(@NonNull Context context, @NonNull ImageReader imageReader, SurfaceKind kind) {
super(context, null);
Expand Down
8 changes: 4 additions & 4 deletions shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,24 +601,24 @@ public void flutterImageView_onDrawClosesAllImages() {
imageView.acquireLatestImage();
imageView.acquireLatestImage();

imageView.onDraw(mock(Canvas.class));
imageView.onDraw(mock(Canvas.class));
imageView.draw(mock(Canvas.class));
imageView.draw(mock(Canvas.class));

// 1 image is closed and 1 is active.
verify(mockImage, times(1)).close();
verify(mockReader, times(2)).acquireLatestImage();

// This call doesn't do anything because there isn't
// an image in the queue.
imageView.onDraw(mock(Canvas.class));
imageView.draw(mock(Canvas.class));
verify(mockImage, times(1)).close();

// Aquire another image and push it to the queue.
imageView.acquireLatestImage();
verify(mockReader, times(3)).acquireLatestImage();

// Then, the second image is closed.
imageView.onDraw(mock(Canvas.class));
imageView.draw(mock(Canvas.class));
verify(mockImage, times(2)).close();
}
/*
Expand Down