wayland: add notification of display changes to embedder (sony#374)

This change adds notification of display changes to embedder support in Wayland backend.

Signed-off-by: Hidenori Matsubayashi <[email protected]>

Author: HidenoriMatsubayashi

src/flutter/shell/platform/linux_embedded/flutter_elinux_engine.cc

@@ -440,4 +440,12 @@ void FlutterELinuxEngine::UpdateAccessibilityFeatures(
   embedder_api_.UpdateAccessibilityFeatures(engine_, flags);
 }
 
+void FlutterELinuxEngine::UpdateDisplayInfo(
+    FlutterEngineDisplaysUpdateType update_type,
+    const FlutterEngineDisplay* displays,
+    size_t display_count) {
+  embedder_api_.NotifyDisplayUpdate(engine_, update_type, displays,
+                                    display_count);
+}
+
 }  // namespace flutter

src/flutter/shell/platform/linux_embedded/flutter_elinux_engine.h

@@ -133,6 +133,11 @@ class FlutterELinuxEngine {
   // Updates accessibility, e.g. switch to high contrast mode
   void UpdateAccessibilityFeatures(FlutterAccessibilityFeature flags);
 
+  // Update display information.
+  void UpdateDisplayInfo(FlutterEngineDisplaysUpdateType update_type,
+                         const FlutterEngineDisplay* displays,
+                         size_t display_count);
+
  private:
   // Allows swapping out embedder_api_ calls in tests.
   friend class EngineEmbedderApiModifier;

src/flutter/shell/platform/linux_embedded/flutter_elinux_view.cc

@@ -560,4 +560,23 @@ void FlutterELinuxView::UpdateTextScaleFactor(float factor) {
   settings_handler_->UpdateTextScaleFactor(factor);
 }
 
+void FlutterELinuxView::UpdateDisplayInfo(double refresh_rate,
+                                          size_t width_px,
+                                          size_t height_px,
+                                          double pixel_ratio) {
+  const FlutterEngineDisplaysUpdateType update_type =
+      kFlutterEngineDisplaysUpdateTypeStartup;
+  const FlutterEngineDisplay displays = {
+      .struct_size = sizeof(FlutterEngineDisplay),
+      .display_id = 0,
+      .single_display = true,
+      .refresh_rate = refresh_rate,
+      .width = width_px,
+      .height = height_px,
+      .device_pixel_ratio = pixel_ratio,
+  };
+  const size_t display_count = 1;
+  engine_.get()->UpdateDisplayInfo(update_type, &displays, display_count);
+}
+
 }  // namespace flutter

src/flutter/shell/platform/linux_embedded/flutter_elinux_view.h

