From d4c69ebd0180e837ebe08be02c2d0bdc316d4c9f Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Fri, 21 Feb 2020 09:58:41 -0800
Subject: [PATCH] Fix some compiler warnings in newer versions of Clang.

---
 lib/ui/plugins/callback_cache.h                               | 4 ++--
 .../darwin/macos/framework/Source/FlutterViewController.mm    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ui/plugins/callback_cache.h b/lib/ui/plugins/callback_cache.h
index d102888b99ce0..84a2606c37f61 100644
--- a/lib/ui/plugins/callback_cache.h
+++ b/lib/ui/plugins/callback_cache.h
@@ -15,11 +15,11 @@
 
 namespace flutter {
 
-typedef struct {
+struct DartCallbackRepresentation {
   std::string name;
   std::string class_name;
   std::string library_path;
-} DartCallbackRepresentation;
+};
 
 class DartCallbackCache {
  public:
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
index 926c0cafd6589..e9c26be8e0b32 100644
--- a/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
+++ b/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
@@ -404,11 +404,11 @@ - (void)dispatchMouseEvent:(NSEvent*)event phase:(FlutterPointerPhase)phase {
   NSPoint locationInBackingCoordinates = [self.view convertPointToBacking:locationInView];
   FlutterPointerEvent flutterEvent = {
       .struct_size = sizeof(flutterEvent),
-      .device_kind = kFlutterPointerDeviceKindMouse,
       .phase = phase,
+      .timestamp = static_cast<size_t>(event.timestamp * NSEC_PER_MSEC),
       .x = locationInBackingCoordinates.x,
       .y = -locationInBackingCoordinates.y,  // convertPointToBacking makes this negative.
-      .timestamp = static_cast<size_t>(event.timestamp * NSEC_PER_MSEC),
+      .device_kind = kFlutterPointerDeviceKindMouse,
       // If a click triggered a synthesized kAdd, don't pass the buttons in that event.
       .buttons = phase == kAdd ? 0 : _mouseState.buttons,
   };