Attempt #1 to fix CI failures

moffatman · moffatman · commit 0b8711717f43 · 2021-09-19T13:12:55.000-04:00
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -1647,6 +1647,9 @@ FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/plu
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/cursor_handler.cc
 FILE: ../../../flutter/shell/platform/windows/cursor_handler.h
+FILE: ../../../flutter/shell/platform/windows/direct_manipulation.cc
+FILE: ../../../flutter/shell/platform/windows/direct_manipulation.h
+FILE: ../../../flutter/shell/platform/windows/direct_manipulation_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/display_helper_winuwp.cc
 FILE: ../../../flutter/shell/platform/windows/display_helper_winuwp.h
 FILE: ../../../flutter/shell/platform/windows/dpi_utils_win32.cc
diff --git a/lib/web_ui/lib/src/engine/pointer_converter.dart b/lib/web_ui/lib/src/engine/pointer_converter.dart
@@ -613,6 +613,11 @@ class PointerDataConverter {
           );
           _pointers.remove(device);
           break;
+        case ui.PointerChange.flowStart:
+        case ui.PointerChange.flowUpdate:
+        case ui.PointerChange.flowEnd:
+          // Pointer flow events are not gemerated on web
+          break;
       }
     } else {
       switch (signalKind) {
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm
@@ -119,7 +119,7 @@ - (void)surfaceUpdated:(BOOL)appeared;
 - (void)performOrientationUpdate:(UIInterfaceOrientationMask)new_preferences;
 - (void)handlePressEvent:(FlutterUIPressProxy*)press
               nextAction:(void (^)())next API_AVAILABLE(ios(13.4));
-- (void)scrollEvent:(UIPanGestureRecognizer*)recognizer;
+- (void)panEvent:(UIPanGestureRecognizer*)recognizer;
 - (void)updateViewportMetrics;
 @end
 
@@ -831,7 +831,7 @@ - (void)testMouseSupport API_AVAILABLE(ios(13.4)) {
   id mockPanGestureRecognizer = OCMClassMock([UIPanGestureRecognizer class]);
   XCTAssertNotNil(mockPanGestureRecognizer);
 
-  [vc scrollEvent:mockPanGestureRecognizer];
+  [vc panEvent:mockPanGestureRecognizer];
 
   [[[self.mockEngine verify] ignoringNonObjectArgs]
       dispatchPointerDataPacket:std::make_unique<flutter::PointerDataPacket>()];
diff --git a/shell/platform/fuchsia/flutter/platform_view.cc b/shell/platform/fuchsia/flutter/platform_view.cc
@@ -428,6 +428,11 @@ bool PlatformView::OnHandlePointerEvent(
         FML_DLOG(ERROR) << "Received hover event for down pointer.";
       }
       break;
+    case flutter::PointerData::Change::kFlowStart:
+    case flutter::PointerData::Change::kFlowUpdate:
+    case flutter::PointerData::Change::kFlowEnd:
+      FML_DLOG(ERROR) << "Unexpectedly received pointer flow event";
+      break;
   }
 
   auto packet = std::make_unique<flutter::PointerDataPacket>(1);
diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn
@@ -336,6 +336,8 @@ source_set("uwptool_utils") {
     "uwptool_utils.h",
   ]
 
+  defines = [ "_SILENCE_CLANG_COROUTINE_MESSAGE" ]
+
   deps = [ ":string_conversion" ]
 }
 
@@ -352,6 +354,8 @@ executable("uwptool") {
     ]
   }
 
