PR Feedback

shell/platform/windows/client_wrapper/testing/stub_flutter_windows_api.h

@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "flutter/shell/platform/windows/flutter_windows_internal.h"
 #include "flutter/shell/platform/windows/public/flutter_windows.h"
 
 namespace flutter {

shell/platform/windows/flutter_windows_internal.h

@@ -14,6 +14,27 @@ extern "C" {
 // Declare functions that are currently in-progress and shall be exposed to the
 // public facing API upon completion.
 
+typedef int64_t PlatformViewId;
+
+typedef struct {
+  size_t struct_size;
+  HWND parent_window;
+  const char* platform_view_type;
+  // user_data may hold any necessary additional information for creating a new
+  // platform view. For example, an instance of FlutterWindow.
+  void* user_data;
+  PlatformViewId platform_view_id;
+} FlutterPlatformViewCreationParameters;
+
+typedef HWND (*FlutterPlatformViewFactory)(
+    const FlutterPlatformViewCreationParameters*);
+
+typedef struct {
+  size_t struct_size;
+  FlutterPlatformViewFactory factory;
+  void* user_data;  // Arbitrary user data supplied to the creation struct.
+} FlutterPlatformViewTypeEntry;
+
 FLUTTER_EXPORT void FlutterDesktopEngineRegisterPlatformViewType(
     FlutterDesktopEngineRef engine,
     const char* view_type_name,

shell/platform/windows/platform_view_manager.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
-#include "flutter/shell/platform/windows/public/flutter_windows.h"
+#include "flutter/shell/platform/windows/flutter_windows_internal.h"
 #include "flutter/shell/platform/windows/task_runner.h"
 
 namespace flutter {

shell/platform/windows/platform_view_plugin.h

@@ -30,18 +30,18 @@ class PlatformViewPlugin : public PlatformViewManager {
   void RegisterPlatformViewType(std::string_view type_name,
                                 const FlutterPlatformViewTypeEntry& type);
 
+  // | PlatformViewManager |
+  // type_name must correspond to a string that has already been registered
+  // with RegisterPlatformViewType.
+  bool AddPlatformView(PlatformViewId id, std::string_view type_name) override;
+
   // Create a queued platform view instance after it has been added.
   // id must correspond to an identifier that has already been added with
   // AddPlatformView.
   // This method will create the platform view within a task queued to the
   // engine's TaskRunner, which will run on the UI thread.
   void InstantiatePlatformView(PlatformViewId id);
 
-  // | PlatformViewManager |
-  // type_name must correspond to a string that has already been registered
-  // with RegisterPlatformViewType.
-  bool AddPlatformView(PlatformViewId id, std::string_view type_name) override;
-
   // | PlatformViewManager |
   // id must correspond to an identifier that has already been added with
   // AddPlatformView.

shell/platform/windows/public/flutter_windows.h

@@ -203,27 +203,6 @@ FLUTTER_EXPORT void FlutterDesktopEngineSetNextFrameCallback(
     VoidCallback callback,
     void* user_data);
 
-typedef int64_t PlatformViewId;
-
-typedef struct {
-  size_t struct_size;
-  HWND parent_window;
-  const char* platform_view_type;
-  // user_data may hold any necessary additional information for creating a new
-  // platform view. For example, an instance of FlutterWindow.
-  void* user_data;
-  PlatformViewId platform_view_id;
-} FlutterPlatformViewCreationParameters;
-
-typedef HWND (*FlutterPlatformViewFactory)(
-    const FlutterPlatformViewCreationParameters*);
-
-typedef struct {
-  size_t struct_size;
-  FlutterPlatformViewFactory factory;
-  void* user_data;  // Arbitrary user data supplied to the creation struct.
-} FlutterPlatformViewTypeEntry;
-
 // ========== View ==========
 
 // Return backing HWND for manipulation in host application.