Fix more

shell/platform/embedder/tests/embedder_gl_unittests.cc

@@ -2121,12 +2121,10 @@ TEST_P(EmbedderTestMultiBackend,
     ASSERT_TRUE(engine.is_valid());
 
     FlutterWindowMetricsEvent event = {};
-    memset(&event, 0, sizeof(FlutterWindowMetricsEvent));
     event.struct_size = sizeof(event);
     event.width = 800;
     event.height = 600;
     event.pixel_ratio = 1.0;
-    event.view_id = kImplicitViewId;
     ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
               kSuccess);
   });

shell/platform/embedder/tests/embedder_unittests.cc

@@ -2492,12 +2492,10 @@ TEST_F(EmbedderTest, VsyncCallbackPostedIntoFuture) {
 
     // Send a window metrics events so frames may be scheduled.
     FlutterWindowMetricsEvent event = {};
-    memset(&event, 0, sizeof(FlutterWindowMetricsEvent));
     event.struct_size = sizeof(event);
     event.width = 800;
     event.height = 600;
     event.pixel_ratio = 1.0;
-    event.view_id = kImplicitViewId;
 
     ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
               kSuccess);

shell/platform/glfw/flutter_glfw.cc

@@ -285,9 +285,6 @@ static void SendWindowMetrics(FlutterDesktopWindowControllerState* controller,
   double dpi = controller->window_wrapper->pixels_per_screen_coordinate *
                controller->monitor_screen_coordinates_per_inch;
 
-  // TODO(dkwingsmt): GLFW doesn't support multi-view for now. Use the real
-  // view ID when it does.
-  int64_t view_id = flutter::kFlutterImplicitViewId;
   FlutterWindowMetricsEvent event = {};
   event.struct_size = sizeof(event);
   event.width = width;
@@ -300,7 +297,9 @@ static void SendWindowMetrics(FlutterDesktopWindowControllerState* controller,
   } else {
     event.pixel_ratio = controller->window_wrapper->pixel_ratio_override;
   }
-  event.view_id = view_id;
+  // The GLFW embedder doesn't support multiple views. We assume all pointer
+  // events come from the only view, the implicit view.
+  event.view_id = flutter::kFlutterImplicitViewId;
   FlutterEngineSendWindowMetricsEvent(controller->engine->flutter_engine,
                                       &event);
 }

shell/platform/linux/fl_engine.cc

@@ -767,15 +767,15 @@ void fl_engine_send_window_metrics_event(FlEngine* self,
     return;
   }
 
-  // TODO(dkwingsmt): The Linux embedder doesn't support multi-view for now. Use
-  // the real view ID when it does.
-  int64_t view_id = flutter::kFlutterImplicitViewId;
   FlutterWindowMetricsEvent event = {};
   event.struct_size = sizeof(FlutterWindowMetricsEvent);
   event.width = width;
   event.height = height;
   event.pixel_ratio = pixel_ratio;
-  event.view_id = view_id;
+  // TODO(dkwingsmt): Assign the correct view ID once the Linux embedder
+  // supports multiple views.
+  // https://github.com/flutter/flutter/issues/138178
+  fl_event.view_id = flutter::kFlutterImplicitViewId;
   self->embedder_api.SendWindowMetricsEvent(self->engine, &event);
 }
 

shell/platform/windows/flutter_windows_view.cc

@@ -307,15 +307,15 @@ void FlutterWindowsView::OnResetImeComposing() {
 void FlutterWindowsView::SendWindowMetrics(size_t width,
                                            size_t height,
                                            double dpiScale) const {
-  // TODO(dkwingsmt): The Windows embedder doesn't support multi-view for now.
-  // Use the real view ID when it does.
-  int64_t view_id = flutter::kFlutterImplicitViewId;
   FlutterWindowMetricsEvent event = {};
   event.struct_size = sizeof(event);
   event.width = width;
   event.height = height;
   event.pixel_ratio = dpiScale;
-  event.view_id = view_id;
+  // TODO(dkwingsmt): Assign the correct view ID once the Linux embedder
+  // supports multiple views.
+  // https://github.com/flutter/flutter/issues/138179
+  event.view_id = flutter::kFlutterImplicitViewId;
   engine_->SendWindowMetricsEvent(event);
 }
 
@@ -552,8 +552,8 @@ void FlutterWindowsView::SendPointerEventWithData(
   event.device_kind = state->device_kind;
   event.device = state->pointer_id;
   event.buttons = state->buttons;
-  // TODO(dkwingsmt): Use the correct view ID for pointer events once the
-  // Windows embedder supports multiple views.
+  // TODO(dkwingsmt): Assign the correct view ID once the Linux embedder
+  // supports multiple views.
   // https://github.com/flutter/flutter/issues/138179
   event.view_id = flutter::kFlutterImplicitViewId;