fix js memory leak.

example/android/app/build.gradle

@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "soko.ekibun.example"
-        minSdkVersion 21
+        minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

example/lib/main.dart

@@ -3,7 +3,7 @@
  * @Author: ekibun
  * @Date: 2020-08-08 08:16:51
  * @LastEditors: ekibun
- * @LastEditTime: 2020-08-20 14:42:10
+ * @LastEditTime: 2020-08-24 22:26:03
  */
 import 'package:flutter/material.dart';
 import 'dart:typed_data';
@@ -109,7 +109,7 @@ class _TestPageState extends State<TestPage> {
                   FlatButton(
                       child: Text("close engine"),
                       onPressed: () async {
-                        if (engine != null) return;
+                        if (engine == null) return;
                         await engine.destroy();
                         engine = null;
                       }),

example/pubspec.lock

@@ -75,7 +75,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.2"
+    version: "0.0.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter

example/windows/flutter/.template_version

@@ -1 +1 @@
-5
+6

example/windows/flutter/CMakeLists.txt

@@ -34,8 +34,8 @@ add_dependencies(flutter flutter_assemble)
 
 # === Wrapper ===
 list(APPEND CPP_WRAPPER_SOURCES_CORE
-  "engine_method_result.cc"
-	"standard_codec.cc"
+  "core_implementations.cc"
+  "standard_codec.cc"
 )
 list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/")
 list(APPEND CPP_WRAPPER_SOURCES_PLUGIN

example/windows/runner/flutter_window.cpp

@@ -1,5 +1,7 @@
 #include "flutter_window.h"
 
+#include <optional>
+
 #include "flutter/generated_plugin_registrant.h"
 
 FlutterWindow::FlutterWindow(RunLoop* run_loop,
@@ -34,3 +36,19 @@ void FlutterWindow::OnDestroy() {
 
   Win32Window::OnDestroy();
 }
+
+LRESULT
+FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
+                              WPARAM const wparam,
+                              LPARAM const lparam) noexcept {
+  // Give Flutter, including plugins, an opporutunity to handle window messages.
+  if (flutter_controller_) {
+    std::optional<LRESULT> result =
+        flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
+                                                      lparam);
+    if (result) {
+      return *result;
+    }
+  }
+  return Win32Window::MessageHandler(hwnd, message, wparam, lparam);
+}

example/windows/runner/flutter_window.h

@@ -4,11 +4,11 @@
 #include <flutter/dart_project.h>
 #include <flutter/flutter_view_controller.h>
 
+#include <memory>
+
 #include "run_loop.h"
 #include "win32_window.h"
 
-#include <memory>
-
 // A window that does nothing but host a Flutter view.
 class FlutterWindow : public Win32Window {
  public:
@@ -22,6 +22,8 @@ class FlutterWindow : public Win32Window {
   // Win32Window:
   bool OnCreate() override;
   void OnDestroy() override;
+  LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam,
+                         LPARAM const lparam) noexcept override;
 
  private:
   // The run loop driving events for this window.

example/windows/runner/win32_window.cpp

@@ -154,13 +154,6 @@ Win32Window::MessageHandler(HWND hwnd,
                             UINT const message,
                             WPARAM const wparam,
                             LPARAM const lparam) noexcept {
-  auto window =
-      reinterpret_cast<Win32Window*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
-
-  if (window == nullptr) {
-    return 0;
-  }
-
   switch (message) {
     case WM_DESTROY:
       window_handle_ = nullptr;