Merge branch 'main' into scissor

Author: AthulJoseph27

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': '696528fe7d07cab458a9c2e03467cf280ece8229',
+  'skia_revision': '3b50199d27bb90238f5d2b7b2dabbe9d3450b630',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

ci/licenses_golden/excluded_files

@@ -109,8 +109,6 @@
 ../../../flutter/fml/platform/darwin/scoped_nsobject_arc_unittests.mm
 ../../../flutter/fml/platform/darwin/scoped_nsobject_unittests.mm
 ../../../flutter/fml/platform/darwin/string_range_sanitization_unittests.mm
-../../../flutter/fml/platform/darwin/weak_nsobject_arc_unittests.mm
-../../../flutter/fml/platform/darwin/weak_nsobject_unittests.mm
 ../../../flutter/fml/platform/fuchsia/log_interest_listener_unittests.cc
 ../../../flutter/fml/platform/win/file_win_unittests.cc
 ../../../flutter/fml/platform/win/wstring_conversion_unittests.cc

ci/licenses_golden/licenses_flutter

@@ -42739,8 +42739,6 @@ ORIGIN: ../../../flutter/fml/platform/darwin/scoped_policy.h + ../../../flutter/
 ORIGIN: ../../../flutter/fml/platform/darwin/scoped_typeref.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/platform/darwin/string_range_sanitization.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/platform/darwin/string_range_sanitization.mm + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/fml/platform/darwin/weak_nsobject.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/fml/platform/darwin/weak_nsobject.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/platform/fuchsia/log_interest_listener.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/platform/fuchsia/log_interest_listener.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/fml/platform/fuchsia/log_state.cc + ../../../flutter/LICENSE
@@ -45601,8 +45599,6 @@ FILE: ../../../flutter/fml/platform/darwin/scoped_policy.h
 FILE: ../../../flutter/fml/platform/darwin/scoped_typeref.h
 FILE: ../../../flutter/fml/platform/darwin/string_range_sanitization.h
 FILE: ../../../flutter/fml/platform/darwin/string_range_sanitization.mm
-FILE: ../../../flutter/fml/platform/darwin/weak_nsobject.h
-FILE: ../../../flutter/fml/platform/darwin/weak_nsobject.mm
 FILE: ../../../flutter/fml/platform/fuchsia/log_interest_listener.cc
 FILE: ../../../flutter/fml/platform/fuchsia/log_interest_listener.h
 FILE: ../../../flutter/fml/platform/fuchsia/log_state.cc

fml/BUILD.gn

@@ -162,8 +162,6 @@ source_set("fml") {
       "platform/darwin/scoped_typeref.h",
       "platform/darwin/string_range_sanitization.h",
       "platform/darwin/string_range_sanitization.mm",
-      "platform/darwin/weak_nsobject.h",
-      "platform/darwin/weak_nsobject.mm",
     ]
 
     frameworks = [ "Foundation.framework" ]
@@ -377,10 +375,7 @@ if (enable_unittests) {
     }
 
     if (is_mac || is_ios) {
-      sources += [
-        "platform/darwin/scoped_nsobject_unittests.mm",
-        "platform/darwin/weak_nsobject_unittests.mm",
-      ]
+      sources += [ "platform/darwin/scoped_nsobject_unittests.mm" ]
     }
 
     if (is_fuchsia) {
@@ -418,10 +413,7 @@ if (enable_unittests) {
     testonly = true
     if (is_mac || is_ios) {
       cflags_objcc = flutter_cflags_objc_arc
-      sources = [
-        "platform/darwin/scoped_nsobject_arc_unittests.mm",
-        "platform/darwin/weak_nsobject_arc_unittests.mm",
-      ]
+      sources = [ "platform/darwin/scoped_nsobject_arc_unittests.mm" ]
     }
 
     deps = [