[Windows] Mark move-only classes as such

Applies the FML_DISALLOW_COPY_AND_ASSIGN to non-POD types in the Windows
embedder.

No new tests since no semantic change. Only has the compile-time effect
of preventing copying of classes intended to be move-only.

Author: cbracken

shell/platform/windows/accessibility_bridge_windows.h

@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_BRIDGE_WINDOWS_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_ACCESSIBILITY_BRIDGE_WINDOWS_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/accessibility_bridge.h"
 #include "flutter/third_party/accessibility/ax/platform/ax_fragment_root_delegate_win.h"
 
@@ -71,6 +72,8 @@ class AccessibilityBridgeWindows : public AccessibilityBridge,
  private:
   FlutterWindowsEngine* engine_;
   FlutterWindowsView* view_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridgeWindows);
 };
 
 }  // namespace flutter

shell/platform/windows/accessibility_bridge_windows_unittests.cc

@@ -10,6 +10,7 @@
 
 #include <vector>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h"
 #include "flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h"
@@ -66,6 +67,8 @@ class AccessibilityBridgeWindowsSpy : public AccessibilityBridgeWindows {
  private:
   std::vector<MsaaEvent> dispatched_events_;
   std::vector<int32_t> focused_nodes_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AccessibilityBridgeWindowsSpy);
 };
 
 // A FlutterWindowsEngine whose accessibility bridge is a
@@ -81,6 +84,9 @@ class FlutterWindowsEngineSpy : public FlutterWindowsEngine {
       FlutterWindowsView* view) override {
     return std::make_shared<AccessibilityBridgeWindowsSpy>(engine, view);
   }
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(FlutterWindowsEngineSpy);
 };
 
 // Returns an engine instance configured with dummy project path values, and

shell/platform/windows/angle_surface_manager.h

@@ -18,7 +18,8 @@
 #include <wrl/client.h>
 #include <memory>
 
-#include "window_binding_handler.h"
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/window_binding_handler.h"
 
 namespace flutter {
 
@@ -29,10 +30,6 @@ class AngleSurfaceManager {
   static std::unique_ptr<AngleSurfaceManager> Create();
   ~AngleSurfaceManager();
 
-  // Disallow copy/move.
-  AngleSurfaceManager(const AngleSurfaceManager&) = delete;
-  AngleSurfaceManager& operator=(const AngleSurfaceManager&) = delete;
-
   // Creates an EGLSurface wrapper and backing DirectX 11 SwapChain
   // associated with window, in the appropriate format for display.
   // Target represents the visual entity to bind to.  Width and
@@ -125,6 +122,8 @@ class AngleSurfaceManager {
 
   // Number of active instances of AngleSurfaceManager
   static int instance_count_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(AngleSurfaceManager);
 };
 
 }  // namespace flutter

shell/platform/windows/cursor_handler.h

@@ -7,6 +7,7 @@
 
 #include <unordered_map>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
@@ -37,6 +38,8 @@ class CursorHandler {
 
   // The cache map for custom cursors.
   std::unordered_map<std::string, HCURSOR> custom_cursors_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CursorHandler);
 };
 
 // Create a cursor from a rawBGRA buffer and the cursor info.

shell/platform/windows/cursor_handler_unittests.cc

@@ -6,6 +6,7 @@
 #include <memory>
 #include <vector>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
