Break up PlatformViewManager

shell/platform/windows/BUILD.gn

@@ -101,6 +101,8 @@ source_set("flutter_windows_source") {
     "platform_handler.h",
     "platform_view_manager.cc",
     "platform_view_manager.h",
+    "platform_view_plugin.cc",
+    "platform_view_plugin.h",
     "sequential_id_generator.cc",
     "sequential_id_generator.h",
     "settings_plugin.cc",

shell/platform/windows/flutter_windows_engine.cc

@@ -380,9 +380,9 @@ bool FlutterWindowsEngine::Run(std::string_view entrypoint) {
 
   args.custom_task_runners = &custom_task_runners;
 
-  if (!platform_view_manager_) {
-    platform_view_manager_ = std::make_unique<PlatformViewManager>(
-        task_runner_.get(), messenger_wrapper_.get());
+  if (!platform_view_plugin_) {
+    platform_view_plugin_ = std::make_unique<PlatformViewPlugin>(
+        messenger_wrapper_.get(), task_runner_.get());
   }
   if (egl_manager_) {
     auto resolver = [](const char* name) -> void* {

shell/platform/windows/flutter_windows_engine.h

@@ -32,7 +32,7 @@
 #include "flutter/shell/platform/windows/keyboard_handler_base.h"
 #include "flutter/shell/platform/windows/keyboard_key_embedder_handler.h"
 #include "flutter/shell/platform/windows/platform_handler.h"
-#include "flutter/shell/platform/windows/platform_view_manager.h"
+#include "flutter/shell/platform/windows/platform_view_plugin.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
 #include "flutter/shell/platform/windows/settings_plugin.h"
 #include "flutter/shell/platform/windows/task_runner.h"
@@ -430,7 +430,7 @@ class FlutterWindowsEngine {
 
   std::shared_ptr<egl::ProcTable> gl_;
 
-  std::unique_ptr<PlatformViewManager> platform_view_manager_;
+  std::unique_ptr<PlatformViewPlugin> platform_view_plugin_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindowsEngine);
 };

shell/platform/windows/flutter_windows_engine_unittests.cc

@@ -1181,11 +1181,12 @@ TEST_F(FlutterWindowsEngineTest, ReceivePlatformViewMessage) {
   bool received_call = false;
 
   auto manager = std::make_unique<MockPlatformViewManager>(engine.get());
-  EXPECT_CALL(*manager, QueuePlatformViewCreation)
+  EXPECT_CALL(*manager, AddPlatformView)
       .WillRepeatedly([&](PlatformViewId id, std::string_view type_name) {
         received_call = true;
+        return true;
       });
-  modifier.SetPlatformViewManager(std::move(manager));
+  modifier.SetPlatformViewPlugin(std::move(manager));
 
   engine->Run();
 

shell/platform/windows/platform_view_manager.cc

@@ -12,10 +12,8 @@ namespace {
 constexpr char kChannelName[] = "flutter/platform_views";
 }
 
-PlatformViewManager::PlatformViewManager(TaskRunner* task_runner,
-                                         BinaryMessenger* binary_messenger)
-    : task_runner_(task_runner),
-      channel_(std::make_unique<MethodChannel<EncodableValue>>(
+PlatformViewManager::PlatformViewManager(BinaryMessenger* binary_messenger)
+    : channel_(std::make_unique<MethodChannel<EncodableValue>>(
           binary_messenger,
           kChannelName,
           &StandardMethodCodec::GetInstance())) {
@@ -28,31 +26,30 @@ PlatformViewManager::PlatformViewManager(TaskRunner* task_runner,
               std::get<std::string>(args.find(EncodableValue("type"))->second);
           const auto& id =
               std::get<std::int32_t>(args.find(EncodableValue("id"))->second);
-          QueuePlatformViewCreation(id, type);
+          if (AddPlatformView(id, type)) {
+            result->Success();
+          } else {
+            result->Error("AddPlatformView", "Failed to add platform view");
+          }
+          return;
+        } else if (call.method_name() == "focus") {
+          const auto& id =
+              std::get<std::int32_t>(args.find(EncodableValue("id"))->second);
+          const auto& direction =
+              std::get<std::int32_t>(args.find(EncodableValue("direction"))->second);
+          const auto& focus =
+              std::get<bool>(args.find(EncodableValue("focus"))->second);
+          if (FocusPlatformView(id, static_cast<FocusChangeDirection>(direction), focus)) {
+            result->Success();
+          } else {
+            result->Error("FocusPlatformView", "Failed to focus platform view");
+          }
+          return;
         }
-        result->Success();
+        result->NotImplemented();
       });
 }
 
 PlatformViewManager::~PlatformViewManager() {}
 
-void PlatformViewManager::QueuePlatformViewCreation(
-    PlatformViewId id,
-    std::string_view type_name) {}
-
-void PlatformViewManager::InstantiatePlatformView(PlatformViewId id) {}
-
-void PlatformViewManager::RegisterPlatformViewType(
-    std::string_view type_name,
-    const FlutterPlatformViewTypeEntry& type) {}
-
-void PlatformViewManager::FocusPlatformView(PlatformViewId id,
-                                            FocusChangeDirection direction,
-                                            bool focus) {}
-
-std::optional<HWND> PlatformViewManager::GetNativeHandleForId(
-    PlatformViewId id) const {
-  return std::nullopt;
-}
-
 }  // namespace flutter

shell/platform/windows/platform_view_manager.h

@@ -5,10 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_MANAGER_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_MANAGER_H_
 
-#include <functional>
-#include <map>
 #include <memory>
-#include <optional>
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
@@ -28,47 +25,24 @@ enum class FocusChangeDirection {
 // method invokations from the framework.
 class PlatformViewManager {
  public:
-  PlatformViewManager(TaskRunner* task_runner,
-                      BinaryMessenger* binary_messenger);
+  PlatformViewManager(BinaryMessenger* binary_messenger);
 
   virtual ~PlatformViewManager();
 
   // Add a new platform view instance to be lazily instantiated when it is next
   // composited.
-  virtual void QueuePlatformViewCreation(PlatformViewId id,
-                                         std::string_view type_name);
-
-  // Create a queued platform view instance.
-  void InstantiatePlatformView(PlatformViewId id);
-
-  // The runner-facing API calls this method to register a window type
-  // corresponding to a platform view identifier supplied to the widget tree.
-  void RegisterPlatformViewType(std::string_view type_name,
-                                const FlutterPlatformViewTypeEntry& type);
+  virtual bool AddPlatformView(PlatformViewId id,
+                                         std::string_view type_name) = 0;
 
   // The framework may invoke this method when keyboard focus must be given to
   // the platform view.
-  void FocusPlatformView(PlatformViewId id,
+  virtual bool FocusPlatformView(PlatformViewId id,
                          FocusChangeDirection direction,
-                         bool focus);
-
-  // Find the HWND corresponding to a platform view id. Returns null if the id
-  // has no associated platform view.
-  std::optional<HWND> GetNativeHandleForId(PlatformViewId id) const;
+                         bool focus) = 0;
 
  private:
   std::unique_ptr<MethodChannel<EncodableValue>> channel_;
 
-  std::unordered_map<std::string, FlutterPlatformViewTypeEntry>
-      platform_view_types_;
-
-  std::unordered_map<PlatformViewId, HWND> platform_views_;
-
-  std::unordered_map<PlatformViewId, std::function<HWND()>>
-      pending_platform_views_;
-
-  // Pointer to the task runner of the associated engine.
-  TaskRunner* task_runner_;
 };
 
 }  // namespace flutter

shell/platform/windows/platform_view_plugin.cc

@@ -0,0 +1,29 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "flutter/shell/platform/windows/platform_view_plugin.h"
+
+namespace flutter {
+
+PlatformViewPlugin::PlatformViewPlugin(BinaryMessenger* messenger, TaskRunner* task_runner) : PlatformViewManager(messenger), task_runner_(task_runner) {}
+
+PlatformViewPlugin::~PlatformViewPlugin() {}
+
+std::optional<HWND> PlatformViewPlugin::GetNativeHandleForId(PlatformViewId id) const {
+  return std::nullopt;
+}
+
+void PlatformViewPlugin::RegisterPlatformViewType(std::string_view type_name, const FlutterPlatformViewTypeEntry& type) {}
+
+void PlatformViewPlugin::InstantiatePlatformView(PlatformViewId id) {}
+
+bool PlatformViewPlugin::AddPlatformView(PlatformViewId id, std::string_view type_name) {
+  return true;
+}
+
+bool PlatformViewPlugin::FocusPlatformView(PlatformViewId id, FocusChangeDirection direction, bool focus) {
+  return true;
+}
+
+}  // namespace flutter

shell/platform/windows/platform_view_plugin.h

@@ -0,0 +1,55 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_PLUGIN_H_
+#define FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_PLUGIN_H_
+
+#include "flutter/shell/platform/windows/platform_view_manager.h"
+
+#include <functional>
+#include <map>
+#include <optional>
+
+namespace flutter {
+
+class PlatformViewPlugin : public PlatformViewManager {
+ public:
+  PlatformViewPlugin(BinaryMessenger* messenger, TaskRunner* task_runner);
+
+  ~PlatformViewPlugin();
+
+  // Find the HWND corresponding to a platform view id. Returns null if the id
+  // has no associated platform view.
+  std::optional<HWND> GetNativeHandleForId(PlatformViewId id) const;
+
+  // Create a queued platform view instance.
+  void InstantiatePlatformView(PlatformViewId id);
+
+  // The runner-facing API calls this method to register a window type
+  // corresponding to a platform view identifier supplied to the widget tree.
+  void RegisterPlatformViewType(std::string_view type_name,
+                                const FlutterPlatformViewTypeEntry& type);
+
+  // | PlatformViewManager |
+  bool AddPlatformView(PlatformViewId id, std::string_view type_name) override;
+
+  // | PlatformViewManager |
+  bool FocusPlatformView(PlatformViewId id, FocusChangeDirection direction, bool focus) override;
+
+ private:
+  std::unordered_map<std::string, FlutterPlatformViewTypeEntry>
+      platform_view_types_;
+
+  std::unordered_map<PlatformViewId, HWND> platform_views_;
+
+  std::unordered_map<PlatformViewId, std::function<HWND()>>
+      pending_platform_views_;
+
+  // Pointer to the task runner of the associated engine.
+  TaskRunner* task_runner_;
+};
+
+}  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_WINDOWS_PLATFORM_VIEW_PLUGIN_H_

shell/platform/windows/testing/engine_modifier.h

@@ -68,8 +68,8 @@ class EngineModifier {
     engine_->lifecycle_manager_ = std::move(handler);
   }
 
-  void SetPlatformViewManager(std::unique_ptr<PlatformViewManager>&& manager) {
-    engine_->platform_view_manager_ = std::move(manager);
+  void SetPlatformViewPlugin(std::unique_ptr<PlatformViewPlugin>&& manager) {
+    engine_->platform_view_plugin_ = std::move(manager);
   }
 
  private:

shell/platform/windows/testing/mock_platform_view_manager.h

@@ -5,23 +5,22 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_PLATFORM_VIEW_MANAGER_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_MOCK_PLATFORM_VIEW_MANAGER_H_
 
-#include "flutter/shell/platform/windows/platform_view_manager.h"
+#include "flutter/shell/platform/windows/platform_view_plugin.h"
 
 #include "flutter/shell/platform/windows/flutter_windows_engine.h"
 #include "gmock/gmock.h"
 
 namespace flutter {
 
-class MockPlatformViewManager : public PlatformViewManager {
+class MockPlatformViewManager : public PlatformViewPlugin {
  public:
   MockPlatformViewManager(FlutterWindowsEngine* engine)
-      : PlatformViewManager(engine->task_runner(),
-                            engine->messenger_wrapper()) {}
+      : PlatformViewPlugin(engine->messenger_wrapper(), engine->task_runner()) {}
 
   ~MockPlatformViewManager() {}
 
-  MOCK_METHOD(void,
-              QueuePlatformViewCreation,
+  MOCK_METHOD(bool,
+              AddPlatformView,
               (PlatformViewId id, std::string_view));
 };