+  defines = [ "_SILENCE_CLANG_COROUTINE_MESSAGE" ]
+
   sources = [ "uwptool_main.cc" ]
   deps = [
     ":string_conversion",
diff --git a/shell/platform/windows/direct_manipulation.cc b/shell/platform/windows/direct_manipulation.cc
@@ -119,7 +119,7 @@ DirectManipulationOwner::DirectManipulationOwner(WindowWin32* window)
 int DirectManipulationOwner::Init(unsigned int width, unsigned int height) {
   HRESULT hr = CoCreateInstance(
       CLSID_DirectManipulationManager, nullptr, CLSCTX_INPROC_SERVER,
-      IID_IDirectManipulationManager, manager_.put_void());
+      IID_IDirectManipulationManager, &manager_);
   if (FAILED(hr)) {
     FML_LOG(ERROR)
         << "CoCreateInstance(CLSID_DirectManipulationManager) failed";
@@ -128,7 +128,7 @@ int DirectManipulationOwner::Init(unsigned int width, unsigned int height) {
   }
 
   hr = manager_->GetUpdateManager(IID_IDirectManipulationUpdateManager,
-                                  updateManager_.put_void());
+                                  &updateManager_);
   if (FAILED(hr)) {
     FML_LOG(ERROR) << "GetUpdateManager failed";
     manager_ = nullptr;
@@ -138,7 +138,7 @@ int DirectManipulationOwner::Init(unsigned int width, unsigned int height) {
 
   hr = manager_->CreateViewport(nullptr, window_->GetWindowHandle(),
                                 IID_IDirectManipulationViewport,
-                                viewport_.put_void());
+                                &viewport_);
   if (FAILED(hr)) {
     FML_LOG(ERROR) << "CreateViewport failed";
     manager_ = nullptr;
diff --git a/shell/platform/windows/direct_manipulation.h b/shell/platform/windows/direct_manipulation.h
@@ -7,7 +7,7 @@
 
 #include "flutter/fml/memory/ref_counted.h"
 
-#include <winrt/base.h>
+#include <wrl/client.h>
 #include "directmanipulation.h"
 
 namespace flutter {
@@ -32,9 +32,9 @@ class DirectManipulationOwner {
  private:
   WindowWin32* window_;
   DWORD viewportHandlerCookie_;
-  winrt::com_ptr<IDirectManipulationManager> manager_;
-  winrt::com_ptr<IDirectManipulationUpdateManager> updateManager_;
-  winrt::com_ptr<IDirectManipulationViewport> viewport_;
+  Microsoft::WRL::ComPtr<IDirectManipulationManager> manager_;
+  Microsoft::WRL::ComPtr<IDirectManipulationUpdateManager> updateManager_;
+  Microsoft::WRL::ComPtr<IDirectManipulationViewport> viewport_;
   fml::RefPtr<DirectManipulationEventHandler> handler_;
 };
 
diff --git a/shell/platform/windows/flutter_window_win32.cc b/shell/platform/windows/flutter_window_win32.cc
@@ -251,4 +251,11 @@ bool FlutterWindowWin32::OnBitmapSurfaceUpdated(const void* allocation,
   return ret != 0;
 }
 
+PointerLocation FlutterWindowWin32::GetPrimaryPointerLocation() {
+  POINT point;
+  GetCursorPos(&point);
+  ScreenToClient(GetWindowHandle(), &point);
+  return {(size_t)point.x, (size_t)point.y};
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_window_win32.h b/shell/platform/windows/flutter_window_win32.h
@@ -124,6 +124,8 @@ class FlutterWindowWin32 : public WindowWin32, public WindowBindingHandler {
                               size_t row_bytes,
                               size_t height) override;
 
+  PointerLocation GetPrimaryPointerLocation() override;
+
  private:
   // A pointer to a FlutterWindowsView that can be used to update engine
   // windowing and input state.
diff --git a/shell/platform/windows/flutter_window_winuwp.cc b/shell/platform/windows/flutter_window_winuwp.cc
@@ -362,4 +362,10 @@ bool FlutterWindowWinUWP::OnBitmapSurfaceUpdated(const void* allocation,
   return false;
 }
 
+PointerLocation FlutterWindowWinUWP::GetPrimaryPointerLocation() {
+  auto point = window_.PointerPosition();
+  auto bounds = window_.Bounds();
+  return {static_cast<size_t>(point.X - bounds.X), static_cast<size_t>(point.Y - bounds.Y)};
+}
+
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_window_winuwp.h b/shell/platform/windows/flutter_window_winuwp.h
@@ -63,6 +63,8 @@ class FlutterWindowWinUWP : public WindowBindingHandler {
                               size_t row_bytes,
                               size_t height) override;
 
+  PointerLocation GetPrimaryPointerLocation() override;
+
  private:
   // Undoes the scale transform applied by the Windows compositor in order to
   // render at native scale and produce smooth results on high DPI screens.
diff --git a/shell/platform/windows/flutter_windows_view.cc b/shell/platform/windows/flutter_windows_view.cc
@@ -209,7 +209,7 @@ void FlutterWindowsView::OnPointerLeave(FlutterPointerDeviceKind device_kind,
 }
 
 void FlutterWindowsView::OnPointerFlowStart(int32_t device_id) {
-  POINT point = GetCursorPosition();
+  PointerLocation point = binding_handler_->GetPrimaryPointerLocation();
   SendPointerFlowStart(device_id, point.x, point.y);
 }
 
@@ -218,13 +218,13 @@ void FlutterWindowsView::OnPointerFlowUpdate(int32_t device_id,
                                              double pan_y,
                                              double scale,
                                              double angle) {
-  POINT point = GetCursorPosition();
+  PointerLocation point = binding_handler_->GetPrimaryPointerLocation();
   SendPointerFlowUpdate(device_id, point.x, point.y, pan_x, pan_y, scale,
                         angle);
 }
 
 void FlutterWindowsView::OnPointerFlowEnd(int32_t device_id) {
-  POINT point = GetCursorPosition();
+  PointerLocation point = binding_handler_->GetPrimaryPointerLocation();
   SendPointerFlowEnd(device_id, point.x, point.y);
 }
 
@@ -609,11 +609,4 @@ FlutterWindowsEngine* FlutterWindowsView::GetEngine() {
   return engine_.get();
 }
 
-POINT FlutterWindowsView::GetCursorPosition() {
-  POINT point;
-  GetCursorPos(&point);
-  ScreenToClient(std::get<0>(*GetRenderTarget()), &point);
-  return point;
-}
-
 }  // namespace flutter
diff --git a/shell/platform/windows/flutter_windows_view.h b/shell/platform/windows/flutter_windows_view.h
@@ -309,9 +309,6 @@ class FlutterWindowsView : public WindowBindingHandlerDelegate,
   void SendPointerEventWithData(const FlutterPointerEvent& event_data,
                                 PointerState* state);
 
-  // Gets the current cursor position to set on trackpad gesture events
-  POINT GetCursorPosition();
-
   // Currently configured WindowsRenderTarget for this view used by
   // surface_manager for creation of render surfaces and bound to the physical
   // os window.
diff --git a/shell/platform/windows/testing/mock_window_binding_handler.h b/shell/platform/windows/testing/mock_window_binding_handler.h
@@ -34,6 +34,7 @@ class MockWindowBindingHandler : public WindowBindingHandler {
   MOCK_METHOD1(OnCursorRectUpdated, void(const Rect& rect));
   MOCK_METHOD3(OnBitmapSurfaceUpdated,
                bool(const void* allocation, size_t row_bytes, size_t height));
+  MOCK_METHOD0(GetPrimaryPointerLocation, PointerLocation());
 };
 
 }  // namespace testing
diff --git a/shell/platform/windows/window_binding_handler.h b/shell/platform/windows/window_binding_handler.h
@@ -29,6 +29,12 @@ struct PhysicalWindowBounds {
   size_t height;
 };
 
+// Structure containing the position of a mouse pointer
+struct PointerLocation {
+  size_t x;
+  size_t y;
+};
+
 // Type representing an underlying platform window.
 #ifdef WINUWP
 using PlatformWindow =
@@ -91,6 +97,9 @@ class WindowBindingHandler {
   virtual bool OnBitmapSurfaceUpdated(const void* allocation,
                                       size_t row_bytes,
                                       size_t height) = 0;
+  
+  // Returns the last known position of the primary pointer
+  virtual PointerLocation GetPrimaryPointerLocation() = 0; 
 };
 
 }  // namespace flutter

Original file line number	Diff line number	Diff line change
`@@ -428,6 +428,11 @@ bool PlatformView::OnHandlePointerEvent(`
`428`	`428`	`FML_DLOG(ERROR) << "Received hover event for down pointer.";`
`429`	`429`	`}`
`430`	`430`	`break;`
	`431`	`+ case flutter::PointerData::Change::kFlowStart:`
	`432`	`+ case flutter::PointerData::Change::kFlowUpdate:`
	`433`	`+ case flutter::PointerData::Change::kFlowEnd:`
	`434`	`+ FML_DLOG(ERROR) << "Unexpectedly received pointer flow event";`
	`435`	`+ break;`
`431`	`436`	`}`
`432`	`437`
`433`	`438`	`auto packet = std::make_unique<flutter::PointerDataPacket>(1);`
Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,8 @@ source_set("uwptool_utils") {`
`336`	`336`	`"uwptool_utils.h",`
`337`	`337`	`]`
`338`	`338`
	`339`	`+ defines = [ "_SILENCE_CLANG_COROUTINE_MESSAGE" ]`
	`340`	`+`
`339`	`341`	`deps = [ ":string_conversion" ]`
`340`	`342`	`}`
`341`	`343`
`@@ -352,6 +354,8 @@ executable("uwptool") {`
`352`	`354`	`]`
`353`	`355`	`}`
`354`	`356`
	`357`	`+ defines = [ "_SILENCE_CLANG_COROUTINE_MESSAGE" ]`
	`358`	`+`
`355`	`359`	`sources = [ "uwptool_main.cc" ]`
`356`	`360`	`deps = [`
`357`	`361`	`":string_conversion",`