[Android] Support HC platform views without thread merging.

impeller/renderer/backend/vulkan/swapchain/khr/khr_swapchain_impl_vk.cc

@@ -471,7 +471,7 @@ bool KHRSwapchainImplVK::Present(
       break;
     default:
       VALIDATION_LOG << "Could not present queue: " << vk::to_string(result);
-      break;
+      return false;
   }
 
   return true;

shell/common/animator.cc

@@ -28,21 +28,9 @@ Animator::Animator(Delegate& delegate,
     : delegate_(delegate),
       task_runners_(task_runners),
       waiter_(std::move(waiter)),
-#if SHELL_ENABLE_METAL
       layer_tree_pipeline_(std::make_shared<FramePipeline>(2)),
-#else   // SHELL_ENABLE_METAL
-      // TODO(dnfield): We should remove this logic and set the pipeline depth
-      // back to 2 in this case. See
-      // https://github.com/flutter/engine/pull/9132 for discussion.
-      layer_tree_pipeline_(std::make_shared<FramePipeline>(
-          task_runners.GetPlatformTaskRunner() ==
-                  task_runners.GetRasterTaskRunner()
-              ? 1
-              : 2)),
-#endif  // SHELL_ENABLE_METAL
       pending_frame_semaphore_(1),
-      weak_factory_(this) {
-}
+      weak_factory_(this) {}
 
 Animator::~Animator() = default;
 

shell/platform/android/android_shell_holder_unittests.cc

@@ -7,108 +7,11 @@
 #include "flutter/shell/platform/android/android_shell_holder.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "shell/platform/android/jni/platform_view_android_jni.h"
+#include "shell/platform/android/jni/jni_mock.h"
 
 namespace flutter {
 namespace testing {
 namespace {
-class MockPlatformViewAndroidJNI : public PlatformViewAndroidJNI {
- public:
-  MOCK_METHOD(void,
-              FlutterViewHandlePlatformMessage,
-              (std::unique_ptr<flutter::PlatformMessage> message,
-               int responseId),
-              (override));
-  MOCK_METHOD(void,
-              FlutterViewHandlePlatformMessageResponse,
-              (int responseId, std::unique_ptr<fml::Mapping> data),
-              (override));
-  MOCK_METHOD(void,
-              FlutterViewUpdateSemantics,
-              (std::vector<uint8_t> buffer,
-               std::vector<std::string> strings,
-               std::vector<std::vector<uint8_t>> string_attribute_args),
-              (override));
-  MOCK_METHOD(void,
-              FlutterViewUpdateCustomAccessibilityActions,
-              (std::vector<uint8_t> actions_buffer,
-               std::vector<std::string> strings),
-              (override));
-  MOCK_METHOD(void, FlutterViewOnFirstFrame, (), (override));
-  MOCK_METHOD(void, FlutterViewOnPreEngineRestart, (), (override));
-  MOCK_METHOD(void,
-              SurfaceTextureAttachToGLContext,
-              (JavaLocalRef surface_texture, int textureId),
-              (override));
-  MOCK_METHOD(bool,
-              SurfaceTextureShouldUpdate,
-              (JavaLocalRef surface_texture),
-              (override));
-  MOCK_METHOD(void,
-              SurfaceTextureUpdateTexImage,
-              (JavaLocalRef surface_texture),
-              (override));
-  MOCK_METHOD(SkM44,
-              SurfaceTextureGetTransformMatrix,
-              (JavaLocalRef surface_texture),
-              (override));
-  MOCK_METHOD(void,
-              SurfaceTextureDetachFromGLContext,
-              (JavaLocalRef surface_texture),
-              (override));
-  MOCK_METHOD(JavaLocalRef,
-              ImageProducerTextureEntryAcquireLatestImage,
-              (JavaLocalRef image_texture_entry),
-              (override));
-  MOCK_METHOD(JavaLocalRef,
-              ImageGetHardwareBuffer,
-              (JavaLocalRef image),
-              (override));
-  MOCK_METHOD(void, ImageClose, (JavaLocalRef image), (override));
-  MOCK_METHOD(void,
-              HardwareBufferClose,
-              (JavaLocalRef hardware_buffer),
-              (override));
-  MOCK_METHOD(void,
-              FlutterViewOnDisplayPlatformView,
-              (int view_id,
-               int x,
-               int y,
-               int width,
-               int height,
-               int viewWidth,
-               int viewHeight,
-               MutatorsStack mutators_stack),
-              (override));
-  MOCK_METHOD(void,
-              FlutterViewDisplayOverlaySurface,
-              (int surface_id, int x, int y, int width, int height),
-              (override));
-  MOCK_METHOD(void, FlutterViewBeginFrame, (), (override));
-  MOCK_METHOD(void, FlutterViewEndFrame, (), (override));
-  MOCK_METHOD(std::unique_ptr<PlatformViewAndroidJNI::OverlayMetadata>,
-              FlutterViewCreateOverlaySurface,
-              (),
-              (override));
-  MOCK_METHOD(void, FlutterViewDestroyOverlaySurfaces, (), (override));
-  MOCK_METHOD(std::unique_ptr<std::vector<std::string>>,
-              FlutterViewComputePlatformResolvedLocale,
-              (std::vector<std::string> supported_locales_data),
-              (override));
-  MOCK_METHOD(double, GetDisplayRefreshRate, (), (override));
-  MOCK_METHOD(double, GetDisplayWidth, (), (override));
-  MOCK_METHOD(double, GetDisplayHeight, (), (override));
-  MOCK_METHOD(double, GetDisplayDensity, (), (override));
-  MOCK_METHOD(bool,
-              RequestDartDeferredLibrary,
-              (int loading_unit_id),
-              (override));
-  MOCK_METHOD(double,
-              FlutterViewGetScaledFontSize,
-              (double font_size, int configuration_id),
-              (const, override));
-};
-
 class MockPlatformMessageResponse : public PlatformMessageResponse {
  public:
   static fml::RefPtr<MockPlatformMessageResponse> Create() {
@@ -122,7 +25,7 @@ class MockPlatformMessageResponse : public PlatformMessageResponse {
 TEST(AndroidShellHolder, Create) {
   Settings settings;
   settings.enable_software_rendering = false;
-  auto jni = std::make_shared<MockPlatformViewAndroidJNI>();
+  auto jni = std::make_shared<JNIMock>();
   auto holder = std::make_unique<AndroidShellHolder>(settings, jni);
   EXPECT_NE(holder.get(), nullptr);
   EXPECT_TRUE(holder->IsValid());
@@ -135,7 +38,7 @@ TEST(AndroidShellHolder, Create) {
 TEST(AndroidShellHolder, HandlePlatformMessage) {
   Settings settings;
   settings.enable_software_rendering = false;
-  auto jni = std::make_shared<MockPlatformViewAndroidJNI>();
+  auto jni = std::make_shared<JNIMock>();
   auto holder = std::make_unique<AndroidShellHolder>(settings, jni);
   EXPECT_NE(holder.get(), nullptr);
   EXPECT_TRUE(holder->IsValid());
@@ -164,7 +67,7 @@ TEST(AndroidShellHolder, HandlePlatformMessage) {
 TEST(AndroidShellHolder, CreateWithMergedPlatformAndUIThread) {
   Settings settings;
   settings.merged_platform_ui_thread = true;
-  auto jni = std::make_shared<MockPlatformViewAndroidJNI>();
+  auto jni = std::make_shared<JNIMock>();
   auto holder = std::make_unique<AndroidShellHolder>(settings, jni);
   auto window = fml::MakeRefCounted<AndroidNativeWindow>(
       nullptr, /*is_fake_window=*/true);
@@ -178,7 +81,7 @@ TEST(AndroidShellHolder, CreateWithMergedPlatformAndUIThread) {
 TEST(AndroidShellHolder, CreateWithUnMergedPlatformAndUIThread) {
   Settings settings;
   settings.merged_platform_ui_thread = false;
-  auto jni = std::make_shared<MockPlatformViewAndroidJNI>();
+  auto jni = std::make_shared<JNIMock>();
   auto holder = std::make_unique<AndroidShellHolder>(settings, jni);
   auto window = fml::MakeRefCounted<AndroidNativeWindow>(
       nullptr, /*is_fake_window=*/true);