From 4043e5501440fe43fe55160fb06640f727b0b25f Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 2 Nov 2023 13:46:05 -0700 Subject: [PATCH 1/8] Remove not-windows exclusion on some JNI unit test suites. --- testing/run_tests.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index 419460f43275d..3f93473bdb29c 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -392,6 +392,7 @@ def make_test(name, flags=None, extra_env=None): return (name, flags, extra_env) unittests = [ + make_test('android_external_view_embedder_unittests'), make_test('client_wrapper_glfw_unittests'), make_test('client_wrapper_unittests'), make_test('common_cpp_core_unittests'), @@ -403,7 +404,9 @@ def make_test(name, flags=None, extra_env=None): make_test('embedder_proctable_unittests'), make_test('embedder_unittests'), make_test('fml_unittests'), + make_test('jni_unittests'), make_test('no_dart_plugin_registrant_unittests'), + make_test('platform_view_android_delegate_unittests'), make_test('runtime_unittests'), make_test('testing_unittests'), make_test('tonic_unittests'), @@ -413,10 +416,6 @@ def make_test(name, flags=None, extra_env=None): if not is_windows(): unittests += [ - # https://github.com/google/googletest/issues/2490 - make_test('android_external_view_embedder_unittests'), - make_test('jni_unittests'), - make_test('platform_view_android_delegate_unittests'), # https://github.com/flutter/flutter/issues/36295 make_test('shell_unittests'), ] From 75b0ff5b0f748adb909dc31ca02dad6625d6ec63 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 2 Nov 2023 14:13:41 -0700 Subject: [PATCH 2/8] Tweak. --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 704c0f2c8628d..6f9c12ca107a0 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -200,7 +200,7 @@ group("unittests") { ] } - if (!is_win && !is_fuchsia) { + if (!is_fuchsia) { public_deps += [ "//flutter/shell/platform/android/external_view_embedder:android_external_view_embedder_unittests", "//flutter/shell/platform/android/jni:jni_unittests", From 7ec1a0e8bc92041b02fc2179070a6a844f409c3c Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 2 Nov 2023 17:52:36 -0700 Subject: [PATCH 3/8] Add Windows support for ssize_t. --- .../external_view_embedder/external_view_embedder.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc index a0e516e4c10a2..e6ed059876725 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.cc +++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc @@ -6,6 +6,12 @@ #include "flutter/fml/synchronization/waitable_event.h" #include "flutter/fml/trace_event.h" +// https://learn.microsoft.com/en-us/windows/win32/winprog/windows-data-types +#if defined(_MSC_VER) +#include +typedef SSIZE_T ssize_t; +#endif + namespace flutter { AndroidExternalViewEmbedder::AndroidExternalViewEmbedder( From 1c6d626c4dc869e8453381b2a47528351a733716 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 2 Nov 2023 17:56:34 -0700 Subject: [PATCH 4/8] Actually, just ssize_t -> size_t. --- .../external_view_embedder/external_view_embedder.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc index e6ed059876725..b1437c54e60ff 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.cc +++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc @@ -6,12 +6,6 @@ #include "flutter/fml/synchronization/waitable_event.h" #include "flutter/fml/trace_event.h" -// https://learn.microsoft.com/en-us/windows/win32/winprog/windows-data-types -#if defined(_MSC_VER) -#include -typedef SSIZE_T ssize_t; -#endif - namespace flutter { AndroidExternalViewEmbedder::AndroidExternalViewEmbedder( @@ -104,7 +98,7 @@ void AndroidExternalViewEmbedder::SubmitFrame( // This is done by querying the r-tree that holds the records for the // picture recorder corresponding to the flow layers added after a platform // view layer. - for (ssize_t j = i; j >= 0; j--) { + for (size_t j = i; j >= 0; j--) { int64_t current_view_id = composition_order_[j]; SkRect current_view_rect = GetViewRect(current_view_id); // The rect above the `current_view_rect` From 10cb0e8911d8fda16f1bda092961b468a995773d Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 3 Nov 2023 13:45:31 -0700 Subject: [PATCH 5/8] Add a print statement because wtf is going on. --- testing/run_tests.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/run_tests.py b/testing/run_tests.py index 3f93473bdb29c..f18e8f40572e7 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -414,6 +414,9 @@ def make_test(name, flags=None, extra_env=None): make_test('ui_unittests', flags=repeat_flags + ['--timeout=90']), ] + # Print if the machine is detected as "is_windows()" + print('is_windows() = %s' % is_windows() % ' on ' % sys_platform) + if not is_windows(): unittests += [ # https://github.com/flutter/flutter/issues/36295 From b061c3310b2f2dc16a05c88036f6fbaa8ef6cbcc Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 20 Nov 2023 12:23:15 -0800 Subject: [PATCH 6/8] Tweak print. --- testing/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index 45203f0cffb53..cb3675ceddc47 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -416,7 +416,7 @@ def make_test(name, flags=None, extra_env=None): ] # Print if the machine is detected as "is_windows()" - print('is_windows() = %s' % is_windows() % ' on ' % sys_platform) + print('is_windows() = %s, on sys_paltorm = %s' % is_windows(), sys_platform) if not is_windows(): unittests += [ From 44ee1c9459fbd9e0185599393bcc42b30d7b4a3b Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 21 Nov 2023 10:32:43 -0800 Subject: [PATCH 7/8] ++ --- testing/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index cb3675ceddc47..7d853164eb509 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -416,7 +416,7 @@ def make_test(name, flags=None, extra_env=None): ] # Print if the machine is detected as "is_windows()" - print('is_windows() = %s, on sys_paltorm = %s' % is_windows(), sys_platform) + print('is_windows() = %s, on sys_paltorm = %s' % (is_windows(), sys_platform)) if not is_windows(): unittests += [ From ccb36f54180c363dc95c6ff2986d7e3afc7f5934 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 8 Dec 2023 14:43:21 -0800 Subject: [PATCH 8/8] ++ --- .../android/external_view_embedder/external_view_embedder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc index b1437c54e60ff..01ec6e2de8ad5 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.cc +++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc @@ -98,7 +98,7 @@ void AndroidExternalViewEmbedder::SubmitFrame( // This is done by querying the r-tree that holds the records for the // picture recorder corresponding to the flow layers added after a platform // view layer. - for (size_t j = i; j >= 0; j--) { + for (ptrdiff_t /* portable, ssize_t is not */ j = i; j >= 0; j--) { int64_t current_view_id = composition_order_[j]; SkRect current_view_rect = GetViewRect(current_view_id); // The rect above the `current_view_rect`