From ab4e195bb096dd05cc819f4c7b115c51033f21b4 Mon Sep 17 00:00:00 2001 From: Casey Hillers Date: Sun, 14 May 2023 21:34:28 -0700 Subject: [PATCH 1/2] Reland "Remove GN staging flag for save layer bounds" (#42029) Reverts flutter/engine#42026 After investigating, this is a bug fix for the scubas. --- tools/gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/gn b/tools/gn index 510662fd40cfd..1b2b52fc9e5c4 100755 --- a/tools/gn +++ b/tools/gn @@ -300,8 +300,6 @@ def to_gn_args(args): gn_args['skia_use_wuffs'] = True gn_args['skia_use_expat'] = args.target_os == 'android' gn_args['skia_use_fontconfig'] = args.enable_fontconfig - gn_args['skia_use_legacy_layer_bounds' - ] = True # Temporary: See skbug.com/12083, skbug.com/12303. gn_args['skia_use_icu'] = True gn_args['is_official_build'] = True # Disable Skia test utilities. gn_args['android_full_debug' From 4c2f1396d565c5820231fc9d96f9f701104c3c9a Mon Sep 17 00:00:00 2001 From: Casey Hillers Date: Sun, 14 May 2023 22:29:19 -0700 Subject: [PATCH 2/2] [Impeller] Include AndroidSurfaceVulkanImpeller behind a flag (#42033) Fixes b/282290672 Google Testing currently does not support vulkan, and constructors like this need to be behind a flag. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [ ] I listed at least one issue that this PR fixes in the description above. - [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. --- shell/platform/android/platform_view_android.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc index 769f1a0feae8f..4eba5cdc9b8ed 100644 --- a/shell/platform/android/platform_view_android.cc +++ b/shell/platform/android/platform_view_android.cc @@ -51,9 +51,16 @@ std::unique_ptr AndroidSurfaceFactoryImpl::CreateSurface() { } case AndroidRenderingAPI::kVulkan: FML_DCHECK(enable_impeller_); - return std::make_unique( + // TODO(kaushikiska@): Enable this after wiring a preference for Vulkan + // backend. +#if false + return std::make_unique( std::static_pointer_cast( android_context_)); +#else + return std::make_unique( + std::static_pointer_cast(android_context_)); +#endif default: FML_DCHECK(false); return nullptr;