Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce the size of Overlay FlutterImageView in HC mode #38393

Merged
merged 13 commits into from
Jan 5, 2023
Merged

Reduce the size of Overlay FlutterImageView in HC mode #38393

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b303bd6
intersect
Nayuta403 Dec 19, 2022
08f0127
add
Nayuta403 Dec 19, 2022
1adf801
test fix
Nayuta403 Dec 19, 2022
fc288eb
fix test
Nayuta403 Dec 19, 2022
dd5b92f
modify
Nayuta403 Dec 20, 2022
c239b41
Merge branch 'flutter:main' into overlay
Nayuta403 Dec 20, 2022
79406de
typo
Nayuta403 Dec 20, 2022
ebca48f
modify
Nayuta403 Dec 20, 2022
d876848
test
Nayuta403 Dec 26, 2022
4d3f85d
Merge branch 'flutter:main' into overlay
Nayuta403 Dec 26, 2022
c525358
Merge branch 'flutter:main' into overlay
Nayuta403 Dec 28, 2022
51cf134
Merge branch 'flutter:main' into overlay
Nayuta403 Jan 3, 2023
827de24
Merge branch 'flutter:main' into overlay
Nayuta403 Jan 5, 2023
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
4 changes: 4 additions & 0 deletions shell/platform/android/external_view_embedder/external_view_embedder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ void AndroidExternalViewEmbedder::SubmitFrame(
for (const SkRect& rect : intersection_rects) {
joined_rect.join(rect);
}

// Get the intersection rect between the current rect
// and the platform view rect.
joined_rect.intersect(current_view_rect);
Nayuta403 marked this conversation as resolved.
Show resolved Hide resolved
}
if (!joined_rect.isEmpty()) {
// Subpixels in the platform may not align with the canvas subpixels.
Expand Down
8 changes: 4 additions & 4 deletions shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
0, 150, 150, 300, 300, 300, 300, stack1));
// The JNI call to display the overlay surface.
EXPECT_CALL(*jni_mock,
FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
FlutterViewDisplayOverlaySurface(0, 150, 150, 100, 100));

auto did_submit_frame = false;
auto surface_frame = std::make_unique<SurfaceFrame>(
Expand Down Expand Up @@ -491,7 +491,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
0, 150, 150, 300, 300, 300, 300, stack1));
// The JNI call to display the overlay surface.
EXPECT_CALL(*jni_mock,
FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
FlutterViewDisplayOverlaySurface(0, 150, 150, 100, 100));

auto did_submit_frame = false;
auto surface_frame = std::make_unique<SurfaceFrame>(
Expand Down Expand Up @@ -776,7 +776,7 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(0, 0, 0, 200, 200,
300, 300, stack1));
EXPECT_CALL(*jni_mock,
FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
FlutterViewDisplayOverlaySurface(0, 50, 50, 150, 150));

SurfaceFrame::FramebufferInfo framebuffer_info;
auto surface_frame = std::make_unique<SurfaceFrame>(
Expand Down Expand Up @@ -865,7 +865,7 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
EXPECT_CALL(*jni_mock, FlutterViewOnDisplayPlatformView(0, 0, 0, 200, 200,
300, 300, stack1));
EXPECT_CALL(*jni_mock,
FlutterViewDisplayOverlaySurface(0, 50, 50, 200, 200));
FlutterViewDisplayOverlaySurface(0, 50, 50, 150, 150));

auto surface_frame = std::make_unique<SurfaceFrame>(
SkSurface::MakeNull(1000, 1000), framebuffer_info,
Expand Down