@@ -53,6 +54,10 @@ void SimulateCursorMessage(TestBinaryMessenger* messenger,
 }  // namespace
 
 class CursorHandlerTest : public WindowsTest {
+ public:
+  CursorHandlerTest() = default;
+  virtual ~CursorHandlerTest() = default;
+
  protected:
   FlutterWindowsEngine* engine() { return engine_.get(); }
   FlutterWindowsView* view() { return view_.get(); }
@@ -83,6 +88,8 @@ class CursorHandlerTest : public WindowsTest {
   std::unique_ptr<FlutterWindowsEngine> engine_;
   std::unique_ptr<FlutterWindowsView> view_;
   MockWindowBindingHandler* window_;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(CursorHandlerTest);
 };
 
 TEST_F(CursorHandlerTest, ActivateSystemCursor) {

shell/platform/windows/direct_manipulation_unittests.cc

@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/windows/direct_manipulation.h"
-#include "flutter/shell/platform/windows/testing/mock_window_binding_handler_delegate.h"
 
+#include "flutter/fml/macros.h"
+#include "flutter/shell/platform/windows/testing/mock_window_binding_handler_delegate.h"
 #include "gtest/gtest.h"
 
 using testing::_;
@@ -16,11 +17,6 @@ class MockIDirectManipulationViewport : public IDirectManipulationViewport {
  public:
   MockIDirectManipulationViewport() {}
 
-  // Prevent copying.
-  MockIDirectManipulationViewport(MockIDirectManipulationViewport const&) =
-      delete;
-  MockIDirectManipulationViewport& operator=(
-      MockIDirectManipulationViewport const&) = delete;
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, AddRef, ULONG());
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Release, ULONG());
   MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
@@ -101,17 +97,15 @@ class MockIDirectManipulationViewport : public IDirectManipulationViewport {
       STDMETHODCALLTYPE,
       ZoomToRect,
       HRESULT(const float, const float, const float, const float, BOOL));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockIDirectManipulationViewport);
 };
 
 class MockIDirectManipulationContent : public IDirectManipulationContent {
  public:
   MockIDirectManipulationContent() {}
 
-  // Prevent copying.
-  MockIDirectManipulationContent(MockIDirectManipulationContent const&) =
-      delete;
-  MockIDirectManipulationContent& operator=(
-      MockIDirectManipulationContent const&) = delete;
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, AddRef, ULONG());
   MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Release, ULONG());
   MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
@@ -139,6 +133,9 @@ class MockIDirectManipulationContent : public IDirectManipulationContent {
   MOCK_METHOD2_WITH_CALLTYPE(STDMETHODCALLTYPE,
                              SyncContentTransform,
                              HRESULT(const float*, DWORD));
+
+ private:
+  FML_DISALLOW_COPY_AND_ASSIGN(MockIDirectManipulationContent);
 };
 
 TEST(DirectManipulationTest, TestGesture) {

shell/platform/windows/dpi_utils.cc

@@ -4,6 +4,8 @@
 
 #include "dpi_utils.h"
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 namespace {
@@ -58,6 +60,8 @@ class DpiHelper {
   HMODULE shlib_module_ = nullptr;
   bool dpi_for_window_supported_ = false;
   bool dpi_for_monitor_supported_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(DpiHelper);
 };
 
 DpiHelper::DpiHelper() {

shell/platform/windows/event_watcher.h

@@ -9,6 +9,8 @@
 
 #include <functional>
 
+#include "flutter/fml/macros.h"
+
 namespace flutter {
 
 // A win32 `HANDLE` wrapper for use as a one-time callback.
@@ -28,8 +30,7 @@ class EventWatcher {
   HANDLE handle_;
   HANDLE handle_for_wait_;
 
-  EventWatcher(const EventWatcher&) = delete;
-  EventWatcher& operator=(const EventWatcher&) = delete;
+  FML_DISALLOW_COPY_AND_ASSIGN(EventWatcher);
 };
 
 }  // namespace flutter

shell/platform/windows/external_texture_d3d.h

@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_D3D_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_D3D_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/angle_surface_manager.h"
 #include "flutter/shell/platform/windows/external_texture.h"
 
@@ -42,6 +43,8 @@ class ExternalTextureD3d : public ExternalTexture {
   GLuint gl_texture_ = 0;
   EGLSurface egl_surface_ = EGL_NO_SURFACE;
   void* last_surface_handle_ = nullptr;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ExternalTextureD3d);
 };
 
 }  // namespace flutter

shell/platform/windows/external_texture_pixelbuffer.h

@@ -5,6 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_PIXELBUFFER_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_EXTERNAL_TEXTURE_PIXELBUFFER_H_
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/common/public/flutter_texture_registrar.h"
 #include "flutter/shell/platform/windows/external_texture.h"
 
@@ -38,6 +39,8 @@ class ExternalTexturePixelBuffer : public ExternalTexture {
   void* const user_data_ = nullptr;
   const GlProcs& gl_;
   GLuint gl_texture_ = 0;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(ExternalTexturePixelBuffer);
 };
 
 }  // namespace flutter