From 07873fcbf55f200f3c518416ca3869b55c9e582c Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Wed, 2 Nov 2022 16:39:22 -0700
Subject: [PATCH] Apply internal cl for C++20 prep

---
 lib/ui/painting/image.cc              |  5 +----
 third_party/tonic/dart_wrappable.h    | 11 ++++-------
 third_party/tonic/dart_wrapper_info.h |  3 +++
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/ui/painting/image.cc b/lib/ui/painting/image.cc
index e09b302587adf..2a9ab500c8e41 100644
--- a/lib/ui/painting/image.cc
+++ b/lib/ui/painting/image.cc
@@ -18,10 +18,7 @@ namespace flutter {
 typedef CanvasImage Image;
 
 // Since _Image is a private class, we can't use IMPLEMENT_WRAPPERTYPEINFO
-static const tonic::DartWrapperInfo kDartWrapperInfoUIImage = {
-    "ui",
-    "_Image",
-};
+static const tonic::DartWrapperInfo kDartWrapperInfoUIImage("ui", "_Image");
 const tonic::DartWrapperInfo& Image::dart_wrapper_info_ =
     kDartWrapperInfoUIImage;
 
diff --git a/third_party/tonic/dart_wrappable.h b/third_party/tonic/dart_wrappable.h
index 9c155da27e99a..42b1dace5e5ee 100644
--- a/third_party/tonic/dart_wrappable.h
+++ b/third_party/tonic/dart_wrappable.h
@@ -75,13 +75,10 @@ class DartWrappable {
  private:                                                                  \
   static const tonic::DartWrapperInfo& dart_wrapper_info_
 
-#define IMPLEMENT_WRAPPERTYPEINFO(LibraryName, ClassName)       \
-  static const tonic::DartWrapperInfo                           \
-      kDartWrapperInfo_##LibraryName_##ClassName = {            \
-          #LibraryName,                                         \
-          #ClassName,                                           \
-  };                                                            \
-  const tonic::DartWrapperInfo& ClassName::dart_wrapper_info_ = \
+#define IMPLEMENT_WRAPPERTYPEINFO(LibraryName, ClassName)                   \
+  static const tonic::DartWrapperInfo                                       \
+      kDartWrapperInfo_##LibraryName_##ClassName(#LibraryName, #ClassName); \
+  const tonic::DartWrapperInfo& ClassName::dart_wrapper_info_ =             \
       kDartWrapperInfo_##LibraryName_##ClassName;
 
 struct DartConverterWrappable {
diff --git a/third_party/tonic/dart_wrapper_info.h b/third_party/tonic/dart_wrapper_info.h
index 8333c81d06f70..eba7345a42de3 100644
--- a/third_party/tonic/dart_wrapper_info.h
+++ b/third_party/tonic/dart_wrapper_info.h
@@ -16,6 +16,9 @@ struct DartWrapperInfo {
   const char* library_name;
   const char* interface_name;
 
+  DartWrapperInfo(const char* library_name, const char* interface_name)
+      : library_name(library_name), interface_name(interface_name) {}
+
  private:
   DartWrapperInfo(const DartWrapperInfo&) = delete;
   DartWrapperInfo& operator=(const DartWrapperInfo&) = delete;