@@ -151,6 +151,12 @@ class FlutterELinuxView : public WindowBindingHandlerDelegate {
   // |WindowBindingHandlerDelegate|
   void UpdateTextScaleFactor(float factor) override;
 
+  // |WindowBindingHandlerDelegate|
+  void UpdateDisplayInfo(double refresh_rate,
+                         size_t width_px,
+                         size_t height_px,
+                         double pixel_ratio) override;
+
  private:
   // Struct holding the mouse state. The engine doesn't keep track of which
   // mouse buttons have been pressed, so it's the embedding's responsibility.

src/flutter/shell/platform/linux_embedded/window/elinux_window.h

@@ -5,7 +5,10 @@
 #ifndef FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_WINDOW_ELINUX_WINDOW_H_
 #define FLUTTER_SHELL_PLATFORM_LINUX_EMBEDDED_WINDOW_ELINUX_WINDOW_H_
 
+#include <cmath>
+
 #include "flutter/shell/platform/linux_embedded/public/flutter_elinux.h"
+#include "flutter/shell/platform/linux_embedded/window_binding_handler.h"
 
 namespace flutter {
 
@@ -39,9 +42,23 @@ class ELinuxWindow {
     }
   }
 
+  void NotifyDisplayInfoUpdates() const {
+    if (binding_handler_delegate_) {
+      binding_handler_delegate_->UpdateDisplayInfo(
+          std::trunc(1000000.0 / frame_rate_), GetCurrentWidth(),
+          GetCurrentHeight(), current_scale_);
+    }
+  }
+
   FlutterDesktopViewProperties view_properties_;
+
+  // A pointer to a FlutterWindowsView that can be used to update engine
+  // windowing and input state.
+  WindowBindingHandlerDelegate* binding_handler_delegate_ = nullptr;
+
   int32_t display_max_width_ = -1;
   int32_t display_max_height_ = -1;
+  int32_t frame_rate_ = 60000;
   double current_scale_ = 1.0;
   uint16_t current_rotation_ = 0;
   // The x coordinate of the pointer in physical pixels.

src/flutter/shell/platform/linux_embedded/window/elinux_window_drm.h

@@ -708,10 +708,6 @@ class ELinuxWindowDrm : public ELinuxWindow, public WindowBindingHandler {
     bool is_pointer_device;
   };
 
-  // A pointer to a FlutterWindowsView that can be used to update engine
-  // windowing and input state.
-  WindowBindingHandlerDelegate* binding_handler_delegate_ = nullptr;
-
   std::unique_ptr<T> native_window_;
   std::unique_ptr<SurfaceGl> render_surface_;
 

src/flutter/shell/platform/linux_embedded/window/elinux_window_wayland.cc

@@ -1041,7 +1041,6 @@ ELinuxWindowWayland::ELinuxWindowWayland(
       zwp_text_input_v3_(nullptr),
       wp_presentation_(nullptr),
       wp_presentation_clk_id_(UINT32_MAX),
-      frame_rate_(60000),
       window_decorations_(nullptr) {
   view_properties_ = view_properties;
   current_scale_ =
@@ -1281,6 +1280,7 @@ bool ELinuxWindowWayland::DispatchEvent() {
           view_properties_.height * current_scale_ -
               WindowDecorationsPhysicalHeight());
     }
+    NotifyDisplayInfoUpdates();
   }
 
   // Prepare to call wl_display_read_events.

src/flutter/shell/platform/linux_embedded/window/elinux_window_wayland.h

@@ -135,10 +135,6 @@ class ELinuxWindowWayland : public ELinuxWindow, public WindowBindingHandler {
       kZxdgToplevelDecorationV1Listener;
   static constexpr size_t kDefaultPointerSize = 24;
 
-  // A pointer to a FlutterWindowsView that can be used to update engine
-  // windowing and input state.
-  WindowBindingHandlerDelegate* binding_handler_delegate_ = nullptr;
-
   std::unique_ptr<NativeWindowWayland> native_window_;
   std::unique_ptr<SurfaceGl> render_surface_;
 
@@ -189,7 +185,6 @@ class ELinuxWindowWayland : public ELinuxWindow, public WindowBindingHandler {
   wp_presentation* wp_presentation_;
   uint32_t wp_presentation_clk_id_;
   uint64_t last_frame_time_nanos_;
-  int32_t frame_rate_;
 
   CursorInfo cursor_info_;
   size_t cursor_size_;

src/flutter/shell/platform/linux_embedded/window/elinux_window_x11.h

@@ -70,10 +70,6 @@ class ELinuxWindowX11 : public ELinuxWindow, public WindowBindingHandler {
                                 int16_t x,
                                 int16_t y);
 
-  // A pointer to a FlutterWindowsView that can be used to update engine
-  // windowing and input state.
-  WindowBindingHandlerDelegate* binding_handler_delegate_ = nullptr;
-
   Display* display_ = nullptr;
   std::unique_ptr<NativeWindowX11> native_window_;
   std::unique_ptr<SurfaceGl> render_surface_;

src/flutter/shell/platform/linux_embedded/window_binding_handler_delegate.h

@@ -110,6 +110,16 @@ class WindowBindingHandlerDelegate {
 
   // Update the status of the text scaling factor feature
   virtual void UpdateTextScaleFactor(float factor) = 0;
+
+  // Update the status of the corresponding to display changes.
+  // @param[in] refresh_rate    Refresh rate of the display.
+  // @param[in] width_px        Physical width of the display.
+  // @param[in] height_px       Physical height of the display.
+  // @param[in] pixel_ratio     Pixel ratio of the display.
+  virtual void UpdateDisplayInfo(double refresh_rate,
+                                 size_t width_px,
+                                 size_t height_px,
+                                 double pixel_ratio) = 0;
 };
 
 }  // namespace flutter